From 1d077caf68127ab1a5518df84cc5592a1b47a965 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 14 Aug 2011 05:14:51 +0000 Subject: TQt4 port kdeartwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeartwork@1246991 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kscreensaver/kxsconfig/XScreenSaver_ad.h | 4 ++-- kscreensaver/kxsconfig/kxsconfig.cpp | 20 ++++++++++---------- kscreensaver/kxsconfig/kxsconfig.h | 1 + kscreensaver/kxsconfig/kxscontrol.h | 6 ++++++ kscreensaver/kxsconfig/kxsitem.cpp | 6 +++--- kscreensaver/kxsconfig/kxsrun.cpp | 4 ++-- kscreensaver/kxsconfig/kxsxml.cpp | 2 +- kscreensaver/kxsconfig/kxsxml.h | 2 +- 8 files changed, 26 insertions(+), 19 deletions(-) (limited to 'kscreensaver/kxsconfig') diff --git a/kscreensaver/kxsconfig/XScreenSaver_ad.h b/kscreensaver/kxsconfig/XScreenSaver_ad.h index 42452482..568338f7 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.alignment: ALIGNMENT_BEGINNING", +"*cmdLabel.tqalignment: ALIGNMENT_BEGINNING", "*enabled.labelString: Enabled", "*visLabel.labelString: Visual:", -"*visLabel.alignment: ALIGNMENT_END", +"*visLabel.tqalignment: ALIGNMENT_END", "*visLabel.leftOffset: 20", "*demo.labelString: Demo", "*man.labelString: Documentation...", diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/kscreensaver/kxsconfig/kxsconfig.cpp index ca3093de..6020bcdb 100644 --- a/kscreensaver/kxsconfig/kxsconfig.cpp +++ b/kscreensaver/kxsconfig/kxsconfig.cpp @@ -92,11 +92,11 @@ KXSConfigDialog::KXSConfigDialog(const TQString &filename, const TQString &name) bool KXSConfigDialog::create() { TQVBoxLayout *topLayout = new TQVBoxLayout(plainPage(), spacingHint()); - TQHBoxLayout *layout = new TQHBoxLayout(topLayout, spacingHint()); + TQHBoxLayout *tqlayout = new TQHBoxLayout(topLayout, spacingHint()); TQVBox *controlLayout = new TQVBox(plainPage()); controlLayout->setSpacing(spacingHint()); - layout->addWidget(controlLayout); - ((TQBoxLayout*)controlLayout->layout())->addStrut(120); + tqlayout->addWidget(controlLayout); + ((TQBoxLayout*)controlLayout->tqlayout())->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->setAlignment ( WordBreak ); + l->tqsetAlignment ( WordBreak ); topLayout->addWidget( l ); } } else { // fall back to KDE's old config files. int idx = 0; while (true) { - TQString group = TQString("Arg%1").arg(idx); + TQString group = TQString("Arg%1").tqarg(idx); if (config.hasGroup(group)) { config.setGroup(group); TQString type = config.readEntry("Type"); @@ -175,9 +175,9 @@ bool KXSConfigDialog::create() mPreview = new TQWidget(plainPage()); mPreview->setFixedSize(250, 200); // mPreview->setBackgroundMode(TQWidget::NoBackground); - mPreview->setBackgroundColor(Qt::black); + mPreview->setBackgroundColor(TQt::black); - layout->add(mPreview); + tqlayout->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 $KDEDIR/bin first no matter what and sometimes finds the wrong executable TQFileInfo checkExe; - TQString saverdir = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(word); + TQString saverdir = TQString("%1/%2").tqarg(XSCREENSAVER_HACKS_DIR).tqarg(word); TQString path; checkExe.setFile(saverdir); if (checkExe.exists() && checkExe.isExecutable() && checkExe.isFile()) @@ -354,7 +354,7 @@ int main(int argc, char *argv[]) int dummyargc = 1; progname = dummyargs[0]; - // Teach Xt to use the Display that Qt has already opened. + // Teach Xt to use the Display that TQt has already opened. XtToolkitInitialize (); XtAppContext xtApp = XtCreateApplicationContext (); Display *dpy = qt_xdisplay(); @@ -378,7 +378,7 @@ int main(int argc, char *argv[]) app.exec(); } else { KMessageBox::sorry(0, - i18n("No configuration available for %1").arg(name), + i18n("No configuration available for %1").tqarg(name), name ); } diff --git a/kscreensaver/kxsconfig/kxsconfig.h b/kscreensaver/kxsconfig/kxsconfig.h index cb74eacb..5bda2ed6 100644 --- a/kscreensaver/kxsconfig/kxsconfig.h +++ b/kscreensaver/kxsconfig/kxsconfig.h @@ -31,6 +31,7 @@ class TQLabel; class KXSConfigDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KXSConfigDialog(const TQString &file, const TQString &name); ~KXSConfigDialog(); diff --git a/kscreensaver/kxsconfig/kxscontrol.h b/kscreensaver/kxsconfig/kxscontrol.h index ad75103c..0af889a6 100644 --- a/kscreensaver/kxsconfig/kxscontrol.h +++ b/kscreensaver/kxsconfig/kxscontrol.h @@ -37,6 +37,7 @@ class TQLineEdit; class KXSRangeControl : public TQWidget, public KXSRangeItem { Q_OBJECT + TQ_OBJECT public: KXSRangeControl(TQWidget *parent, const TQString &name, KConfig &config); KXSRangeControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); @@ -58,6 +59,7 @@ protected: class KXSDoubleRangeControl : public TQWidget, public KXSDoubleRangeItem { Q_OBJECT + TQ_OBJECT public: KXSDoubleRangeControl(TQWidget *parent, const TQString &name, KConfig &config); KXSDoubleRangeControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); @@ -79,6 +81,7 @@ protected: class KXSCheckBoxControl : public TQCheckBox, public KXSBoolItem { Q_OBJECT + TQ_OBJECT public: KXSCheckBoxControl(TQWidget *parent, const TQString &name, KConfig &config); KXSCheckBoxControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); @@ -96,6 +99,7 @@ protected slots: class KXSDropListControl : public TQWidget, public KXSSelectItem { Q_OBJECT + TQ_OBJECT public: KXSDropListControl(TQWidget *parent, const TQString &name, KConfig &config); KXSDropListControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); @@ -118,6 +122,7 @@ protected: class KXSLineEditControl : public TQWidget, public KXSStringItem { Q_OBJECT + TQ_OBJECT public: KXSLineEditControl(TQWidget *parent, const TQString &name, KConfig &config); KXSLineEditControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); @@ -138,6 +143,7 @@ protected: class KXSFileControl : public TQWidget, public KXSStringItem { Q_OBJECT + TQ_OBJECT public: KXSFileControl(TQWidget *parent, const TQString &name, KConfig &config); KXSFileControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); diff --git a/kscreensaver/kxsconfig/kxsitem.cpp b/kscreensaver/kxsconfig/kxsitem.cpp index 7d9ab034..022657c0 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.arg(mInvert?mMaximum-(mValue-mMinimum):mValue); + return mSwitch.tqarg(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.arg(mInvert?mMaximum-(mValue-mMinimum):mValue); + return mSwitch.tqarg(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.arg(mValue); + return mSwitch.tqarg(mValue); return ""; } diff --git a/kscreensaver/kxsconfig/kxsrun.cpp b/kscreensaver/kxsconfig/kxsrun.cpp index 0f212c10..540d8f6c 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").arg(idx); + TQString group = TQString("Arg%1").tqarg(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 $KDEDIR/bin first no matter what and sometimes finds the wrong executable TQFileInfo checkExe; - TQString saverdir = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(filename); + TQString saverdir = TQString("%1/%2").tqarg(XSCREENSAVER_HACKS_DIR).tqarg(filename); kdDebug() << "saverdir is" << saverdir << endl; TQString exeFile; checkExe.setFile(saverdir); diff --git a/kscreensaver/kxsconfig/kxsxml.cpp b/kscreensaver/kxsconfig/kxsxml.cpp index e35294dd..6ea0c7b7 100644 --- a/kscreensaver/kxsconfig/kxsxml.cpp +++ b/kscreensaver/kxsconfig/kxsxml.cpp @@ -36,7 +36,7 @@ bool KXSXml::parse( const TQString &filename ) { TQFile file( filename ); handler = new KXSXmlHandler( parent ); - TQXmlInputSource source( &file ); + TQXmlInputSource source( TQT_TQIODEVICE(&file) ); TQXmlSimpleReader reader; reader.setContentHandler( handler ); if ( !reader.parse( &source, FALSE ) ) diff --git a/kscreensaver/kxsconfig/kxsxml.h b/kscreensaver/kxsconfig/kxsxml.h index c7278c20..4f02a33c 100644 --- a/kscreensaver/kxsconfig/kxsxml.h +++ b/kscreensaver/kxsconfig/kxsxml.h @@ -42,7 +42,7 @@ private: KXSXmlHandler *handler; }; -class KXSXmlHandler : public QXmlDefaultHandler +class KXSXmlHandler : public TQXmlDefaultHandler { public: KXSXmlHandler( TQWidget *p ); -- cgit v1.2.3