summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-11-24 10:56:41 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-11-24 10:56:41 +0900
commit8bba786d188dd896336797f05e0a452e1a01d52b (patch)
tree51963cb8a377c60f3e95d199dc25e9885680e37f
parent6deb3b43d145638070e9b7ad77eb9a10f4d3a72e (diff)
downloadtdeutils-8bba786d188dd896336797f05e0a452e1a01d52b.tar.gz
tdeutils-8bba786d188dd896336797f05e0a452e1a01d52b.zip
Replaced various '#define' with actual strings - part 3
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--ark/arch.h26
-rw-r--r--kregexpeditor/verifybuttons.cpp4
-rw-r--r--ksim/library/chart.cpp2
-rw-r--r--ksim/monitors/filesystem/ksimfsystem.cpp2
-rw-r--r--superkaramba/src/main.cpp2
-rw-r--r--tdelirc/tdelirc/profileserver.cpp2
-rw-r--r--tdelirc/tdelirc/prototype.h2
7 files changed, 20 insertions, 20 deletions
diff --git a/ark/arch.h b/ark/arch.h
index 61a3f13..9ad4318 100644
--- a/ark/arch.h
+++ b/ark/arch.h
@@ -211,18 +211,18 @@ class Arch : public TQObject
// Columns
// don't forget to change common_texts.cpp if you change something here
-#define FILENAME_COLUMN tqMakePair( i18n(" Filename "), TQt::AlignLeft )
-#define PERMISSION_COLUMN tqMakePair( i18n(" Permissions "), TQt::AlignLeft )
-#define OWNER_GROUP_COLUMN tqMakePair( i18n(" Owner/Group "), TQt::AlignLeft )
-#define SIZE_COLUMN tqMakePair( i18n(" Size "), TQt::AlignRight )
-#define TIMESTAMP_COLUMN tqMakePair( i18n(" Timestamp "), TQt::AlignRight )
-#define LINK_COLUMN tqMakePair( i18n(" Link "), TQt::AlignLeft )
-#define PACKED_COLUMN tqMakePair( i18n(" Size Now "), TQt::AlignRight )
-#define RATIO_COLUMN tqMakePair( i18n(" Ratio "), TQt::AlignRight )
-#define CRC_COLUMN tqMakePair( i18n("Cyclic Redundancy Check"," CRC "), TQt::AlignLeft )
-#define METHOD_COLUMN tqMakePair( i18n(" Method "), TQt::AlignLeft )
-#define VERSION_COLUMN tqMakePair( i18n(" Version "), TQt::AlignLeft )
-#define OWNER_COLUMN tqMakePair( i18n(" Owner "), TQt::AlignLeft )
-#define GROUP_COLUMN tqMakePair( i18n(" Group "), TQt::AlignLeft )
+#define FILENAME_COLUMN qMakePair( i18n(" Filename "), TQt::AlignLeft )
+#define PERMISSION_COLUMN qMakePair( i18n(" Permissions "), TQt::AlignLeft )
+#define OWNER_GROUP_COLUMN qMakePair( i18n(" Owner/Group "), TQt::AlignLeft )
+#define SIZE_COLUMN qMakePair( i18n(" Size "), TQt::AlignRight )
+#define TIMESTAMP_COLUMN qMakePair( i18n(" Timestamp "), TQt::AlignRight )
+#define LINK_COLUMN qMakePair( i18n(" Link "), TQt::AlignLeft )
+#define PACKED_COLUMN qMakePair( i18n(" Size Now "), TQt::AlignRight )
+#define RATIO_COLUMN qMakePair( i18n(" Ratio "), TQt::AlignRight )
+#define CRC_COLUMN qMakePair( i18n("Cyclic Redundancy Check"," CRC "), TQt::AlignLeft )
+#define METHOD_COLUMN qMakePair( i18n(" Method "), TQt::AlignLeft )
+#define VERSION_COLUMN qMakePair( i18n(" Version "), TQt::AlignLeft )
+#define OWNER_COLUMN qMakePair( i18n(" Owner "), TQt::AlignLeft )
+#define GROUP_COLUMN qMakePair( i18n(" Group "), TQt::AlignLeft )
#endif /* ARCH_H */
diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp
index eb756b2..6f5b316 100644
--- a/kregexpeditor/verifybuttons.cpp
+++ b/kregexpeditor/verifybuttons.cpp
@@ -102,12 +102,12 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name )
// TQt
RegExpConverter* converter = new TQtRegExpConverter();
- _converters.append( tqMakePair( converter, static_cast<TQAction*>( 0 ) ) );
+ _converters.append( qMakePair( converter, static_cast<TQAction*>( 0 ) ) );
TQString qtConverterName = converter->name();
// Emacs
converter = new EmacsRegExpConverter();
- _converters.append( tqMakePair( converter, static_cast<TQAction*>( 0 ) ) );
+ _converters.append( qMakePair( converter, static_cast<TQAction*>( 0 ) ) );
// -------------------------------------------------- Initialize the config menu
diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp
index 9995769..99eb9c8 100644
--- a/ksim/library/chart.cpp
+++ b/ksim/library/chart.cpp
@@ -373,7 +373,7 @@ void KSim::Chart::setMaxValue(int maxValue)
void KSim::Chart::setValue(int valueIn, int valueOut)
{
- d->values.prepend(tqMakePair(range(valueIn), range(valueOut)));
+ d->values.prepend(qMakePair(range(valueIn), range(valueOut)));
if (d->variableGraphs) {
d->maxValues.prepend(valueIn > valueOut ? valueIn : valueOut);
diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp
index 278a891..0a436ed 100644
--- a/ksim/monitors/filesystem/ksimfsystem.cpp
+++ b/ksim/monitors/filesystem/ksimfsystem.cpp
@@ -193,7 +193,7 @@ Fsystem::MountEntryList Fsystem::makeList(const TQStringList &list) const
TQStringList::ConstIterator it;
for (it = list.begin(); it != list.end(); ++it) {
splitList = TQStringList::split(":", (*it));
- newList.append(tqMakePair(splitList[0], splitList[1]));
+ newList.append(qMakePair(splitList[0], splitList[1]));
}
return newList;
diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp
index 9ea8503..6196983 100644
--- a/superkaramba/src/main.cpp
+++ b/superkaramba/src/main.cpp
@@ -87,7 +87,7 @@ void karambaMessageOutput(TQtMsgType type, const char *msg)
int main(int argc, char **argv)
{
#ifdef KARAMBA_LOG
- tqInstallMsgHandler(karambaMessageOutput);
+ qInstallMsgHandler(karambaMessageOutput);
#endif
TDEAboutData about("superkaramba", I18N_NOOP("SuperKaramba"),
version, description,
diff --git a/tdelirc/tdelirc/profileserver.cpp b/tdelirc/tdelirc/profileserver.cpp
index ba39442..1239b18 100644
--- a/tdelirc/tdelirc/profileserver.cpp
+++ b/tdelirc/tdelirc/profileserver.cpp
@@ -124,7 +124,7 @@ bool Profile::startElement(const TQString &, const TQString &, const TQString &n
curPAA->setType(attributes.value("type"));
}
else if(name == "range" && curPAA)
- curPAA->setRange(tqMakePair(attributes.value("min").toInt(), attributes.value("max").toInt()));
+ curPAA->setRange(qMakePair(attributes.value("min").toInt(), attributes.value("max").toInt()));
charBuffer = "";
return true;
diff --git a/tdelirc/tdelirc/prototype.h b/tdelirc/tdelirc/prototype.h
index fa101b7..3c86025 100644
--- a/tdelirc/tdelirc/prototype.h
+++ b/tdelirc/tdelirc/prototype.h
@@ -30,7 +30,7 @@ class Prototype
public:
unsigned count() const{ return theTypes.count(); }
- const TQPair<TQString, TQString> operator[](int i) const { return tqMakePair(theTypes[i], theNames[i]); }
+ const TQPair<TQString, TQString> operator[](int i) const { return qMakePair(theTypes[i], theNames[i]); }
const TQString &name(int i) const { return theNames[i]; }
const TQString &type(int i) const { return theTypes[i]; }
const TQString &returnType() const { return theReturn; }