From 5c194e6e7059ddcc96b0e0166ce6157c35fc183e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:45:12 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kscreensaver/kxsconfig/XScreenSaver_ad.h | 4 ++-- kscreensaver/kxsconfig/kxsconfig.cpp | 18 +++++++++--------- kscreensaver/kxsconfig/kxscontrol.cpp | 2 +- kscreensaver/kxsconfig/kxsitem.cpp | 6 +++--- kscreensaver/kxsconfig/kxsrun.cpp | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'kscreensaver/kxsconfig') diff --git a/kscreensaver/kxsconfig/XScreenSaver_ad.h b/kscreensaver/kxsconfig/XScreenSaver_ad.h index 568338f7..42452482 100644 --- a/kscreensaver/kxsconfig/XScreenSaver_ad.h +++ b/kscreensaver/kxsconfig/XScreenSaver_ad.h @@ -366,10 +366,10 @@ "*up.labelString: /\\\\ ", "*frameLabel.labelString: ", "*cmdLabel.labelString: Command Line:", -"*cmdLabel.tqalignment: ALIGNMENT_BEGINNING", +"*cmdLabel.alignment: ALIGNMENT_BEGINNING", "*enabled.labelString: Enabled", "*visLabel.labelString: Visual:", -"*visLabel.tqalignment: ALIGNMENT_END", +"*visLabel.alignment: ALIGNMENT_END", "*visLabel.leftOffset: 20", "*demo.labelString: Demo", "*man.labelString: Documentation...", diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/kscreensaver/kxsconfig/kxsconfig.cpp index 39da69bc..336ffd94 100644 --- a/kscreensaver/kxsconfig/kxsconfig.cpp +++ b/kscreensaver/kxsconfig/kxsconfig.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include @@ -92,11 +92,11 @@ KXSConfigDialog::KXSConfigDialog(const TQString &filename, const TQString &name) bool KXSConfigDialog::create() { TQVBoxLayout *topLayout = new TQVBoxLayout(plainPage(), spacingHint()); - TQHBoxLayout *tqlayout = new TQHBoxLayout(topLayout, spacingHint()); + TQHBoxLayout *layout = new TQHBoxLayout(topLayout, spacingHint()); TQVBox *controlLayout = new TQVBox(plainPage()); controlLayout->setSpacing(spacingHint()); - tqlayout->addWidget(controlLayout); - ((TQBoxLayout*)controlLayout->tqlayout())->addStrut(120); + layout->addWidget(controlLayout); + ((TQBoxLayout*)controlLayout->layout())->addStrut(120); KConfig config(mConfigFile); @@ -118,14 +118,14 @@ bool KXSConfigDialog::create() descr.replace('\n',' '); descr = descr.simplifyWhiteSpace(); TQLabel *l = new TQLabel( i18n( descr.utf8() ), plainPage() ); - l->tqsetAlignment ( WordBreak ); + l->setAlignment ( WordBreak ); topLayout->addWidget( l ); } } else { // fall back to KDE's old config files. int idx = 0; while (true) { - TQString group = TQString("Arg%1").tqarg(idx); + TQString group = TQString("Arg%1").arg(idx); if (config.hasGroup(group)) { config.setGroup(group); TQString type = config.readEntry("Type"); @@ -177,7 +177,7 @@ bool KXSConfigDialog::create() // mPreview->setBackgroundMode(TQWidget::NoBackground); mPreview->setBackgroundColor(TQt::black); - tqlayout->add(mPreview); + layout->add(mPreview); show(); // So that hacks can XSelectInput ButtonPressMask @@ -229,7 +229,7 @@ void KXSConfigDialog::slotPreviewExited(KProcess *) while ( !saver[i].isSpace() ) word += saver[i++]; //work around a KStandarDirs::findExe() "feature" where it looks in $TDEDIR/bin first no matter what and sometimes finds the wrong executable TQFileInfo checkExe; - TQString saverdir = TQString("%1/%2").tqarg(XSCREENSAVER_HACKS_DIR).tqarg(word); + TQString saverdir = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(word); TQString path; checkExe.setFile(saverdir); if (checkExe.exists() && checkExe.isExecutable() && checkExe.isFile()) @@ -378,7 +378,7 @@ int main(int argc, char *argv[]) app.exec(); } else { KMessageBox::sorry(0, - i18n("No configuration available for %1").tqarg(name), + i18n("No configuration available for %1").arg(name), name ); } diff --git a/kscreensaver/kxsconfig/kxscontrol.cpp b/kscreensaver/kxsconfig/kxscontrol.cpp index aca1993c..4bf10039 100644 --- a/kscreensaver/kxsconfig/kxscontrol.cpp +++ b/kscreensaver/kxsconfig/kxscontrol.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/kscreensaver/kxsconfig/kxsitem.cpp b/kscreensaver/kxsconfig/kxsitem.cpp index 022657c0..7d9ab034 100644 --- a/kscreensaver/kxsconfig/kxsitem.cpp +++ b/kscreensaver/kxsconfig/kxsitem.cpp @@ -65,7 +65,7 @@ KXSRangeItem::KXSRangeItem(const TQString &name, const TQXmlAttributes &attr ) TQString KXSRangeItem::command() { - return mSwitch.tqarg(mInvert?mMaximum-(mValue-mMinimum):mValue); + return mSwitch.arg(mInvert?mMaximum-(mValue-mMinimum):mValue); } void KXSRangeItem::read(KConfig &config) @@ -109,7 +109,7 @@ KXSDoubleRangeItem::KXSDoubleRangeItem(const TQString &name, const TQXmlAttribut TQString KXSDoubleRangeItem::command() { - return mSwitch.tqarg(mInvert?mMaximum-(mValue-mMinimum):mValue); + return mSwitch.arg(mInvert?mMaximum-(mValue-mMinimum):mValue); } void KXSDoubleRangeItem::read(KConfig &config) @@ -232,7 +232,7 @@ KXSStringItem::KXSStringItem(const TQString &name, const TQXmlAttributes &attr ) TQString KXSStringItem::command() { if (!mValue.isEmpty()) - return mSwitch.tqarg(mValue); + return mSwitch.arg(mValue); return ""; } diff --git a/kscreensaver/kxsconfig/kxsrun.cpp b/kscreensaver/kxsconfig/kxsrun.cpp index 3eb12c12..41e9f1d0 100644 --- a/kscreensaver/kxsconfig/kxsrun.cpp +++ b/kscreensaver/kxsconfig/kxsrun.cpp @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) int idx = 0; while (true) { - TQString group = TQString("Arg%1").tqarg(idx); + TQString group = TQString("Arg%1").arg(idx); if (config.hasGroup(group)) { config.setGroup(group); TQString type = config.readEntry("Type"); @@ -135,7 +135,7 @@ int main(int argc, char *argv[]) // find the xscreensaver executable //work around a KStandarDirs::findExe() "feature" where it looks in $TDEDIR/bin first no matter what and sometimes finds the wrong executable TQFileInfo checkExe; - TQString saverdir = TQString("%1/%2").tqarg(XSCREENSAVER_HACKS_DIR).tqarg(filename); + TQString saverdir = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(filename); kdDebug() << "saverdir is" << saverdir << endl; TQString exeFile; checkExe.setFile(saverdir); -- cgit v1.2.1