From 377fa3a2775cdb3194315bb83e21744dc7c97bbf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:15 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit d1248617107f659af9d03cf1ef6d783571a0cba8. --- kcron/ctcron.cpp | 4 ++-- kcron/ktapp.cpp | 2 +- kcron/ktapp.h | 4 ++-- kcron/ktlisttasks.cpp | 2 +- kcron/ktlistvars.cpp | 2 +- kcron/ktprint.cpp | 6 +++--- kcron/ktprint.h | 4 ++-- kcron/ktprintopt.cpp | 2 +- kcron/kttask.cpp | 10 +++++----- kcron/ktvariable.cpp | 24 ++++++++++++------------ kcron/ktview.cpp | 10 +++++----- 11 files changed, 35 insertions(+), 35 deletions(-) (limited to 'kcron') diff --git a/kcron/ctcron.cpp b/kcron/ctcron.cpp index e470a72..58d389a 100644 --- a/kcron/ctcron.cpp +++ b/kcron/ctcron.cpp @@ -60,7 +60,7 @@ CTCron::CTCron(bool _syscron, string _login) : writeCommand = TQString("crontab -u ") + _login.c_str() + " " + KProcess::quote(tmpFileName); if (!initFromPasswd(getpwnam(_login.c_str()))) { - error = i18n("No password entry found for user '%1'").arg(_login.c_str()); + error = i18n("No password entry found for user '%1'").tqarg(_login.c_str()); } } } @@ -71,7 +71,7 @@ CTCron::CTCron(bool _syscron, string _login) : writeCommand = "crontab " + KProcess::quote(tmpFileName); if (!initFromPasswd(getpwuid(uid))) { - error = i18n("No password entry found for uid '%1'").arg(uid); + error = i18n("No password entry found for uid '%1'").tqarg(uid); } } diff --git a/kcron/ktapp.cpp b/kcron/ktapp.cpp index 8efbb05..dfbe15e 100644 --- a/kcron/ktapp.cpp +++ b/kcron/ktapp.cpp @@ -70,7 +70,7 @@ bool KTApp::init() if (cthost->isError()) { KMessageBox::error(this, i18n("The following error occurred while initializing KCron:" - "\n\n%1\n\nKCron will now exit.\n").arg(cthost->errorMessage())); + "\n\n%1\n\nKCron will now exit.\n").tqarg(cthost->errorMessage())); return false; } diff --git a/kcron/ktapp.h b/kcron/ktapp.h index a60c7ca..6b28354 100644 --- a/kcron/ktapp.h +++ b/kcron/ktapp.h @@ -238,13 +238,13 @@ private: /** * Read general options again and initialize all variables like the - * geometry. + * tqgeometry. */ void readOptions(); /** * Save general options like all bar positions and status as well as the - * geometry to the configuration file. + * tqgeometry to the configuration file. */ void saveOptions(); diff --git a/kcron/ktlisttasks.cpp b/kcron/ktlisttasks.cpp index e35f053..db153e6 100644 --- a/kcron/ktlisttasks.cpp +++ b/kcron/ktlisttasks.cpp @@ -77,7 +77,7 @@ void KTListTasks::print (KTPrint& printer) const printer.setFont(stnd); - //firstChild() does not return null if there are no children, therefore + //firstChild() does not return null if there are no tqchildren, therefore //we need to check the validation of the pointer without terminating //the application. This maybe a bug in QT 1.44 diff --git a/kcron/ktlistvars.cpp b/kcron/ktlistvars.cpp index cf4a6d1..567d3d1 100644 --- a/kcron/ktlistvars.cpp +++ b/kcron/ktlistvars.cpp @@ -73,7 +73,7 @@ void KTListVars::print(KTPrint& printer) const printer.setFont(stnd); - //firstChild() does not return null if there are no children, therefore + //firstChild() does not return null if there are no tqchildren, therefore //we need to check the validation of the pointer without terminating //the application. This maybe a bug in QT 1.44 diff --git a/kcron/ktprint.cpp b/kcron/ktprint.cpp index b1de5c6..ceb1482 100644 --- a/kcron/ktprint.cpp +++ b/kcron/ktprint.cpp @@ -104,7 +104,7 @@ TQFont KTPrint :: getFont () const return paint->font(); } -void KTPrint :: print (const TQString &str, int col, int alignment, bool wordWrap) +void KTPrint :: print (const TQString &str, int col, int tqalignment, bool wordWrap) { //Prints the string str into the column col using //the remaining arguments as format flags @@ -115,8 +115,8 @@ void KTPrint :: print (const TQString &str, int col, int alignment, bool wordWra return; - //Setup the alignment - switch (alignment) { + //Setup the tqalignment + switch (tqalignment) { case alignTextLeft : format = AlignLeft | AlignTop | DontClip | ExpandTabs; break; case alignTextCenter : format = AlignHCenter | AlignTop | DontClip | ExpandTabs; break; case alignTextRight : format = AlignRight | AlignTop | DontClip | ExpandTabs; break; diff --git a/kcron/ktprint.h b/kcron/ktprint.h index 16c13b1..34b0254 100644 --- a/kcron/ktprint.h +++ b/kcron/ktprint.h @@ -87,7 +87,7 @@ public: /** * Print text */ - void print (const TQString &str, int col =1, int alignment=KTPrint::defaultLeftMargin, bool wordWrap = true); + void print (const TQString &str, int col =1, int tqalignment=KTPrint::defaultLeftMargin, bool wordWrap = true); /** * Constructs the columns @@ -178,7 +178,7 @@ private: KPrinter *prnt; /** - *Nest a column class to make text layout nicer + *Nest a column class to make text tqlayout nicer */ class Column { diff --git a/kcron/ktprintopt.cpp b/kcron/ktprintopt.cpp index 34b0770..f609869 100644 --- a/kcron/ktprintopt.cpp +++ b/kcron/ktprintopt.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include -#include +#include #include #include diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp index ffe3d7d..0568de5 100644 --- a/kcron/kttask.cpp +++ b/kcron/kttask.cpp @@ -14,12 +14,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include @@ -269,7 +269,7 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption) v4->addSpacing( 2 * KDialogBase::spacingHint() ); labAM = new TQLabel( i18n("AM"), bgHour, "labAM"); - labAM->setAlignment(AlignRight | AlignVCenter); + labAM->tqsetAlignment(AlignRight | AlignVCenter); v4->addWidget( labAM ); @@ -292,7 +292,7 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption) } labPM = new TQLabel( i18n("PM"), bgHour, "labPM"); - labPM->setAlignment(AlignRight | AlignVCenter); + labPM->tqsetAlignment(AlignRight | AlignVCenter); v4->addWidget( labPM ); hhours = new TQHBoxLayout( v4, KDialogBase::spacingHint() ); @@ -403,7 +403,7 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption) key_accel->insert(KStdAccel::Quit, TQT_TQOBJECT(this), TQT_SLOT(slotCancel())); key_accel->readSettings(); - setFixedSize( minimumSize() ); + setFixedSize( tqminimumSize() ); slotDailyChanged(); slotMonthChanged(); slotDayOfMonthChanged(); diff --git a/kcron/ktvariable.cpp b/kcron/ktvariable.cpp index 6e7ff60..474d22c 100644 --- a/kcron/ktvariable.cpp +++ b/kcron/ktvariable.cpp @@ -11,7 +11,7 @@ #include "ktvariable.h" -#include +#include #include // kapp #include // i18n() @@ -27,18 +27,18 @@ KTVariable::KTVariable(CTVariable* _ctvar,const TQString &_caption) : ctvar( _ctvar) { TQFrame *page = makeMainWidget(); - TQGridLayout *layout = new TQGridLayout( page, 5, 3, 0, spacingHint() ); - layout->setRowStretch(3, 1); - layout->setColStretch(1, 1); + TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 0, spacingHint() ); + tqlayout->setRowStretch(3, 1); + tqlayout->setColStretch(1, 1); setIcon(KTIcon::application(true)); // variable labVariable = new TQLabel(i18n("&Variable:"), page, "labVariable"); - layout->addWidget(labVariable, 1, 0, TQt::AlignLeft | TQt::AlignTop); + tqlayout->addWidget(labVariable, 1, 0, TQt::AlignLeft | TQt::AlignTop); cmbVariable = new TQComboBox(true, page, "cmbVariable"); - layout->addWidget(cmbVariable, 1, 1); + tqlayout->addWidget(cmbVariable, 1, 1); cmbVariable->insertItem("HOME"); cmbVariable->insertItem("MAILTO"); @@ -49,30 +49,30 @@ KTVariable::KTVariable(CTVariable* _ctvar,const TQString &_caption) : // icon labIcon = new TQLabel(page, "labIcon"); - layout->addMultiCellWidget(labIcon, 0, 1, 2, 2); + tqlayout->addMultiCellWidget(labIcon, 0, 1, 2, 2); // value labValue = new TQLabel(i18n("Va&lue:"), page, "labValue"); - layout->addWidget(labValue, 2, 0, TQt::AlignLeft | TQt::AlignTop); + tqlayout->addWidget(labValue, 2, 0, TQt::AlignLeft | TQt::AlignTop); leValue = new TQLineEdit(page, "leValue"); - layout->addMultiCellWidget(leValue, 2, 2, 1, 2); + tqlayout->addMultiCellWidget(leValue, 2, 2, 1, 2); leValue->setMaxLength(255); labValue->setBuddy(leValue); // comment labComment = new TQLabel(i18n("Co&mment:"), page, "labComment"); - layout->addWidget(labComment, 3, 0, TQt::AlignLeft | TQt::AlignTop); + tqlayout->addWidget(labComment, 3, 0, TQt::AlignLeft | TQt::AlignTop); teComment = new KTextEdit(page, "teComment"); teComment->setTextFormat(TQt::PlainText); - layout->addMultiCellWidget(teComment, 3, 3, 1, 2); + tqlayout->addMultiCellWidget(teComment, 3, 3, 1, 2); labComment->setBuddy(teComment); // enabled chkEnabled = new TQCheckBox(i18n("&Enabled"), page, "chkEnabled"); - layout->addWidget(chkEnabled, 4, 0); + tqlayout->addWidget(chkEnabled, 4, 0); // set starting field values cmbVariable->setEditText(TQString::fromLocal8Bit(ctvar->variable.c_str())); diff --git a/kcron/ktview.cpp b/kcron/ktview.cpp index 27341de..7422aa5 100644 --- a/kcron/ktview.cpp +++ b/kcron/ktview.cpp @@ -266,16 +266,16 @@ void KTView :: pageHeading (KTListItem* user, KTPrint &printer) const { TQFont stnd; TQString logonInfo; - TQDateTime now (TQDateTime::currentDateTime()); + TQDateTime now (TQDateTime::tqcurrentDateTime()); char hostName[20]; gethostname(hostName, 20); // SSA : Fix Me user name, logon name and host name musst be // SSA : not only in us-ascii ?? logonInfo = i18n("user on host", "%1 <%2> on %3") - .arg(TQString::fromLocal8Bit(user->getCTCron()->name.c_str())) - .arg(TQString::fromLocal8Bit(user->getCTCron()->login.c_str())) - .arg(TQString::fromLocal8Bit(hostName)); + .tqarg(TQString::fromLocal8Bit(user->getCTCron()->name.c_str())) + .tqarg(TQString::fromLocal8Bit(user->getCTCron()->login.c_str())) + .tqarg(TQString::fromLocal8Bit(hostName)); stnd = printer.getFont(); printer.setFont(TQFont( KGlobalSettings::generalFont().family(), 14, TQFont::Bold )); @@ -315,7 +315,7 @@ void KTView::resizeEvent (TQResizeEvent*) { listView->setFixedWidth(width()); listView->setFixedHeight(height()); - repaint(); + tqrepaint(); } void KTView::copy() -- cgit v1.2.1