Replaced various '#define' with actual strings - part 3

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/66/head
Michele Calgaro 5 months ago
parent 6deb3b43d1
commit 8bba786d18
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -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 */

@ -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

@ -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);

@ -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;

@ -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,

@ -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;

@ -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; }

Loading…
Cancel
Save