diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
| commit | 8155225c9be993acc0512956416d195edfef4eb9 (patch) | |
| tree | de4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kcontrol | |
| parent | 364641b8e0279758d236af39abd138d379328a19 (diff) | |
| download | tdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip | |
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol')
274 files changed, 2384 insertions, 2384 deletions
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 10c593ed7..0d69b83fc 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -585,7 +585,7 @@ void KAccessApp::createDialogContents() { TQVBoxLayout * vlay = new TQVBoxLayout(lay); featuresLabel = new TQLabel( "", contents ); - featuresLabel->setAlignment( WordBreak|AlignVCenter ); + featuresLabel->tqsetAlignment( WordBreak|AlignVCenter ); vlay->addWidget( featuresLabel ); vlay->addStretch(); diff --git a/kcontrol/access/kaccess.h b/kcontrol/access/kaccess.h index 103797ac3..98ed91d5b 100644 --- a/kcontrol/access/kaccess.h +++ b/kcontrol/access/kaccess.h @@ -86,7 +86,7 @@ private: }; -class VisualBell : public QWidget +class VisualBell : public TQWidget { Q_OBJECT diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index d7e114c55..64c33682a 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -248,7 +248,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(), + TQVBoxLayout *vvbox = new TQVBoxLayout(grp->tqlayout(), KDialogBase::spacingHint()); systemBell = new TQCheckBox(i18n("Use &system bell"), grp); @@ -291,7 +291,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint()); visibleBell = new TQCheckBox(i18n("&Use visible bell"), grp); vvbox->addWidget(visibleBell); @@ -311,7 +311,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) TQWhatsThis::add( flashScreen, i18n("The screen will turn to a custom color for the amount of time specified below.") ); hbox->addSpacing(12); colorButton = new KColorButton(grp); - colorButton->setFixedWidth(colorButton->sizeHint().height()*2); + colorButton->setFixedWidth(colorButton->tqsizeHint().height()*2); hbox->addWidget(colorButton); hbox->addStretch(); TQWhatsThis::add( colorButton, i18n("Click here to choose the color used for the \"flash screen\" visible bell.") ); @@ -353,7 +353,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint()); stickyKeys = new TQCheckBox(i18n("Use &sticky keys"), grp); vvbox->addWidget(stickyKeys); @@ -377,7 +377,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint()); toggleKeysBeep = new TQCheckBox(i18n("Use system bell whenever a locking key gets activated or deactivated"), grp); vvbox->addWidget(toggleKeysBeep); @@ -388,7 +388,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addStretch(1); kNotifyModifiersButton = new TQPushButton(i18n("Configure System Notification..."), grp); - kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + kNotifyModifiersButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); hbox->addWidget(kNotifyModifiersButton); connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); @@ -415,7 +415,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint()); slowKeys = new TQCheckBox(i18n("&Use slow keys"), grp); vvbox->addWidget(slowKeys); @@ -447,7 +447,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint()); bounceKeys = new TQCheckBox(i18n("Use bou&nce keys"), grp); vvbox->addWidget(bounceKeys); @@ -491,7 +491,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint()); gestures = new TQCheckBox(i18n("Use gestures for activating sticky keys and slow keys"), grp); vvbox->addWidget(gestures); @@ -521,7 +521,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint()); accessxBeep = new TQCheckBox(i18n("Use the system bell whenever a gesture is used to turn an accessibility feature on or off"), grp); vvbox->addWidget(accessxBeep); @@ -536,7 +536,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addStretch(1); kNotifyAccessXButton = new TQPushButton(i18n("Configure System Notification..."), grp); - kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + kNotifyAccessXButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); hbox->addWidget(kNotifyAccessXButton); connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); diff --git a/kcontrol/accessibility/accessibilityconfigwidget.ui b/kcontrol/accessibility/accessibilityconfigwidget.ui index 5d0069a09..e81a6155b 100644 --- a/kcontrol/accessibility/accessibilityconfigwidget.ui +++ b/kcontrol/accessibility/accessibilityconfigwidget.ui @@ -95,7 +95,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -244,7 +244,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -338,7 +338,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>15</height> @@ -363,7 +363,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -420,7 +420,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -534,7 +534,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -625,7 +625,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -683,7 +683,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>61</height> @@ -789,7 +789,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="text"> <string>Ma&ximum speed:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -806,7 +806,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="text"> <string>Acceleration &time:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -895,7 +895,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -944,7 +944,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="text"> <string>&Repeat interval:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -992,7 +992,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="text"> <string>Acceleration &profile:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -1087,7 +1087,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="text"> <string>&Acceleration delay:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -1108,7 +1108,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>1</height> diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 792951aec..8239d2997 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -499,7 +499,7 @@ void KArtsModule::updateWidgets() if (item >= 0) { audioIO = audioIOList.at(item)->name; - bool jack = (audioIO == TQString::fromLatin1("jack")); + bool jack = (audioIO == TQString::tqfromLatin1("jack")); if(jack) { customRate->setChecked(false); @@ -620,39 +620,39 @@ TQString KArtsModule::createArgs(bool netTrans, TQString args; if(fragmentCount) - args += TQString::fromLatin1(" -F %1").arg(fragmentCount); + args += TQString::tqfromLatin1(" -F %1").arg(fragmentCount); if(fragmentSize) - args += TQString::fromLatin1(" -S %1").arg(fragmentSize); + args += TQString::tqfromLatin1(" -S %1").arg(fragmentSize); if (!audioIO.isEmpty()) - args += TQString::fromLatin1(" -a %1").arg(audioIO); + args += TQString::tqfromLatin1(" -a %1").arg(audioIO); if (duplex) - args += TQString::fromLatin1(" -d"); + args += TQString::tqfromLatin1(" -d"); if (netTrans) - args += TQString::fromLatin1(" -n"); + args += TQString::tqfromLatin1(" -n"); if (!deviceName.isEmpty()) - args += TQString::fromLatin1(" -D ") + deviceName; + args += TQString::tqfromLatin1(" -D ") + deviceName; if (rate) - args += TQString::fromLatin1(" -r %1").arg(rate); + args += TQString::tqfromLatin1(" -r %1").arg(rate); if (bits) - args += TQString::fromLatin1(" -b %1").arg(bits); + args += TQString::tqfromLatin1(" -b %1").arg(bits); if (autoSuspend && suspendTime) - args += TQString::fromLatin1(" -s %1").arg(suspendTime); + args += TQString::tqfromLatin1(" -s %1").arg(suspendTime); if (!addOptions.isEmpty()) args += TQChar(' ') + addOptions; - args += TQString::fromLatin1(" -m artsmessage"); - args += TQString::fromLatin1(" -c drkonqi"); - args += TQString::fromLatin1(" -l 3"); - args += TQString::fromLatin1(" -f"); + args += TQString::tqfromLatin1(" -m artsmessage"); + args += TQString::tqfromLatin1(" -c drkonqi"); + args += TQString::tqfromLatin1(" -l 3"); + args += TQString::tqfromLatin1(" -f"); return args; } diff --git a/kcontrol/arts/generaltab.ui b/kcontrol/arts/generaltab.ui index 5b7ba7f79..f0d42dd8a 100644 --- a/kcontrol/arts/generaltab.ui +++ b/kcontrol/arts/generaltab.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>generalTab</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>generalTab</cstring> </property> @@ -12,7 +12,7 @@ <height>613</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>450</height> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>startServer</cstring> </property> @@ -42,7 +42,7 @@ Recommended if you want sound.</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame3</cstring> </property> @@ -53,7 +53,7 @@ Recommended if you want sound.</string> <enum>Sunken</enum> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>networkedSoundGroupBox</cstring> </property> @@ -75,7 +75,7 @@ Recommended if you want sound.</string> <string><i>Enable this option if you want to play sound on a remote computer or you want to be able to control sound on this system from another computer.</i></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>networkTransparent</cstring> </property> @@ -88,7 +88,7 @@ Recommended if you want sound.</string> </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>realtimeGroupBox</cstring> </property> @@ -107,7 +107,7 @@ Recommended if you want sound.</string> <string><i>If your sound is skipping during playback, enable running with highest possible priority. Increasing your sound buffer might also help.</i></string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>startRealtime</cstring> </property> @@ -121,7 +121,7 @@ Recommended if you want sound.</string> <string>On systems which support realtime scheduling, if you have sufficient permissions, this option will enable a very high priority for processing sound requests.</string> </property> </widget> - <widget class="QSlider" row="2" column="1"> + <widget class="TQSlider" row="2" column="1"> <property name="name"> <cstring>latencySlider</cstring> </property> @@ -144,7 +144,7 @@ Recommended if you want sound.</string> <number>50</number> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -155,7 +155,7 @@ Recommended if you want sound.</string> <cstring>latencySlider</cstring> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>latencyLabel</cstring> </property> @@ -165,7 +165,7 @@ Recommended if you want sound.</string> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>autoSuspendGroupBox</cstring> </property> @@ -184,7 +184,7 @@ Recommended if you want sound.</string> <string><i>The KDE sound system takes exclusive control over your audio hardware, blocking programs that may wish to use it directly. If the KDE sound system sits idle it can give up this exclusive control.</i></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout7</cstring> </property> @@ -192,7 +192,7 @@ Recommended if you want sound.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>autoSuspend</cstring> </property> @@ -227,7 +227,7 @@ Recommended if you want sound.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>173</width> <height>20</height> @@ -238,7 +238,7 @@ Recommended if you want sound.</string> </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout3</cstring> </property> @@ -256,14 +256,14 @@ Recommended if you want sound.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>testSound</cstring> </property> @@ -289,7 +289,7 @@ Recommended if you want sound.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -308,7 +308,7 @@ Recommended if you want sound.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kcontrol/arts/hardwaretab.ui b/kcontrol/arts/hardwaretab.ui index c11f19962..68ed5916f 100644 --- a/kcontrol/arts/hardwaretab.ui +++ b/kcontrol/arts/hardwaretab.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>hardwareTab</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>hardwareTab</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout57</cstring> </property> @@ -41,7 +41,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -60,7 +60,7 @@ <cstring>audioIO</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>audioIO</cstring> </property> @@ -75,7 +75,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout31</cstring> </property> @@ -83,7 +83,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>fullDuplex</cstring> </property> @@ -99,7 +99,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="5" column="0"> + <widget class="TQCheckBox" row="5" column="0"> <property name="name"> <cstring>customOptions</cstring> </property> @@ -107,7 +107,7 @@ <string>Use other custom &options:</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>customDevice</cstring> </property> @@ -115,7 +115,7 @@ <string>Override &device location:</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout4</cstring> </property> @@ -133,14 +133,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -151,7 +151,7 @@ <cstring>soundQuality</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Default</string> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> @@ -198,7 +198,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>customRate</cstring> </property> @@ -206,7 +206,7 @@ <string>Use &custom sampling rate:</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> <cstring>layout6</cstring> </property> @@ -214,7 +214,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>samplingRate</cstring> </property> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> @@ -261,7 +261,7 @@ </spacer> </hbox> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>addOptions</cstring> </property> @@ -269,7 +269,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>deviceName</cstring> </property> @@ -282,7 +282,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -293,7 +293,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>midiUseMapper</cstring> </property> @@ -301,7 +301,7 @@ <string>Use MIDI ma&pper:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -312,7 +312,7 @@ <cstring>deviceName</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>midiDevice</cstring> </property> @@ -345,7 +345,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp index 5c7618a1b..d15d344a7 100644 --- a/kcontrol/arts/krichtextlabel.cpp +++ b/kcontrol/arts/krichtextlabel.cpp @@ -40,15 +40,15 @@ static TQString qrichtextify( const TQString& text ) KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); - setAlignment( Qt::WordBreak ); + m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); + tqsetAlignment( TQt::WordBreak ); setText(text); } KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); - setAlignment( Qt::WordBreak ); + m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); + tqsetAlignment( TQt::WordBreak ); } void KRichTextLabel::setDefaultWidth(int defaultWidth) @@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false); } -TQSize KRichTextLabel::minimumSizeHint() const +TQSize KRichTextLabel::tqminimumSizeHint() const { TQString qt_text = qrichtextify( text() ); int pref_width = 0; @@ -97,9 +97,9 @@ TQSize KRichTextLabel::minimumSizeHint() const return TQSize(pref_width, rt.height()); } -TQSize KRichTextLabel::sizeHint() const +TQSize KRichTextLabel::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } void KRichTextLabel::setText( const TQString &text ) { diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h index 40ead0375..6f6ef1343 100644 --- a/kcontrol/arts/krichtextlabel.h +++ b/kcontrol/arts/krichtextlabel.h @@ -45,8 +45,8 @@ public: int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); - virtual TQSize minimumSizeHint() const; - virtual TQSize sizeHint() const; + virtual TQSize tqminimumSizeHint() const; + virtual TQSize tqsizeHint() const; TQSizePolicy sizePolicy() const; public slots: diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp index e1f9ece96..644cfc9df 100644 --- a/kcontrol/background/bgadvanced.cpp +++ b/kcontrol/background/bgadvanced.cpp @@ -240,7 +240,7 @@ void BGAdvancedDialog::updateUI() void BGAdvancedDialog::removeProgram(const TQString &name) { - if (m_programItems.find(name)) + if (m_programItems.tqfind(name)) { delete m_programItems[name]; m_programItems.remove(name); @@ -265,7 +265,7 @@ void BGAdvancedDialog::addProgram(const TQString &name) void BGAdvancedDialog::selectProgram(const TQString &name) { - if (m_programItems.find(name)) + if (m_programItems.tqfind(name)) { TQListViewItem *item = m_programItems[name]; dlg->m_listPrograms->ensureItemVisible(item); @@ -432,9 +432,9 @@ KProgramEditDialog::KProgramEditDialog(const TQString &program, TQWidget *parent m_RefreshEdit->setRange(5, 60); m_RefreshEdit->setSteps(5, 10); m_RefreshEdit->setSuffix(i18n(" min")); - m_RefreshEdit->setFixedSize(m_RefreshEdit->sizeHint()); + m_RefreshEdit->setFixedSize(m_RefreshEdit->tqsizeHint()); lbl->setBuddy(m_RefreshEdit); - grid->addWidget(m_RefreshEdit, 5, 1, AlignLeft); + grid->addWidget(m_RefreshEdit, 5, 1, Qt::AlignLeft); m_Program = program; if (m_Program.isEmpty()) { diff --git a/kcontrol/background/bgadvanced_ui.ui b/kcontrol/background/bgadvanced_ui.ui index 6aa3d436a..55dbc384e 100644 --- a/kcontrol/background/bgadvanced_ui.ui +++ b/kcontrol/background/bgadvanced_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>BGAdvancedBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>BGAdvancedBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_groupProgram</cstring> </property> @@ -33,7 +33,7 @@ <property name="margin"> <number>11</number> </property> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>m_buttonAdd</cstring> </property> @@ -50,7 +50,7 @@ </qt></string> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>m_buttonRemove</cstring> </property> @@ -64,7 +64,7 @@ <string>Click here to remove programs from this list. Please note that it does not remove the program from your system, it only removes it from the available options in the background drawing programs list.</string> </property> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>m_buttonModify</cstring> </property> @@ -91,14 +91,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QListView" row="1" column="0" rowspan="4" colspan="1"> + <widget class="TQListView" row="1" column="0" rowspan="4" colspan="1"> <column> <property name="text"> <string>Program</string> @@ -138,7 +138,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>400</width> <height>0</height> @@ -156,7 +156,7 @@ You can also remove programs from this list clicking on the <b>Remove</ </qt></string> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_cbProgram</cstring> </property> @@ -169,7 +169,7 @@ You can also remove programs from this list clicking on the <b>Remove</ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_groupIconText</cstring> </property> @@ -199,7 +199,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <string>Click here to change the color of the desktop font.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -223,7 +223,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>220</width> <height>20</height> @@ -244,7 +244,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <string>Click here to select the solid background color. Choose a different color from the background text color to assure readability.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>m_cbSolidTextBackground</cstring> </property> @@ -255,7 +255,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <string>Check here if you want to use a solid background color. This is useful to ensure that the desktop text will be identifiable against all background colors and wallpapers, or in other words, that a background or wallpaper will not make a desktop text of a similar color difficult to read.</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>m_cbShadow</cstring> </property> @@ -266,7 +266,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <string>Check here to enable a shadow outline around the desktop font. This also improves the readability of the desktop text against backgrounds of a similar color.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel6_2</cstring> </property> @@ -280,7 +280,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <string>Choose here the maximum number of text lines below an icon on the desktop. Longer text will be truncated at the end of the last line.</string> </property> </widget> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>m_spinTextLines</cstring> </property> @@ -294,7 +294,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <string>Choose here the maximum number of text lines below an icon on the desktop. Longer text will be truncated at the end of the last line.</string> </property> </widget> - <widget class="QSpinBox" row="4" column="1"> + <widget class="TQSpinBox" row="4" column="1"> <property name="name"> <cstring>m_spinTextWidth</cstring> </property> @@ -314,7 +314,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <string>Choose here the maximum width of text lines (in pixel) below an icon on the desktop. If set to 'Auto' a default width based on the current font is used.</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel6_2_2</cstring> </property> @@ -330,7 +330,7 @@ You can also remove programs from this list clicking on the <b>Remove</ </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_groupCache</cstring> </property> @@ -344,7 +344,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <property name="margin"> <number>11</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_lblCache</cstring> </property> @@ -355,7 +355,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <string>In this box you can enter how much memory KDE should use for caching the background(s). If you have different backgrounds for the different desktops caching can make switching desktops smoother at the expense of higher memory use.</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>m_spinCache</cstring> </property> @@ -376,7 +376,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -395,7 +395,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 8294f53a3..b166704ad 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -75,7 +75,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop) m_previewUpdates = true; KWinModule *m_kwin; - m_kwin = new KWinModule(this); + m_kwin = new KWinModule(TQT_TQOBJECT(this)); m_curDesk = m_kwin->currentDesktop(); TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); m_useViewports = s.width() * s.height() > 1; @@ -142,7 +142,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop) } // background image settings - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_urlWallpaperButton->setIconSet( iconSet ); m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -257,7 +257,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop) updateUI(); #if (QT_VERSION-0 >= 0x030200) - connect( qApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support + connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support #endif } @@ -405,7 +405,7 @@ void BGDialog::slotIdentifyScreens() // Taken from PositionTab::showIdentify in kdebase/kcontrol/kicker/positiontab_impl.cpp for(unsigned s = 0; s < m_numScreens; s++) { - TQLabel *screenLabel = new TQLabel(0,"Screen Identify", WDestructiveClose | WStyle_Customize | WX11BypassWM); + TQLabel *screenLabel = new TQLabel(0,"Screen Identify", (WFlags)(WDestructiveClose | WStyle_Customize | WX11BypassWM)); TQFont identifyFont(KGlobalSettings::generalFont()); identifyFont.setPixelSize(100); @@ -414,14 +414,14 @@ void BGDialog::slotIdentifyScreens() screenLabel->setFrameStyle(TQFrame::Panel); screenLabel->setFrameShadow(TQFrame::Plain); - screenLabel->setAlignment(Qt::AlignCenter); + screenLabel->tqsetAlignment(Qt::AlignCenter); screenLabel->setNum(int(s + 1)); // BUGLET: we should not allow the identification to be entered again // until the timer fires. TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); - TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint()); + TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint()); targetGeometry.moveCenter(screenCenter); screenLabel->setGeometry(targetGeometry); @@ -441,14 +441,14 @@ void BGDialog::initUI() else { for (unsigned i = 0; i < (m_numDesks/m_numViewports); ++i) { for (unsigned j = 0; j < m_numViewports; ++j) { - m_comboDesktop->insertItem(i18n("Desktop %1 Viewport %2").arg(i+1).arg(j+1)); + m_comboDesktop->insertItem(i18n("Desktop %1 Viewport %2").tqarg(i+1).tqarg(j+1)); } } } // Screens for (unsigned i = 0; i < m_numScreens; ++i) - m_comboScreen->insertItem( i18n("Screen %1").arg(TQString::number(i+1)) ); + m_comboScreen->insertItem( i18n("Screen %1").tqarg(TQString::number(i+1)) ); // Patterns m_comboPattern->insertItem(i18n("Single Color")); @@ -510,7 +510,7 @@ void BGDialog::loadWallpaperFilesList() { KSimpleConfig fileConfig(*it); fileConfig.setGroup("Wallpaper"); - int slash = (*it).findRev('/') + 1; + int slash = (*it).tqfindRev('/') + 1; TQString directory = (*it).left(slash); TQString imageCaption = fileConfig.readEntry("Name"); @@ -524,14 +524,14 @@ void BGDialog::loadWallpaperFilesList() { if (imageCaption.isEmpty()) { imageCaption = fileName; - imageCaption.replace('_', ' '); + imageCaption.tqreplace('_', ' '); imageCaption = KStringHandler::capwords(imageCaption); } // avoid name collisions TQString rs = imageCaption; TQString lrs = rs.lower(); - for (int n = 1; papers.find(lrs) != papers.end(); ++n) + for (int n = 1; papers.tqfind(lrs) != papers.end(); ++n) { rs = imageCaption + " (" + TQString::number(n) + ')'; lrs = rs.lower(); @@ -562,8 +562,8 @@ void BGDialog::loadWallpaperFilesList() { if (imageCaption.isEmpty()) { - int slash = (*it).findRev('/') + 1; - int endDot = (*it).findRev('.'); + int slash = (*it).tqfindRev('/') + 1; + int endDot = (*it).tqfindRev('.'); // strip the extension if it exists if (endDot != -1 && endDot > slash) @@ -571,14 +571,14 @@ void BGDialog::loadWallpaperFilesList() { else imageCaption = (*it).mid(slash); - imageCaption.replace('_', ' '); + imageCaption.tqreplace('_', ' '); imageCaption = KStringHandler::capwords(imageCaption); } // avoid name collisions TQString rs = imageCaption; TQString lrs = rs.lower(); - for (int n = 1; papers.find(lrs) != papers.end(); ++n) + for (int n = 1; papers.tqfind(lrs) != papers.end(); ++n) { rs = imageCaption + " (" + TQString::number(n) + ')'; lrs = rs.lower(); @@ -606,12 +606,12 @@ void BGDialog::setWallpaper(const TQString &s) KComboBox *comboWallpaper = m_urlWallpaperBox; comboWallpaper->blockSignals(true); - if (m_wallpaper.find(s) == m_wallpaper.end()) + if (m_wallpaper.tqfind(s) == m_wallpaper.end()) { int i = comboWallpaper->count(); TQString imageCaption; - int slash = s.findRev('/') + 1; - int endDot = s.findRev('.'); + int slash = s.tqfindRev('/') + 1; + int endDot = s.tqfindRev('.'); // strip the extension if it exists if (endDot != -1 && endDot > slash) @@ -750,7 +750,7 @@ void BGDialog::updateUI() case KBackgroundSettings::Pattern: { - int i = m_patterns.findIndex(r->KBackgroundPattern::name()); + int i = m_patterns.tqfindIndex(r->KBackgroundPattern::name()); if (i >= 0) m_comboPattern->setCurrentItem(NR_PREDEF_PATTERNS+i); else @@ -1004,7 +1004,7 @@ void BGDialog::slotSetupMulti() { KBackgroundRenderer *r = eRenderer(); - BGMultiWallpaperDialog dlg(r, topLevelWidget()); + BGMultiWallpaperDialog dlg(r, tqtopLevelWidget()); if (dlg.exec() == TQDialog::Accepted) { r->stop(); m_slideShowRandom = r->multiWallpaperMode(); @@ -1182,7 +1182,7 @@ void BGDialog::slotAdvanced() KBackgroundRenderer *r = eRenderer(); m_previewUpdates = false; - BGAdvancedDialog dlg(r, topLevelWidget(), m_multidesktop); + BGAdvancedDialog dlg(r, tqtopLevelWidget(), m_multidesktop); if (!m_pMonitorArrangement->isEnabled()) { dlg.makeReadOnly(); diff --git a/kcontrol/background/bgdialog_ui.ui b/kcontrol/background/bgdialog_ui.ui index 7cc6571d5..c3d1a0344 100644 --- a/kcontrol/background/bgdialog_ui.ui +++ b/kcontrol/background/bgdialog_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>BGDialog_UI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>BGDialog_UI</cstring> </property> @@ -20,7 +20,7 @@ <number>1</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_pDesktopLabel</cstring> </property> @@ -105,14 +105,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>0</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="1" column="4" rowspan="2" colspan="1"> + <widget class="TQLayoutWidget" row="1" column="4" rowspan="2" colspan="1"> <property name="name"> <cstring>layout36</cstring> </property> @@ -120,7 +120,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_screenArrangement</cstring> </property> @@ -132,14 +132,14 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> </size> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout35</cstring> </property> @@ -161,14 +161,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>4</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonIdentifyScreens</cstring> </property> @@ -197,7 +197,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>4</width> <height>20</height> @@ -219,14 +219,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>4</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonAdvanced</cstring> </property> @@ -255,7 +255,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>4</width> <height>20</height> @@ -277,14 +277,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>4</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonGetNew</cstring> </property> @@ -313,7 +313,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>4</width> <height>20</height> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -342,7 +342,7 @@ </spacer> </vbox> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="4"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -353,7 +353,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_lblWallpaperPos</cstring> </property> @@ -376,7 +376,7 @@ </ul></qt></string> </property> </widget> - <widget class="QComboBox" row="5" column="1"> + <widget class="TQComboBox" row="5" column="1"> <property name="name"> <cstring>m_comboBlend</cstring> </property> @@ -384,7 +384,7 @@ <string>If you have selected to use a background picture you can choose various methods of blending the background colors with the picture. The default option of "No Blending" means that the picture simply obscures the background colors below.</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> <cstring>layout31</cstring> </property> @@ -416,7 +416,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>m_lblColors</cstring> </property> @@ -427,7 +427,7 @@ <cstring>m_comboPattern</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>m_lblBlending</cstring> </property> @@ -438,7 +438,7 @@ <cstring>m_comboBlend</cstring> </property> </widget> - <widget class="QLayoutWidget" row="6" column="1"> + <widget class="TQLayoutWidget" row="6" column="1"> <property name="name"> <cstring>layout23</cstring> </property> @@ -446,7 +446,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_lblBlendBalance</cstring> </property> @@ -460,7 +460,7 @@ <string>You can use this slider to control the degree of blending. You can experiment by moving the slider and looking at the effects in the preview image.</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>m_sliderBlend</cstring> </property> @@ -488,7 +488,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="7" column="1"> + <widget class="TQCheckBox" row="7" column="1"> <property name="name"> <cstring>m_cbBlendReverse</cstring> </property> @@ -499,7 +499,7 @@ <string>For some types of blending, you can reverse the role of the background and the picture by checking this option.</string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <property name="name"> <cstring>m_comboPattern</cstring> </property> @@ -522,7 +522,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>120</width> <height>10</height> @@ -539,14 +539,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>130</width> <height>10</height> </size> </property> </spacer> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>m_comboWallpaperPos</cstring> </property> @@ -565,7 +565,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>m_buttonGroupBackground</cstring> </property> @@ -576,7 +576,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>m_radioNoPicture</cstring> </property> @@ -584,7 +584,7 @@ <string>&No picture</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>m_radioSlideShow</cstring> </property> @@ -592,7 +592,7 @@ <string>&Slide show:</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>m_radioPicture</cstring> </property> @@ -613,14 +613,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>260</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>m_buttonSetupWallpapers</cstring> </property> @@ -641,14 +641,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>16</height> </size> </property> </spacer> - <widget class="QPushButton" row="1" column="3"> + <widget class="TQPushButton" row="1" column="3"> <property name="name"> <cstring>m_urlWallpaperButton</cstring> </property> diff --git a/kcontrol/background/bghash.h b/kcontrol/background/bghash.h index ab13daf90..61e9d7300 100644 --- a/kcontrol/background/bghash.h +++ b/kcontrol/background/bghash.h @@ -5,10 +5,10 @@ * TQString -> int hash. From Qt's TQGDict::hashKeyString(). */ -static int QHash(TQString key) +static int TQHash(TQString key) { int g, h = 0; - const TQChar *p = key.unicode(); + const TQChar *p = key.tqunicode(); for (unsigned i=0; i < key.length(); i++) { h = (h << 4) + p[i].cell(); if ((g = (h & 0xf0000000))) diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp index f78a7b616..696edc56c 100644 --- a/kcontrol/background/bgmonitor.cpp +++ b/kcontrol/background/bgmonitor.cpp @@ -157,7 +157,7 @@ void BGMonitorArrangement::setPixmap( const KPixmap & pm ) BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name) : TQLabel(parent, name) { - setAlignment(AlignCenter); + tqsetAlignment(AlignCenter); setScaledContents(true); setPixmap( TQPixmap( locate("data", "kcontrol/pics/monitor.png") ) ); m_pBGMonitor = new BGMonitor(this); @@ -168,8 +168,8 @@ BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name) void BGMonitorLabel::updateMonitorGeometry() { - double scaleX = double(width()) / double(sizeHint().width()); - double scaleY = double(height()) / double(sizeHint().height()); + double scaleX = double(width()) / double(tqsizeHint().width()); + double scaleY = double(height()) / double(tqsizeHint().height()); kdDebug() << k_funcinfo << " Setting geometry to " << TQRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl; m_pBGMonitor->setGeometry( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ); @@ -189,7 +189,7 @@ void BGMonitorLabel::resizeEvent( TQResizeEvent * e ) BGMonitor::BGMonitor(TQWidget *parent, const char *name) : TQLabel(parent, name) { - setAlignment(AlignCenter); + tqsetAlignment(AlignCenter); setScaledContents(true); setAcceptDrops(true); } diff --git a/kcontrol/background/bgmonitor.h b/kcontrol/background/bgmonitor.h index 92cf5eef4..4a86ea3d2 100644 --- a/kcontrol/background/bgmonitor.h +++ b/kcontrol/background/bgmonitor.h @@ -37,7 +37,7 @@ class KPixmap; * This class arranges and resizes a set of monitor images according to the * monitor geometries. */ -class BGMonitorArrangement : public QWidget +class BGMonitorArrangement : public TQWidget { Q_OBJECT public: @@ -72,7 +72,7 @@ protected: /** * Contains a BGMonitor. */ -class BGMonitorLabel : public QLabel +class BGMonitorLabel : public TQLabel { public: BGMonitorLabel(TQWidget *parent, const char *name=0L); @@ -93,7 +93,7 @@ protected: /** * This class handles drops on the preview monitor. */ -class BGMonitor : public QLabel +class BGMonitor : public TQLabel { Q_OBJECT public: diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index f11363982..7fd5cffd8 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -124,32 +124,32 @@ TQString KBackgroundRenderer::buildCommand() if (cmd.isEmpty()) return TQString(); - while ((pos = cmd.find('%', pos)) != -1) { + while ((pos = cmd.tqfind('%', pos)) != -1) { if (pos == (int) (cmd.length() - 1)) break; - switch (cmd.at(pos+1).latin1()) { + switch (cmd.tqat(pos+1).latin1()) { case 'f': createTempFile(); - cmd.replace(pos, 2, KShellProcess::quote(m_Tempfile->name())); + cmd.tqreplace(pos, 2, KShellProcess::quote(m_Tempfile->name())); pos += m_Tempfile->name().length() - 2; break; case 'x': num.setNum(m_Size.width()); - cmd.replace(pos, 2, num); + cmd.tqreplace(pos, 2, num); pos += num.length() - 2; break; case 'y': num.setNum(m_Size.height()); - cmd.replace(pos, 2, num); + cmd.tqreplace(pos, 2, num); pos += num.length() - 2; break; case '%': - cmd.replace(pos, 2, "%"); + cmd.tqreplace(pos, 2, "%"); pos--; break; default: @@ -191,7 +191,7 @@ int KBackgroundRenderer::doBackground(bool quit) int tile_val = TQPixmap::defaultDepth() >= 24 ? 1 : 2; // some dithering may be needed even with bpb==15/16, so don't use tileWidth==1 // for them - // with tileWidth>2, repainting the desktop causes nasty effect (XFree86 4.1.0 ) + // with tileWidth>2, tqrepainting the desktop causes nasty effect (XFree86 4.1.0 ) if( XQueryBestTile( qt_xdisplay(), qt_xrootwin(), tile_val, tile_val, &tileWidth, &tileHeight ) != Success ) tileWidth = tileHeight = tile_val; // some defaults @@ -383,7 +383,7 @@ wp_load: wpmode = NoWallpaper; goto wp_out; } - m_Wallpaper = m_Wallpaper.convertDepth(32, DiffuseAlphaDither); + m_Wallpaper = m_Wallpaper.convertDepth(32, Qt::DiffuseAlphaDither); // If we're previewing, scale the wallpaper down to make the preview // look more like the real desktop. @@ -584,7 +584,7 @@ void KBackgroundRenderer::fastWallpaperBlend() m_Pixmap.convertFromImage( m_Wallpaper ); return; } - else if( m_WallpaperRect.contains( TQRect( TQPoint( 0, 0 ), m_Size )) + else if( m_WallpaperRect.tqcontains( TQRect( TQPoint( 0, 0 ), m_Size )) && !m_Wallpaper.hasAlphaBuffer()) // wallpaper covers all and no blending m_Pixmap = TQPixmap( m_Size ); else if (m_Background.size() == m_Size) @@ -627,7 +627,7 @@ void KBackgroundRenderer::fullWallpaperBlend() m_Image = m_Background.copy(); if (m_Image.depth() < 32) - m_Image = m_Image.convertDepth(32, DiffuseAlphaDither); + m_Image = m_Image.convertDepth(32, Qt::DiffuseAlphaDither); } else { m_Image.create(w, h, 32); @@ -724,16 +724,16 @@ void KBackgroundRenderer::blend(TQImage& dst, TQRect dr, const TQImage& src, TQP for (y = 0; y < dr.height(); y++) { if (dst.scanLine(dr.y() + y) && src.scanLine(soffs.y() + y)) { - QRgb *b, *d; + TQRgb *b, *d; for (x = 0; x < dr.width(); x++) { - b = reinterpret_cast<QRgb*>(dst.scanLine(dr.y() + y) - + (dr.x() + x) * sizeof(QRgb)); - d = reinterpret_cast<QRgb*>(src.scanLine(soffs.y() + y) - + (soffs.x() + x) * sizeof(QRgb)); - a = (qAlpha(*d) * blendFactor) / 100; - *b = qRgb(qRed(*b) - (((qRed(*b) - qRed(*d)) * a) >> 8), - qGreen(*b) - (((qGreen(*b) - qGreen(*d)) * a) >> 8), - qBlue(*b) - (((qBlue(*b) - qBlue(*d)) * a) >> 8)); + b = reinterpret_cast<TQRgb*>(dst.scanLine(dr.y() + y) + + (dr.x() + x) * sizeof(TQRgb)); + d = reinterpret_cast<TQRgb*>(const_cast<TQImage&>(src).scanLine(soffs.y() + y) + + (soffs.x() + x) * sizeof(TQRgb)); + a = (tqAlpha(*d) * blendFactor) / 100; + *b = tqRgb(tqRed(*b) - (((tqRed(*b) - tqRed(*d)) * a) >> 8), + tqGreen(*b) - (((tqGreen(*b) - tqGreen(*d)) * a) >> 8), + tqBlue(*b) - (((tqBlue(*b) - tqBlue(*d)) * a) >> 8)); } } } @@ -996,13 +996,13 @@ void KBackgroundRenderer::saveCacheFile() m_Image.save( f, "PNG" ); // remove old entries from the cache TQDir dir( locateLocal( "cache", "background/" )); - if( const QFileInfoList* list = dir.entryInfoList( "*.png", TQDir::Files, TQDir::Time | TQDir::Reversed )) { + if( const TQFileInfoList* list = dir.entryInfoList( "*.png", TQDir::Files, TQDir::Time | TQDir::Reversed )) { int size = 0; - for( QFileInfoListIterator it( *list ); + for( TQFileInfoListIterator it( *list ); TQFileInfo* info = it.current(); ++it ) size += info->size(); - for( QFileInfoListIterator it( *list ); + for( TQFileInfoListIterator it( *list ); TQFileInfo* info = it.current(); ++it ) { if( size < 8 * 1024 * 1024 ) @@ -1129,7 +1129,7 @@ int KVirtualBGRenderer::hash() fp += m_renderer[i]->fingerprint(); } //kdDebug() << k_funcinfo << " fp=\""<<fp<<"\" h="<<QHash(fp)<<endl; - return QHash(fp); + return TQHash(fp); } @@ -1251,7 +1251,7 @@ void KVirtualBGRenderer::screenDone(int _desk, int _screen) Q_UNUSED(_screen); const KBackgroundRenderer * sender = dynamic_cast<const KBackgroundRenderer*>(this->sender()); - int screen = m_renderer.find(sender); + int screen = m_renderer.tqfind(sender); if (screen == -1) //?? return; diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index 8d3bdac0f..1683b49a0 100644 --- a/kcontrol/background/bgsettings.cpp +++ b/kcontrol/background/bgsettings.cpp @@ -122,7 +122,7 @@ void KBackgroundPattern::readSettings() m_Pattern = m_pConfig->readPathEntry("File"); m_Comment = m_pConfig->readEntry("Comment"); if (m_Comment.isEmpty()) - m_Comment = m_File.mid(m_File.findRev('/')+1); + m_Comment = m_File.mid(m_File.tqfindRev('/')+1); } @@ -172,7 +172,7 @@ TQString KBackgroundPattern::fingerprint() int KBackgroundPattern::hash() { if (hashdirty) { - m_Hash = QHash(fingerprint()); + m_Hash = TQHash(fingerprint()); hashdirty = false; } return m_Hash; @@ -190,10 +190,10 @@ TQStringList KBackgroundPattern::list() TQStringList::Iterator it; for (it=lst.begin(); it!=lst.end(); ++it) { // Strip path and suffix - int pos = (*it).findRev('/'); + int pos = (*it).tqfindRev('/'); if (pos != -1) (*it) = (*it).mid(pos+1); - pos = (*it).findRev('.'); + pos = (*it).tqfindRev('.'); if (pos != -1) (*it) = (*it).left(pos); } @@ -383,7 +383,7 @@ TQString KBackgroundProgram::fingerprint() int KBackgroundProgram::hash() { if (hashdirty) { - m_Hash = QHash(fingerprint()); + m_Hash = TQHash(fingerprint()); hashdirty = false; } return m_Hash; @@ -401,10 +401,10 @@ TQStringList KBackgroundProgram::list() TQStringList::Iterator it; for (it=lst.begin(); it!=lst.end(); ++it) { // Strip path and suffix - int pos = (*it).findRev('/'); + int pos = (*it).tqfindRev('/'); if (pos != -1) (*it) = (*it).mid(pos+1); - pos = (*it).findRev('.'); + pos = (*it).tqfindRev('.'); if (pos != -1) (*it) = (*it).left(pos); } @@ -665,7 +665,7 @@ void KBackgroundSettings::setWallpaperList(TQStringList list) } updateWallpaperFiles(); // Try to keep the current wallpaper (-1 to set position to one before it) - m_CurrentWallpaper = m_WallpaperFiles.findIndex(m_CurrentWallpaperName) - 1; + m_CurrentWallpaper = m_WallpaperFiles.tqfindIndex(m_CurrentWallpaperName) - 1; changeWallpaper(m_CurrentWallpaper < 0); } @@ -751,7 +751,7 @@ void KBackgroundSettings::readSettings(bool reparse) m_BackgroundMode = defBackgroundMode; s = m_pConfig->readEntry("BackgroundMode", "invalid"); - if (m_BMMap.contains(s)) { + if (m_BMMap.tqcontains(s)) { int mode = m_BMMap[s]; // consistency check if ( ((mode != Pattern) && (mode != Program)) || @@ -763,7 +763,7 @@ void KBackgroundSettings::readSettings(bool reparse) m_BlendMode = defBlendMode; s = m_pConfig->readEntry("BlendMode", "invalid"); - if (m_BlMMap.contains(s)) { + if (m_BlMMap.tqcontains(s)) { m_BlendMode = m_BlMMap[s]; } @@ -784,14 +784,14 @@ void KBackgroundSettings::readSettings(bool reparse) m_MultiMode = defMultiMode; s = m_pConfig->readEntry("MultiWallpaperMode"); - if (m_MMMap.contains(s)) { + if (m_MMMap.tqcontains(s)) { int mode = m_MMMap[s]; m_MultiMode = mode; } updateWallpaperFiles(); if( !m_CurrentWallpaperName.isEmpty()) - m_CurrentWallpaper = m_WallpaperFiles.findIndex(m_CurrentWallpaperName); + m_CurrentWallpaper = m_WallpaperFiles.tqfindIndex(m_CurrentWallpaperName); if(m_CurrentWallpaper < 0) m_CurrentWallpaper = 0; @@ -799,7 +799,7 @@ void KBackgroundSettings::readSettings(bool reparse) m_WallpaperMode = defWallpaperMode; m_Wallpaper = m_pConfig->readPathEntry("Wallpaper"); s = m_pConfig->readEntry("WallpaperMode", "invalid"); - if (m_WMMap.contains(s)) { + if (m_WMMap.tqcontains(s)) { int mode = m_WMMap[s]; // consistency check. if ((mode == NoWallpaper) || !m_Wallpaper.isEmpty() || (m_MultiMode == InOrder || m_MultiMode == Random)) @@ -1029,7 +1029,7 @@ TQString KBackgroundSettings::fingerprint() s += TQString("wm:%1;").arg(m_WallpaperMode); if (m_WallpaperMode != NoWallpaper) { - Q_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false); + TQ_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false); s += TQString("wp:%2:%1;").arg(rh).arg(currentWallpaper()); } @@ -1048,7 +1048,7 @@ TQString KBackgroundSettings::fingerprint() int KBackgroundSettings::hash() { if (hashdirty) { - m_Hash = QHash(fingerprint()); + m_Hash = TQHash(fingerprint()); hashdirty = false; } return m_Hash; diff --git a/kcontrol/background/bgwallpaper.h b/kcontrol/background/bgwallpaper.h index d2771c884..dfee2066e 100644 --- a/kcontrol/background/bgwallpaper.h +++ b/kcontrol/background/bgwallpaper.h @@ -31,7 +31,7 @@ class BGMultiWallpaperBase; class KBackgroundSettings; -class BGMultiWallpaperList : public QListBox +class BGMultiWallpaperList : public TQListBox { public: BGMultiWallpaperList(TQWidget *parent, const char *name); diff --git a/kcontrol/background/bgwallpaper_ui.ui b/kcontrol/background/bgwallpaper_ui.ui index c3d9a9a40..130157c08 100644 --- a/kcontrol/background/bgwallpaper_ui.ui +++ b/kcontrol/background/bgwallpaper_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>BGMultiWallpaperBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>BGMultiWallPaperBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -27,7 +27,7 @@ <string>Show the following pictures:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>m_cbRandom</cstring> </property> @@ -35,7 +35,7 @@ <string>&Show pictures in random order</string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout3</cstring> </property> @@ -43,7 +43,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -54,7 +54,7 @@ <cstring>m_spinInterval</cstring> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>m_spinInterval</cstring> </property> @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -78,7 +78,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> <cstring>layout4</cstring> </property> @@ -98,14 +98,14 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>100</height> </size> </property> </widget> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>m_buttonAdd</cstring> </property> @@ -123,14 +123,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>m_buttonRemove</cstring> </property> @@ -138,7 +138,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>m_buttonMoveDown</cstring> </property> @@ -146,7 +146,7 @@ <string>Move &Down</string> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>m_buttonMoveUp</cstring> </property> diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp index da77d7cda..321eef90a 100644 --- a/kcontrol/background/main.cpp +++ b/kcontrol/background/main.cpp @@ -113,7 +113,7 @@ void KBackground::save() else appname.sprintf("kdesktop-screen-%d", screen_number); - client->send(appname, "KBackgroundIface", "configure()", ""); + client->send(appname, "KBackgroundIface", "configure()", TQString("")); } void KBackground::defaults() diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index 109e436c4..7de5c7890 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -89,7 +89,7 @@ Dtime::Dtime(TQWidget * parent, const char *name) TQVBoxLayout *l1 = new TQVBoxLayout( dateBox, KDialog::spacingHint() ); cal = new KDatePicker( dateBox ); - cal->setMinimumSize(cal->sizeHint()); + cal->setMinimumSize(cal->tqsizeHint()); l1->addWidget( cal ); TQWhatsThis::add( cal, i18n("Here you can change the system date's day of the month, month and year.") ); @@ -120,7 +120,7 @@ Dtime::Dtime(TQWidget * parent, const char *name) TQLabel *dots1 = new TQLabel(":", timeBox); dots1->setMinimumWidth( 7 ); - dots1->setAlignment( TQLabel::AlignCenter ); + dots1->tqsetAlignment( TQLabel::AlignCenter ); v3->addMultiCellWidget(dots1, 0, 1, 3, 3 ); minute = new HMSTimeWidget( timeBox ); @@ -132,7 +132,7 @@ Dtime::Dtime(TQWidget * parent, const char *name) TQLabel *dots2 = new TQLabel(":", timeBox); dots2->setMinimumWidth( 7 ); - dots2->setAlignment( TQLabel::AlignCenter ); + dots2->tqsetAlignment( TQLabel::AlignCenter ); v3->addMultiCellWidget(dots2, 0, 1, 5, 5 ); second = new HMSTimeWidget( timeBox ); @@ -272,7 +272,7 @@ void Dtime::save() list.append(timeServerList->currentText()); for ( int i=0; i<timeServerList->count();i++ ) { TQString text = timeServerList->text(i); - if( list.find(text) == list.end()) + if( list.tqfind(text) == list.end()) list.append(text); // Limit so errors can go away and not stored forever if( list.count() == 10) @@ -284,16 +284,16 @@ void Dtime::save() if(setDateTimeAuto->isChecked() && !ntpUtility.isEmpty()){ // NTP Time setting TQString timeServer = timeServerList->currentText(); - if( timeServer.find( TQRegExp(".*\\(.*\\)$") ) != -1 ) { - timeServer.replace( TQRegExp(".*\\("), "" ); - timeServer.replace( TQRegExp("\\).*"), "" ); + if( timeServer.tqfind( TQRegExp(".*\\(.*\\)$") ) != -1 ) { + timeServer.tqreplace( TQRegExp(".*\\("), "" ); + timeServer.tqreplace( TQRegExp("\\).*"), "" ); // Would this be better?: s/^.*\(([^)]*)\).*$/\1/ } KProcess proc; proc << ntpUtility << timeServer; proc.start( KProcess::Block ); if( proc.exitStatus() != 0 ){ - KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").arg(timeServer).latin1())); + KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").tqarg(timeServer).latin1())); setDateTimeAuto->setChecked( false ); } else { @@ -368,7 +368,7 @@ TQString Dtime::quickHelp() const void Kclock::setTime(const TQTime &time) { this->time = time; - repaint(); + tqrepaint(); } void Kclock::paintEvent( TQPaintEvent * ) @@ -382,8 +382,8 @@ void Kclock::paintEvent( TQPaintEvent * ) TQPointArray pts; TQPoint cp = rect().center(); int d = QMIN(width(),height()); - TQColor hands = colorGroup().dark(); - TQColor shadow = colorGroup().text(); + TQColor hands = tqcolorGroup().dark(); + TQColor shadow = tqcolorGroup().text(); paint.setPen( shadow ); paint.setBrush( shadow ); paint.setViewport(4,4,width(),height()); diff --git a/kcontrol/clock/dtime.h b/kcontrol/clock/dtime.h index cf6cccc63..c48b7ecee 100644 --- a/kcontrol/clock/dtime.h +++ b/kcontrol/clock/dtime.h @@ -45,7 +45,7 @@ class HMSTimeWidget : public KIntSpinBox TQString mapValueToText(int); }; -class Dtime : public QWidget +class Dtime : public TQWidget { Q_OBJECT public: @@ -68,15 +68,15 @@ signals: private: void findNTPutility(); - QString ntpUtility; + TQString ntpUtility; TQWidget* privateLayoutWidget; - QCheckBox *setDateTimeAuto; - QComboBox *timeServerList; + TQCheckBox *setDateTimeAuto; + TQComboBox *timeServerList; KDatePicker *cal; - QComboBox *month; - QSpinBox *year; + TQComboBox *month; + TQSpinBox *year; HMSTimeWidget *hour; HMSTimeWidget *minute; @@ -84,17 +84,17 @@ private: Kclock *kclock; - QTime time; - QDate date; - QTimer internalTimer; + TQTime time; + TQDate date; + TQTimer internalTimer; - QString BufS; + TQString BufS; int BufI; bool refresh; bool ontimeout; }; -class Kclock : public QWidget +class Kclock : public TQWidget { Q_OBJECT @@ -109,7 +109,7 @@ protected: private: - QTime time; + TQTime time; }; class KStrictIntValidator : public TQIntValidator @@ -117,7 +117,7 @@ class KStrictIntValidator : public TQIntValidator public: KStrictIntValidator(int bottom, int top, TQWidget * parent, const char * name = 0 ) - : TQIntValidator(bottom, top, parent, name) {}; + : TQIntValidator(bottom, top, TQT_TQOBJECT(parent), name) {}; TQValidator::State validate( TQString & input, int & d ) const; }; diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp index 506bde5b6..9812fcd7c 100644 --- a/kcontrol/clock/tzone.cpp +++ b/kcontrol/clock/tzone.cpp @@ -77,7 +77,7 @@ void Tzone::currentZone() time_t now = time(0); tzset(); strftime(result.data(), result.size(), "%Z", localtime(&now)); - m_local->setText(localZone.arg(KTimezoneWidget::displayName(m_zoneDb.local())).arg(result)); + m_local->setText(localZone.tqarg(KTimezoneWidget::displayName(m_zoneDb.local())).tqarg(static_cast<const char *>(result))); } // FIXME: Does the logic in this routine actually work correctly? For example, @@ -113,7 +113,7 @@ void Tzone::save() for (TQString line = is.readLine(); !line.isNull(); line = is.readLine()) { - if (line.find("TZ=") == 0) + if (line.tqfind("TZ=") == 0) { *ts << "TZ=" << selectedzone << endl; found = true; diff --git a/kcontrol/clock/tzone.h b/kcontrol/clock/tzone.h index 3e874472f..1ecfc225e 100644 --- a/kcontrol/clock/tzone.h +++ b/kcontrol/clock/tzone.h @@ -29,7 +29,7 @@ class TQComboBox; class TQLabel; -class Tzone : public QVGroupBox +class Tzone : public TQVGroupBox { Q_OBJECT diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 6161198c0..39c1d55b9 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -254,9 +254,9 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis groupLayout = new TQHBoxLayout; groupLayout2->addLayout(groupLayout); - sb = new TQSlider( TQSlider::Horizontal,group,"Slider" ); + sb = new TQSlider( Qt::Horizontal,group,"Slider" ); sb->setRange( 0, 10 ); - sb->setFocusPolicy( TQWidget::StrongFocus ); + sb->setFocusPolicy( TQ_StrongFocus ); connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int))); TQWhatsThis::add(sb, i18n("Use this slider to change the contrast level" @@ -444,7 +444,7 @@ void KColorScheme::slotSave( ) if (!entry) return; sCurrentScheme = entry->path; KSimpleConfig *config = new KSimpleConfig(sCurrentScheme ); - int i = sCurrentScheme.findRev('/'); + int i = sCurrentScheme.tqfindRev('/'); if (i >= 0) sCurrentScheme = sCurrentScheme.mid(i+1); @@ -800,7 +800,7 @@ void KColorScheme::readScheme( int index ) sCurrentScheme = entry->path; config = new KSimpleConfig(sCurrentScheme, true); config->setGroup("Color Scheme"); - int i = sCurrentScheme.findRev('/'); + int i = sCurrentScheme.tqfindRev('/'); if (i >= 0) sCurrentScheme = sCurrentScheme.mid(i+1); } @@ -905,7 +905,7 @@ int KColorScheme::findSchemeByName(const TQString &scheme) return 1; TQString search = scheme; - int i = search.findRev('/'); + int i = search.tqfindRev('/'); if (i >= 0) search = search.mid(i+1); @@ -972,7 +972,7 @@ void KColorScheme::insertEntry(const TQString &sFile, const TQString &sName) { KColorSchemeEntry *newEntry = new KColorSchemeEntry(sFile, sName, true); mSchemeList->inSort(newEntry); - int newIndex = mSchemeList->findRef(newEntry)+nSysSchemes; + int newIndex = mSchemeList->tqfindRef(newEntry)+nSysSchemes; sList->insertItem(sName, newIndex); sList->setCurrentItem(newIndex); } diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index 67e68b3a3..09d3ecf69 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -64,7 +64,7 @@ void WidgetCanvas::paintEvent(TQPaintEvent *) void WidgetCanvas::mousePressEvent( TQMouseEvent *me ) { for ( int i = 0; i < MAX_HOTSPOTS; i++ ) - if ( hotspots[i].rect.contains( me->pos() ) ) { + if ( hotspots[i].rect.tqcontains( me->pos() ) ) { emit widgetSelected( hotspots[i].number ); return; } @@ -73,7 +73,7 @@ void WidgetCanvas::mousePressEvent( TQMouseEvent *me ) void WidgetCanvas::mouseMoveEvent( TQMouseEvent *me ) { for ( int i = 0; i < MAX_HOTSPOTS; i++ ) - if ( hotspots[i].rect.contains( me->pos() ) ) { + if ( hotspots[i].rect.tqcontains( me->pos() ) ) { if ( i != currentHotspot ) { TQString tip = tips[hotspots[i].number]; TQToolTip::remove( this ); @@ -91,7 +91,7 @@ void WidgetCanvas::dropEvent( TQDropEvent *e) TQColor c; if (KColorDrag::decode( e, c)) { for ( int i = 0; i < MAX_HOTSPOTS; i++ ) - if ( hotspots[i].rect.contains( e->pos() ) ) { + if ( hotspots[i].rect.tqcontains( e->pos() ) ) { emit colorDropped( hotspots[i].number, c); return; } @@ -315,7 +315,7 @@ void WidgetCanvas::drawSampleWidgets() // Create a scrollbar and redirect drawing into a temp. pixmap to save a // lot of fiddly drawing later. - TQScrollBar *vertScrollBar = new TQScrollBar( TQScrollBar::Vertical, this ); + TQScrollBar *vertScrollBar = new TQScrollBar( Qt::Vertical, this ); // TODO: vertScrollBar->setStyle( new TQMotifStyle() ); vertScrollBar->setGeometry( 400, 400, SCROLLBAR_SIZE, height()); vertScrollBar->setRange( 0, 0 ); @@ -327,7 +327,7 @@ void WidgetCanvas::drawSampleWidgets() #ifndef __osf__ TQPainter::redirect( vertScrollBar, &pm ); #endif - vertScrollBar->repaint(); + vertScrollBar->tqrepaint(); TQPainter::redirect( vertScrollBar, 0 ); vertScrollBar->hide(); @@ -337,8 +337,8 @@ void WidgetCanvas::drawSampleWidgets() // Initialize the pixmap which we draw sample widgets into. smplw.resize(width(), height()); - //smplw.fill( parentWidget()->back() ); - smplw.fill( parentWidget()->colorGroup().mid() ); + //smplw.fill( tqparentWidget()->back() ); + smplw.fill( tqparentWidget()->tqcolorGroup().mid() ); // Actually start painting in @@ -435,7 +435,7 @@ void WidgetCanvas::drawSampleWidgets() // Menu bar //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush); - kapp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint, + kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_PanelMenuBar, &paint, TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg); paint.setFont( menuFont ); @@ -443,7 +443,7 @@ void WidgetCanvas::drawSampleWidgets() TQString file = i18n("File"); textLen = paint.fontMetrics().width( file ); //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush); - kapp->style().drawPrimitive(TQStyle::PE_Panel, &paint, + kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &paint, TQRect(30, 59, textLen + 10, 21), cg); paint.drawText( 35, 74, file ); @@ -528,7 +528,7 @@ void WidgetCanvas::drawSampleWidgets() cg2.setColor(TQColorGroup::Button, button); cg2.setColor(TQColorGroup::Background, window); //qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush); - kapp->style().drawPrimitive(TQStyle::PE_ButtonCommand, &paint, + kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonCommand, &paint, TQRect(xpos, ypos, textLen+32, 28), cg2, TQStyle::Style_Enabled | TQStyle::Style_Raised); paint.setPen(buttonTxt); paint.drawText(xpos, ypos, textLen+32, 28, AlignCenter, @@ -567,9 +567,9 @@ void WidgetCanvas::drawSampleWidgets() popup->setItemEnabled( id, false ); // HACK: Force Layouting - //Sad Eagle: sizeHint() forces layouting too, and it's a lot less visible - //popup->sizeHint(); // Breaks with Qt 3.3 - popup->resize(popup->sizeHint()); + //Sad Eagle: tqsizeHint() forces layouting too, and it's a lot less visible + //popup->tqsizeHint(); // Breaks with Qt 3.3 + popup->resize(popup->tqsizeHint()); pm = TQPixmap::grabWidget( popup ); delete popup; @@ -585,12 +585,12 @@ void WidgetCanvas::drawSampleWidgets() // Valance qDrawWinPanel ( &paint, 0, 0, width(), height(), - parentWidget()->colorGroup(), TRUE, 0); + tqparentWidget()->tqcolorGroup(), TRUE, 0); // Stop the painting hotspots[ spot++ ] = HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ? - repaint( FALSE ); + tqrepaint( FALSE ); } diff --git a/kcontrol/colors/widgetcanvas.h b/kcontrol/colors/widgetcanvas.h index 44fc2fd12..aea314664 100644 --- a/kcontrol/colors/widgetcanvas.h +++ b/kcontrol/colors/widgetcanvas.h @@ -58,7 +58,7 @@ public: int number; }; -class WidgetCanvas : public QWidget +class WidgetCanvas : public TQWidget { Q_OBJECT diff --git a/kcontrol/componentchooser/browserconfig_ui.ui b/kcontrol/componentchooser/browserconfig_ui.ui index 886724970..84fed5cfc 100644 --- a/kcontrol/componentchooser/browserconfig_ui.ui +++ b/kcontrol/componentchooser/browserconfig_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>BrowserConfig_UI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>BrowserConfig_UI</cstring> </property> @@ -27,7 +27,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -41,7 +41,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>label</cstring> </property> @@ -49,7 +49,7 @@ <string><qt>Open <b>http</b> and <b>https</b> URLs</qt></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioKIO</cstring> </property> @@ -60,7 +60,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioExec</cstring> </property> @@ -68,7 +68,7 @@ <string>in the following browser:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout3</cstring> </property> @@ -86,14 +86,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>lineExec</cstring> </property> @@ -101,7 +101,7 @@ <bool>false</bool> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>btnSelectBrowser</cstring> </property> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index 88fdeb165..abe1e5c74 100644 --- a/kcontrol/componentchooser/componentchooser.cpp +++ b/kcontrol/componentchooser/componentchooser.cpp @@ -38,7 +38,7 @@ #include <ktrader.h> #include <kurlrequester.h> -class MyListBoxItem: public QListBoxText +class MyListBoxItem: public TQListBoxText { public: MyListBoxItem(const TQString& text, const TQString &file):TQListBoxText(text),File(file){} @@ -147,7 +147,7 @@ void CfgEmailClient::load(KConfig *) kmailCB->setChecked(useKMail); otherCB->setChecked(!useKMail); txtEMailClient->setText(emailClient); - txtEMailClient->setFixedHeight(txtEMailClient->sizeHint().height()); + txtEMailClient->setFixedHeight(txtEMailClient->tqsizeHint().height()); chkRunTerminal->setChecked((pSettings->getSetting(KEMailSettings::ClientTerminal) == "true")); emit changed(false); @@ -169,9 +169,9 @@ void CfgEmailClient::selectEmailClient() TQString client = dlg.text(); // get the preferred Terminal Application - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); - TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); - preferredTerminal += TQString::fromLatin1(" -e "); + KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); + TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); + preferredTerminal += TQString::tqfromLatin1(" -e "); int len = preferredTerminal.length(); bool b = client.left(len) == preferredTerminal; @@ -393,7 +393,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name): ServiceChooser->insertItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it))); } - ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width()); + ServiceChooser->setFixedWidth(ServiceChooser->tqsizeHint().width()); ServiceChooser->sort(); connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*))); ServiceChooser->setSelected(0,true); @@ -410,14 +410,14 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File); ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available"))); - ComponentDescription->setMinimumSize(ComponentDescription->sizeHint()); + ComponentDescription->setMinimumSize(ComponentDescription->tqsizeHint()); TQString cfgType=cfg.readEntry("configurationType"); TQWidget *newConfigWidget = 0; if (cfgType.isEmpty() || (cfgType=="component")) { - if (!(configWidget && configWidget->qt_cast("CfgComponent"))) + if (!(configWidget && configWidget->tqqt_cast("CfgComponent"))) { CfgComponent* cfgcomp = new CfgComponent(configContainer); cfgcomp->ChooserDocu->setText(i18n("Choose from the list below which component should be used by default for the %1 service.").arg(it->text())); @@ -430,7 +430,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { } else if (cfgType=="internal_email") { - if (!(configWidget && configWidget->qt_cast("CfgEmailClient"))) + if (!(configWidget && configWidget->tqqt_cast("CfgEmailClient"))) { newConfigWidget = new CfgEmailClient(configContainer); } @@ -438,7 +438,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { } else if (cfgType=="internal_terminal") { - if (!(configWidget && configWidget->qt_cast("CfgTerminalEmulator"))) + if (!(configWidget && configWidget->tqqt_cast("CfgTerminalEmulator"))) { newConfigWidget = new CfgTerminalEmulator(configContainer); } @@ -446,7 +446,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { } else if (cfgType=="internal_browser") { - if (!(configWidget && configWidget->qt_cast("CfgBrowser"))) + if (!(configWidget && configWidget->tqqt_cast("CfgBrowser"))) { newConfigWidget = new CfgBrowser(configContainer); } @@ -461,11 +461,11 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { delete configWidget; configWidget=newConfigWidget; connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool))); - configContainer->setMinimumSize(configWidget->sizeHint()); + configContainer->setMinimumSize(configWidget->tqsizeHint()); } if (configWidget) - static_cast<CfgPlugin*>(configWidget->qt_cast("CfgPlugin"))->load(&cfg); + static_cast<CfgPlugin*>(configWidget->tqqt_cast("CfgPlugin"))->load(&cfg); emitChanged(false); latestEditedService=static_cast<MyListBoxItem*>(it)->File; @@ -487,7 +487,7 @@ void ComponentChooser::load() { if( configWidget ) { CfgPlugin * plugin = static_cast<CfgPlugin*>( - configWidget->qt_cast( "CfgPlugin" ) ); + configWidget->tqqt_cast( "CfgPlugin" ) ); if( plugin ) { KSimpleConfig cfg(latestEditedService); @@ -500,7 +500,7 @@ void ComponentChooser::save() { if( configWidget ) { CfgPlugin * plugin = static_cast<CfgPlugin*>( - configWidget->qt_cast( "CfgPlugin" ) ); + configWidget->tqqt_cast( "CfgPlugin" ) ); if( plugin ) { KSimpleConfig cfg(latestEditedService); @@ -512,7 +512,7 @@ void ComponentChooser::save() { void ComponentChooser::restoreDefault() { if (configWidget) { - static_cast<CfgPlugin*>(configWidget->qt_cast("CfgPlugin"))->defaults(); + static_cast<CfgPlugin*>(configWidget->tqqt_cast("CfgPlugin"))->defaults(); emitChanged(true); } diff --git a/kcontrol/componentchooser/componentchooser_ui.ui b/kcontrol/componentchooser/componentchooser_ui.ui index ed1ed7f7b..8af26fab9 100644 --- a/kcontrol/componentchooser/componentchooser_ui.ui +++ b/kcontrol/componentchooser/componentchooser_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ComponentChooser_UI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ComponentChooser_UI</cstring> </property> @@ -27,7 +27,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox" row="1" column="1"> + <widget class="TQGroupBox" row="1" column="1"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -52,14 +52,14 @@ <property name="margin"> <number>11</number> </property> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>configContainer</cstring> </property> </widget> </vbox> </widget> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -84,14 +84,14 @@ <property name="margin"> <number>11</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>ComponentDescription</cstring> </property> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> diff --git a/kcontrol/componentchooser/componentconfig_ui.ui b/kcontrol/componentchooser/componentconfig_ui.ui index d6a7bba87..a988335a9 100644 --- a/kcontrol/componentchooser/componentconfig_ui.ui +++ b/kcontrol/componentchooser/componentconfig_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>ComponentConfig_UI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ComponentConfig_UI</cstring> </property> @@ -19,14 +19,14 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>ChooserDocu</cstring> </property> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>91</height> diff --git a/kcontrol/componentchooser/emailclientconfig_ui.ui b/kcontrol/componentchooser/emailclientconfig_ui.ui index d4cb44085..2cae19a55 100644 --- a/kcontrol/componentchooser/emailclientconfig_ui.ui +++ b/kcontrol/componentchooser/emailclientconfig_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EmailClientConfig_UI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EmailClientConfig_UI</cstring> </property> @@ -30,7 +30,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup2</cstring> </property> @@ -50,7 +50,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -58,7 +58,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>txtEMailClient</cstring> </property> @@ -73,7 +73,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -86,7 +86,7 @@ <string>Press this button to select your favorite email client. Please note that the file you select has to have the executable attribute set in order to be accepted.<br> You can also use several placeholders which will be replaced with the actual values when the email client is called:<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: Attachment </li> </ul></string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>btnSelectEmail</cstring> </property> @@ -102,7 +102,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>chkRunTerminal</cstring> </property> @@ -126,14 +126,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>16</height> </size> </property> </spacer> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kmailCB</cstring> </property> @@ -144,7 +144,7 @@ <string>Kmail is the standard Mail program for the KDE desktop.</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>otherCB</cstring> </property> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>16</height> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>16</height> diff --git a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui index 7d355fdd8..91d11f64b 100644 --- a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui +++ b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>TerminalEmulatorConfig_UI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>TerminalEmulatorConfig_UI</cstring> </property> @@ -27,7 +27,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -57,14 +57,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>87</height> </size> </property> </spacer> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>otherCB</cstring> </property> @@ -82,14 +82,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> </size> </property> </spacer> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>terminalCB</cstring> </property> @@ -97,7 +97,7 @@ <string>&Use Konsole as terminal application</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -105,7 +105,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>terminalLE</cstring> </property> @@ -120,7 +120,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -130,7 +130,7 @@ <string>Press this button to select your favorite terminal client. Please note that the file you select has to have the executable attribute set in order to be accepted.<br> Also note that some programs that utilize Terminal Emulator will not work if you add command line arguments (Example: konsole -ls).</string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>btnSelectTerminal</cstring> </property> diff --git a/kcontrol/crypto/certgen.ui b/kcontrol/crypto/certgen.ui index 19ee05535..09bb319d9 100644 --- a/kcontrol/crypto/certgen.ui +++ b/kcontrol/crypto/certgen.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>D_GenCert</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>D_GenCert</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>Certificate Creation Wizard</string> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -37,7 +37,7 @@ <string>Passphrase:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -53,7 +53,7 @@ <string>Country code:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -69,7 +69,7 @@ <string>State or province (in full):</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>T_CertType</cstring> </property> @@ -85,7 +85,7 @@ <string>Certificate type:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -101,7 +101,7 @@ <string>Passphrase (verify):</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -117,7 +117,7 @@ <string>City:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -133,7 +133,7 @@ <string>Organization name:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -149,7 +149,7 @@ <string>Organizational unit/group:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel8</cstring> </property> @@ -165,7 +165,7 @@ <string>Full hostname of the server:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>L_CertType</cstring> </property> @@ -178,7 +178,7 @@ </rect> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>LineEdit3</cstring> </property> @@ -194,7 +194,7 @@ <number>2</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel9</cstring> </property> @@ -210,7 +210,7 @@ <string>Email address:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>LineEdit4_2_2_2</cstring> </property> @@ -226,7 +226,7 @@ <number>200</number> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>LineEdit4_2_2_2_2</cstring> </property> @@ -242,7 +242,7 @@ <number>200</number> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>LineEdit4_2_2_2_3</cstring> </property> @@ -258,7 +258,7 @@ <number>200</number> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>E_Passphrase</cstring> </property> @@ -277,7 +277,7 @@ <enum>Password</enum> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>E_Passphrase_2</cstring> </property> @@ -296,7 +296,7 @@ <enum>Password</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel10</cstring> </property> @@ -312,7 +312,7 @@ <string>Days valid:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>SpinBox1</cstring> </property> @@ -334,7 +334,7 @@ <number>365</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel11</cstring> </property> @@ -350,7 +350,7 @@ <string>Digest:</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>CheckBox1</cstring> </property> @@ -369,7 +369,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel12</cstring> </property> @@ -385,7 +385,7 @@ <string>Alias:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>LineEdit19</cstring> </property> @@ -398,7 +398,7 @@ </rect> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>LineEdit4_2_2</cstring> </property> @@ -414,7 +414,7 @@ <number>200</number> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>LineEdit4_2</cstring> </property> @@ -430,7 +430,7 @@ <number>200</number> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>ComboBox2</cstring> </property> @@ -443,7 +443,7 @@ </rect> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>CheckBox2</cstring> </property> @@ -459,7 +459,7 @@ <string>Use DSA instead of RSA</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel13</cstring> </property> @@ -475,7 +475,7 @@ <string>Bit strength:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>ComboBox5</cstring> </property> @@ -488,7 +488,7 @@ </rect> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>LineEdit4</cstring> </property> diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index d39c09752..f6b3c9b16 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/kcontrol/crypto/crypto.cpp @@ -98,7 +98,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_crypto, KryptoFactory("kcmcrypto") ) CipherItem::CipherItem( TQListView *view, const TQString& cipher, int bits, int maxBits, KCryptoConfig *module ) - : TQCheckListItem( view, TQString::null, CheckBox ) + : TQCheckListItem( view, TQString(), CheckBox ) { m_cipher = cipher; m_bits = bits; @@ -122,13 +122,13 @@ TQString CipherItem::configName() const OtherCertItem::OtherCertItem( TQListView *view, const TQString& sub, const TQString& md5, bool perm, int policy, TQDateTime exp, KCryptoConfig *module ) - : TQListViewItem( view, TQString::null ), _sub(sub), _md5(md5), _exp(exp), _perm(perm), _policy(policy) + : TQListViewItem( view, TQString() ), _sub(sub), _md5(md5), _exp(exp), _perm(perm), _policy(policy) { m_module = module; KSSLX509Map cert(sub); setText(0, cert.getValue("O")); - setText(1, cert.getValue("CN").replace("\n", ", ")); + setText(1, cert.getValue("CN").tqreplace("\n", ", ")); if (_exp.date().year() > 3000 || _exp.date().year() < 1900) _exp.setDate(TQDate(3000,1,1)); @@ -146,12 +146,12 @@ TQString OtherCertItem::configName() const YourCertItem::YourCertItem( TQListView *view, TQString pkcs, TQString pass, TQString name, KCryptoConfig *module ) - : TQListViewItem( view, TQString::null ) + : TQListViewItem( view, TQString() ) { m_module = module; KSSLX509Map cert(name); - TQString tmp = cert.getValue("CN").replace("\n", ", "); + TQString tmp = cert.getValue("CN").tqreplace("\n", ", "); setText(0, tmp); setText(1, cert.getValue("Email")); _pkcs = pkcs; @@ -172,7 +172,7 @@ TQString YourCertItem::configName() const CAItem::CAItem( TQListView *view, TQString name, TQString cert, bool site, bool email, bool code, KCryptoConfig *module ) - : TQListViewItem( view, TQString::null ) + : TQListViewItem( view, TQString() ) { m_module = module; @@ -180,10 +180,10 @@ KSSLX509Map mcert(name); TQString tmp; setText(0, mcert.getValue("O")); tmp = mcert.getValue("OU"); - tmp.replace("\n", ", "); + tmp.tqreplace("\n", ", "); setText(1, tmp); tmp = mcert.getValue("CN"); - tmp.replace("\n", ", "); + tmp.tqreplace("\n", ", "); setText(2, tmp); _name = name; _cert = cert; @@ -334,7 +334,7 @@ TQString whatstr; grid->addMultiCellWidget(cwbg, 3, 3, 0, 1); TQString whatStr = i18n("<qt>Use these preconfigurations to more easily configure the SSL encryption settings. You can choose among the following modes: <ul>"); - cwcb->insertItem(TQString::null); + cwcb->insertItem(TQString()); cwcb->insertItem(i18n("Most Compatible")); whatStr += i18n("<li><b>Most Compatible:</b> Select the settings found to be most compatible.</li>"); cwcb->insertItem(i18n("US Ciphers Only")); @@ -486,8 +486,8 @@ TQString whatstr; grid->addWidget(yourSSLPass, 5, 5); grid->addMultiCellWidget(new KSeparator(KSeparator::HLine, tabYourSSLCert), 6, 6, 0, 5); - ySubject = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, TQString(TQString::null)); - yIssuer = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, TQString(TQString::null)); + ySubject = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, TQString(TQString())); + yIssuer = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, TQString(TQString())); grid->addMultiCellWidget(ySubject, 7, 11, 0, 2); grid->addMultiCellWidget(yIssuer, 7, 11, 3, 5); whatstr = i18n("This is the information known about the owner of the certificate."); @@ -641,8 +641,8 @@ TQString whatstr; otherSSLRemove->setEnabled(false); grid->addMultiCellWidget(new KSeparator(KSeparator::HLine, tabOtherSSLCert), 8, 8, 0, 5); - oSubject = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, TQString(TQString::null)); - oIssuer = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, TQString(TQString::null)); + oSubject = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, TQString(TQString())); + oIssuer = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, TQString(TQString())); grid->addMultiCellWidget(oSubject, 9, 13, 0, 2); grid->addMultiCellWidget(oIssuer, 9, 13, 3, 5); whatstr = i18n("This is the information known about the owner of the certificate."); @@ -668,7 +668,7 @@ TQString whatstr; cacheGroup = new TQVButtonGroup(i18n("Cache"), tabOtherSSLCert); cachePerm = new TQRadioButton(i18n("Permanentl&y"), cacheGroup); cacheUntil = new TQRadioButton(i18n("&Until"), cacheGroup); - untilDate = new KURLLabel(TQString::null, TQString::null, cacheGroup); + untilDate = new KURLLabel(TQString(), TQString(), cacheGroup); cacheGroup->setEnabled(false); grid->addMultiCellWidget(cacheGroup, 16, 19, 0, 2); @@ -744,8 +744,8 @@ TQString whatstr; connect(caSSLRestore, TQT_SIGNAL(clicked()), TQT_SLOT(slotCARestore())); grid->addWidget(caSSLRestore, 2, 7); - caSubject = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString::null)); - caIssuer = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString::null)); + caSubject = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString())); + caIssuer = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString())); grid->addMultiCellWidget(caSubject, 4, 6, 0, 3); grid->addMultiCellWidget(caIssuer, 4, 6, 4, 7); @@ -842,7 +842,7 @@ TQString whatstr; tabs->addTab(tabSSLCOpts, i18n("Validation Options")); #endif - tabs->resize(tabs->sizeHint()); + tabs->resize(tabs->tqsizeHint()); load(); } @@ -938,7 +938,7 @@ void KCryptoConfig::load( bool useDefaults ) for (TQStringList::Iterator i = groups.begin(); i != groups.end(); ++i) { if ((*i).isEmpty() || *i == "<default>" || *i == "General") continue; policies->setGroup(*i); - KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit()); + KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString()).local8Bit()); if (cert) { new OtherCertItem(otherSSLBox, cert->getSubject(), *i, policies->readBoolEntry("Permanent", true), @@ -958,7 +958,7 @@ void KCryptoConfig::load( bool useDefaults ) pcerts->readEntry("PKCS12Base64"), pcerts->readEntry("Password"), *i, this ); - j->setPassCache(TQString::null); + j->setPassCache(TQString()); } setAuthCertLists(); @@ -1181,7 +1181,7 @@ void KCryptoConfig::save() config->writeEntry("AuthMethod", "none"); if (defCertBox->currentItem() == 0) - config->writeEntry("DefaultCert", TQString::null); + config->writeEntry("DefaultCert", TQString()); else config->writeEntry("DefaultCert", defCertBox->currentText()); for (HostAuthItem *x = authDelList.first(); x != 0; x = authDelList.next()) { @@ -1331,7 +1331,7 @@ void KCryptoConfig::slotExportCert() { OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem()); if (x) { policies->setGroup(x->getMD5()); - KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit()); + KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString()).local8Bit()); if (cert) { KCertExport kce; kce.setCertificate(cert); @@ -1364,7 +1364,7 @@ OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem()); if (!x) return; policies->setGroup(x->getMD5()); - KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit()); + KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString()).local8Bit()); if (!cert) { KMessageBox::error(this, i18n("Error obtaining the certificate."), i18n("SSL")); @@ -1460,7 +1460,7 @@ TQDateTime qdt = x->getExpires(); void KCryptoConfig::slotOtherCertSelect() { OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem()); -TQString iss = TQString::null; +TQString iss = TQString(); if (x) { otherSSLExport->setEnabled(true); otherSSLVerify->setEnabled(true); @@ -1474,13 +1474,13 @@ TQString iss = TQString::null; cacheUntil->setEnabled(true); policies->setGroup(x->getMD5()); - KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit()); + KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString()).local8Bit()); if (cert) { TQPalette cspl; iss = cert->getIssuer(); cspl = validFrom->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1488,7 +1488,7 @@ TQString iss = TQString::null; validFrom->setPalette(cspl); cspl = validUntil->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1498,13 +1498,13 @@ TQString iss = TQString::null; validFrom->setText(cert->getNotBefore()); validUntil->setText(cert->getNotAfter()); untilDate->setText(x ? KGlobal::locale()->formatDateTime(x->getExpires()) - : KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC))); + : KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(Qt::UTC))); untilDate->setEnabled(x && !x->isPermanent()); pHash->setText(cert->getMD5DigestText()); delete cert; } else { - validFrom->setText(TQString::null); - validUntil->setText(TQString::null); + validFrom->setText(TQString()); + validUntil->setText(TQString()); pHash->clear(); } @@ -1538,15 +1538,15 @@ TQString iss = TQString::null; policyPrompt->setChecked(false); cachePerm->setEnabled(false); cacheUntil->setEnabled(false); - validFrom->setText(TQString::null); - validUntil->setText(TQString::null); - untilDate->setText(TQString::null); + validFrom->setText(TQString()); + validUntil->setText(TQString()); + untilDate->setText(TQString()); untilDate->setEnabled(false); pHash->clear(); } - oSubject->setValues(x ? x->getSub() : TQString(TQString::null)); + oSubject->setValues(x ? x->getSub() : TQString(TQString())); oIssuer->setValues(iss); } @@ -1554,7 +1554,7 @@ TQString iss = TQString::null; void KCryptoConfig::slotYourImport() { - TQString certFile = KFileDialog::getOpenFileName(TQString::null, "application/x-pkcs12"); + TQString certFile = KFileDialog::getOpenFileName(TQString(), "application/x-pkcs12"); if (certFile.isEmpty()) return; @@ -1599,7 +1599,7 @@ TryImportPassAgain: new YourCertItem(yourSSLBox, cert->toString(), - TQString::null, // the password - don't store it yet! + TQString(), // the password - don't store it yet! name, this ); @@ -1633,7 +1633,7 @@ YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem()); } // For now, we will only export to PKCS#12 - TQString certFile = KFileDialog::getSaveFileName(TQString::null, + TQString certFile = KFileDialog::getSaveFileName(TQString(), "application/x-pkcs12"); if (certFile.isEmpty()) return; @@ -1713,12 +1713,12 @@ TQString iss; // update the info iss = pkcs->getCertificate()->getIssuer(); - ySubject->setValues(x ? x->getName() : TQString(TQString::null)); + ySubject->setValues(x ? x->getName() : TQString(TQString())); yIssuer->setValues(iss); TQPalette cspl; KSSLCertificate *cert = pkcs->getCertificate(); cspl = yValidFrom->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1726,7 +1726,7 @@ TQString iss; yValidFrom->setPalette(cspl); cspl = yValidUntil->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1758,7 +1758,7 @@ TQString iss; KSSLCertificate *cert = pkcs->getCertificate(); iss = cert->getIssuer(); cspl = yValidFrom->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1766,7 +1766,7 @@ TQString iss; yValidFrom->setPalette(cspl); cspl = yValidUntil->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1785,7 +1785,7 @@ TQString iss; yHash->clear(); } - ySubject->setValues(x ? x->getName() : TQString(TQString::null)); + ySubject->setValues(x ? x->getName() : TQString(TQString())); yIssuer->setValues(iss); } @@ -1830,7 +1830,7 @@ TQCString oldpass = ""; void KCryptoConfig::slotCAImport() { - TQString certFile = KFileDialog::getOpenFileName(TQString::null, "application/x-x509-ca-cert"); + TQString certFile = KFileDialog::getOpenFileName(TQString(), "application/x-x509-ca-cert"); if (certFile.isEmpty()) return; @@ -1921,18 +1921,18 @@ void KCryptoConfig::slotCAImport() { if (certStore) { KOSSL::self()->X509_STORE_free(certStore); certStore = NULL; } - if (certtext.contains("-----BEGIN CERTIFICATE-----")) { + if (certtext.tqcontains("-----BEGIN CERTIFICATE-----")) { qf.reset(); - certtext = TQString::null; + certtext = TQString(); while (!qf.atEnd()) { TQString xx; qf.readLine(xx, qf.size()); certtext += xx; } - certtext = certtext.replace("-----BEGIN CERTIFICATE-----", TQString::null); - certtext = certtext.replace("-----END CERTIFICATE-----", TQString::null); + certtext = certtext.tqreplace("-----BEGIN CERTIFICATE-----", TQString()); + certtext = certtext.tqreplace("-----END CERTIFICATE-----", TQString()); certtext = certtext.stripWhiteSpace(); - certtext = certtext.replace("\n", TQString::null); + certtext = certtext.tqreplace("\n", TQString()); } else { // Must [could?] be DER qf.close(); @@ -2003,7 +2003,7 @@ void KCryptoConfig::slotCAImport() { void KCryptoConfig::offerImportToKMail( const TQString& certFile ) { - if ( KMessageBox::questionYesNo( this, i18n( "Do you want to make this certificate available to KMail as well?" ), TQString::null, i18n("Make Available"), i18n("Do Not Make Available") ) == KMessageBox::Yes ) { + if ( KMessageBox::questionYesNo( this, i18n( "Do you want to make this certificate available to KMail as well?" ), TQString(), i18n("Make Available"), i18n("Do Not Make Available") ) == KMessageBox::Yes ) { KProcess proc; proc << "kleopatra"; proc << "--import-certificate"; @@ -2057,7 +2057,7 @@ void KCryptoConfig::slotCARestore() { if (!sigcfg.hasKey("x509")) continue; new CAItem(caList, (*i), - sigcfg.readEntry("x509", TQString::null), + sigcfg.readEntry("x509", TQString()), sigcfg.readBoolEntry("site", false), sigcfg.readBoolEntry("email", false), sigcfg.readBoolEntry("code", false), @@ -2073,10 +2073,10 @@ void KCryptoConfig::slotCAItemChanged() { CAItem *x = static_cast<CAItem *>(caList->selectedItem()); if (x) { caSSLRemove->setEnabled(true); - caSubject->setValues(x ? x->getName() : TQString(TQString::null)); + caSubject->setValues(x ? x->getName() : TQString(TQString())); KSSLCertificate *cert = KSSLCertificate::fromString(x->getCert().local8Bit()); if (!cert) { - caIssuer->setValues(TQString(TQString::null)); + caIssuer->setValues(TQString(TQString())); caSite->setEnabled(false); caEmail->setEnabled(false); caCode->setEnabled(false); @@ -2100,8 +2100,8 @@ CAItem *x = static_cast<CAItem *>(caList->selectedItem()); caSite->setEnabled(false); caEmail->setEnabled(false); caCode->setEnabled(false); - caSubject->setValues(TQString(TQString::null)); - caIssuer->setValues(TQString(TQString::null)); + caSubject->setValues(TQString(TQString())); + caIssuer->setValues(TQString(TQString())); cHash->clear(); } } @@ -2122,8 +2122,8 @@ CAItem *x = static_cast<CAItem *>(caList->selectedItem()); void KCryptoConfig::slotNewHostAuth() { HostAuthItem *j = new HostAuthItem(hostAuthList, - TQString::null, - TQString::null, + TQString(), + TQString(), this ); j->setAction(KSSLCertificateHome::AuthSend); hostAuthList->setSelected(j, true); @@ -2241,7 +2241,7 @@ HostAuthItem *x = static_cast<HostAuthItem *>(hostAuthList->selectedItem()); if (x) { if (hostCertBox->currentItem() == 0) - x->setCertName(TQString::null); + x->setCertName(TQString()); else x->setCertName(hostCertBox->currentText()); configChanged(); } @@ -2350,7 +2350,7 @@ SSL_CONST SSL_METHOD *meth; break; // Leak of sc*? TQString scn(sc->name); - if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) { + if (scn.tqcontains("ADH-") || scn.tqcontains("NULL-") || scn.tqcontains("DES-CBC3-SHA") || scn.tqcontains("FZA-")) { continue; } k = SSL_CIPHER_get_bits(sc, &j); @@ -2378,7 +2378,7 @@ SSL_CONST SSL_METHOD *meth; break; // Leak of sc*? TQString scn(sc->name); - if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) { + if (scn.tqcontains("ADH-") || scn.tqcontains("NULL-") || scn.tqcontains("DES-CBC3-SHA") || scn.tqcontains("FZA-")) { continue; } k = SSL_CIPHER_get_bits(sc, &j); @@ -2448,7 +2448,7 @@ bool noneDef, noneHost; static_cast<HostAuthItem *>(hostAuthList->firstChild()); x; x = static_cast<HostAuthItem *>(x->nextSibling())) { - TQString newValue = TQString::null; + TQString newValue = TQString(); for (int i = 1; i < hostCertBox->count(); i++) { if (hostCertBox->text(i) == x->getCertName()) { newValue = x->getCertName(); diff --git a/kcontrol/crypto/crypto.h b/kcontrol/crypto/crypto.h index 7f1b1d21c..514012e71 100644 --- a/kcontrol/crypto/crypto.h +++ b/kcontrol/crypto/crypto.h @@ -47,7 +47,7 @@ class KSSLSigners; class KURLLabel; class KURLRequester; -class CipherItem : public QCheckListItem +class CipherItem : public TQCheckListItem { public: CipherItem( TQListView *view, const TQString& cipher, int bits, int maxBits, @@ -72,7 +72,7 @@ private: -class OtherCertItem : public QListViewItem +class OtherCertItem : public TQListViewItem { public: OtherCertItem(TQListView *view, const TQString& sub, const TQString& md5, bool perm, int policy, TQDateTime exp, KCryptoConfig *module ); @@ -102,7 +102,7 @@ private: -class YourCertItem : public QListViewItem +class YourCertItem : public TQListViewItem { public: YourCertItem(TQListView *view, TQString pkcs, TQString pass, TQString name, KCryptoConfig *module ); @@ -132,7 +132,7 @@ private: -class CAItem : public QListViewItem +class CAItem : public TQListViewItem { public: CAItem(TQListView *view, TQString name, TQString cert, bool site, bool email, bool code, KCryptoConfig *module ); @@ -166,7 +166,7 @@ private: -class HostAuthItem : public QListViewItem +class HostAuthItem : public TQListViewItem { public: HostAuthItem(TQListView *view, TQString host, TQString name, KCryptoConfig *module ) : TQListViewItem(view, TQString::null ) { diff --git a/kcontrol/crypto/kdatetimedlg.cpp b/kcontrol/crypto/kdatetimedlg.cpp index f7eae9883..872ffc304 100644 --- a/kcontrol/crypto/kdatetimedlg.cpp +++ b/kcontrol/crypto/kdatetimedlg.cpp @@ -107,7 +107,7 @@ void KDateTimeDlg::setTime(const TQTime& qtime) { void KDateTimeDlg::setDateTime(const TQDateTime& qdatetime) { - _date->setDate(qdatetime.date()); + _date->setDate(TQT_TQDATE_OBJECT(qdatetime.date())); _hours->setValue(qdatetime.time().hour()); _mins->setValue(qdatetime.time().minute()); _secs->setValue(qdatetime.time().second()); diff --git a/kcontrol/css/cssconfig.ui b/kcontrol/css/cssconfig.ui index c3d064b48..619cf7d0c 100644 --- a/kcontrol/css/cssconfig.ui +++ b/kcontrol/css/cssconfig.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CSSConfigDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CSSConfigDialog</cstring> </property> @@ -29,7 +29,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -60,7 +60,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>useDefault</cstring> </property> @@ -74,7 +74,7 @@ <string><b>Use default stylesheet</b><p>Select this option to use the default stylesheet.</p></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>useUser</cstring> </property> @@ -85,7 +85,7 @@ <string><b>Use user-defined stylesheet</b><p>If this box is checked, Konqueror will try to load a user-defined style sheet as specified in the location below. The style sheet allows you to completely override the way web pages are rendered in your browser. The file specified should contain a valid style sheet (see http://www.w3.org/Style/CSS for further information on cascading style sheets).</p></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout3</cstring> </property> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -120,7 +120,7 @@ </widget> </hbox> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>useAccess</cstring> </property> @@ -139,7 +139,7 @@ <string><b>Use accessibility stylesheet</b><p>Selecting this option will allow you to define a default font, font size, and font color with a few simple clicks of the mouse. Simply wander over to the Customize... dialog and pick out your desired options.</p></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -157,14 +157,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>customize</cstring> </property> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>451</width> <height>20</height> @@ -206,7 +206,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> diff --git a/kcontrol/css/csscustom.ui b/kcontrol/css/csscustom.ui index b19e08baf..5422f614d 100644 --- a/kcontrol/css/csscustom.ui +++ b/kcontrol/css/csscustom.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CSSCustomDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CSSCustomDialog</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -38,7 +38,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>7</string> @@ -119,7 +119,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>txtFontsize</cstring> </property> @@ -130,7 +130,7 @@ <cstring>basefontsize</cstring> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>dontScale</cstring> </property> @@ -151,7 +151,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>GroupBox3_2</cstring> </property> @@ -165,7 +165,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>hideImages</cstring> </property> @@ -176,7 +176,7 @@ <string><b>Suppress images</b><p>Selecting this will prevent Konqueror from loading images.</p></string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>hideBackground</cstring> </property> @@ -192,7 +192,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>GroupBox7</cstring> </property> @@ -206,7 +206,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>txtBaseFontFamily</cstring> </property> @@ -217,7 +217,7 @@ <cstring>fontFamily</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>fontFamily</cstring> </property> @@ -243,14 +243,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>sameFamily</cstring> </property> @@ -273,14 +273,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -294,7 +294,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>preview</cstring> </property> @@ -315,7 +315,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> @@ -324,7 +324,7 @@ </spacer> </hbox> </widget> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>ButtonGroup2</cstring> </property> @@ -341,7 +341,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>blackOnWhite</cstring> </property> @@ -355,7 +355,7 @@ <string><b>Black on White</b><p>This is what you normally see.</p></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>whiteOnBlack</cstring> </property> @@ -366,7 +366,7 @@ <string><b>White on Black</b><p>This is your classic inverse color scheme.</p></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>customColor</cstring> </property> @@ -377,7 +377,7 @@ <string><b>Custom</b><p>Select this option to define a custom color for the default font.</p></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -412,7 +412,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> @@ -429,7 +429,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -446,7 +446,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -463,14 +463,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>txtForeground</cstring> </property> @@ -495,7 +495,7 @@ <string><b>Background</b><p>Behind this door lays the ability to choose a custom default background.</p></string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>txtBackground</cstring> </property> @@ -511,7 +511,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>sameColor</cstring> </property> diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp index 552afd3a3..9706ccd5f 100644 --- a/kcontrol/css/kcmcss.cpp +++ b/kcontrol/css/kcmcss.cpp @@ -133,8 +133,8 @@ void CSSConfig::load( bool useDefaults ) customDialog->blackOnWhite->setChecked(m == "black-on-white"); customDialog->whiteOnBlack->setChecked(m == "white-on-black"); customDialog->customColor->setChecked(m == "custom"); - customDialog->backgroundColor->setColor(c->readColorEntry("BackColor", &Qt::white)); - customDialog->foregroundColor->setColor(c->readColorEntry("ForeColor", &Qt::black)); + customDialog->backgroundColor->setColor(c->readColorEntry("BackColor", &TQt::white)); + customDialog->foregroundColor->setColor(c->readColorEntry("ForeColor", &TQt::black)); customDialog->sameColor->setChecked(c->readBoolEntry("SameColor", false)); // Images diff --git a/kcontrol/css/preview.ui b/kcontrol/css/preview.ui index 438d40d37..a58946576 100644 --- a/kcontrol/css/preview.ui +++ b/kcontrol/css/preview.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>PreviewDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>PreviewDialog</cstring> </property> @@ -37,14 +37,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QTextBrowser" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQTextBrowser" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>preview</cstring> </property> @@ -62,7 +62,7 @@ people.</p> </qt></string> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>PushButton2</cstring> </property> diff --git a/kcontrol/css/template.cpp b/kcontrol/css/template.cpp index e237ed796..a34839ef2 100644 --- a/kcontrol/css/template.cpp +++ b/kcontrol/css/template.cpp @@ -23,16 +23,16 @@ bool CSSTemplate::expand(TQString destname, const TQMap<TQString,TQString> &dict { line = is.readLine(); - int start = line.find('$'); + int start = line.tqfind('$'); if (start >= 0) { - int end = line.find('$', start+1); + int end = line.tqfind('$', start+1); if (end >= 0) { TQString expr = line.mid(start+1, end-start-1); TQString res = dict[expr]; - line.replace(start, end-start+1, res); + line.tqreplace(start, end-start+1, res); } } os << line << endl; diff --git a/kcontrol/display/display.cpp b/kcontrol/display/display.cpp index d7675160e..9e3293965 100644 --- a/kcontrol/display/display.cpp +++ b/kcontrol/display/display.cpp @@ -85,7 +85,7 @@ void KCMDisplay::save() void KCMDisplay::moduleChanged( bool isChanged ) { - TQMap<KCModule*, bool>::Iterator currentModule = m_modules.find(static_cast<KCModule*>(const_cast<TQObject*>(sender()))); + TQMap<KCModule*, bool>::Iterator currentModule = m_modules.tqfind(static_cast<KCModule*>(TQT_TQWIDGET(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender()))))); Q_ASSERT(currentModule != m_modules.end()); if (currentModule.data() == isChanged) return; diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui index 848457a44..4e7c2ac77 100644 --- a/kcontrol/dnssd/configdialog.ui +++ b/kcontrol/dnssd/configdialog.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -33,11 +33,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabs</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="3" column="0"> + <widget class="TQButtonGroup" row="3" column="0"> <property name="name"> <cstring>kcfg_PublishType</cstring> </property> @@ -66,7 +66,7 @@ <property name="title"> <string>Publishing Mode</string> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>WANButton</cstring> </property> @@ -91,7 +91,7 @@ <string>Advertise services on Internet domain using public IP. To have this option working you need to configure wide area operation in using administrator mode</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>LANButtor</cstring> </property> @@ -117,7 +117,7 @@ </property> </widget> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>kcfg_BrowseLocal</cstring> </property> @@ -131,7 +131,7 @@ <string>Browse local network (domain .local) using multicast DNS.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>enableZeroconf</cstring> </property> @@ -167,7 +167,7 @@ is configured with 'Browse local network' option above.</string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -178,7 +178,7 @@ is configured with 'Browse local network' option above.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout7</cstring> </property> @@ -186,7 +186,7 @@ is configured with 'Browse local network' option above.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -204,7 +204,7 @@ is configured with 'Browse local network' option above.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>130</width> <height>21</height> @@ -227,7 +227,7 @@ is configured with 'Browse local network' option above.</string> <string>Optional shared secret used for authorization of DNS dynamic updates.</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>domainLabel</cstring> </property> @@ -238,7 +238,7 @@ is configured with 'Browse local network' option above.</string> <string>Domain:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -264,7 +264,7 @@ is configured with 'Browse local network' option above.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>20</height> @@ -281,7 +281,7 @@ is configured with 'Browse local network' option above.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>21</height> @@ -300,7 +300,7 @@ is configured with 'Browse local network' option above.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>110</height> diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index 97b532b54..6fae0b216 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -65,7 +65,7 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&) else if (getenv("KDESU_USER")!=0) tabs->removePage(tab); addConfig(DNSSD::Configuration::self(),this); // it is host-wide setting so it has to be in global config file - domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdnssdrc" )); + domain = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdnssdrc" )); domain->setGroup("publishing"); load(); connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); @@ -119,12 +119,12 @@ void KCMDnssd::load() { if (geteuid()==0) loadMdnsd(); enableZeroconf->setChecked(false); - TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus"); + TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), TQT_TQOBJECT(this), "avahiStatus"); avahiStatus.start(); while (avahiStatus.isRunning()) { kapp->processEvents(); } - int exitStatus = avahiStatus.exitStatus(); + int exitStatus = avahiStatus.exitqStatus(); if (exitStatus == 0) { // disabled enableZeroconf->setChecked(false); } else if (exitStatus == 1) { // enabled diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index 6d89c3219..6604a5a08 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp @@ -49,7 +49,7 @@ #include "searchproviderdlg.h" -class SearchProviderItem : public QCheckListItem +class SearchProviderItem : public TQCheckListItem { public: SearchProviderItem(TQListView *parent, SearchProvider *provider) @@ -459,7 +459,7 @@ SearchProviderItem *FilterOptions::displaySearchProvider(SearchProvider *p, bool item = new SearchProviderItem(m_dlg->lvSearchProviders, p); - if (m_favoriteEngines.find(p->desktopEntryName())!=m_favoriteEngines.end()) + if (m_favoriteEngines.tqfind(p->desktopEntryName())!=m_favoriteEngines.end()) item->setOn(true); for (itemCount = 1; itemCount < totalCount; itemCount++) diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui index fdeeb27ca..f9afe187c 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>FilterOptionsUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FilterOptionsUI</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbEnableShortcuts</cstring> </property> @@ -32,7 +32,7 @@ Enable shortcuts that allow you to quickly search for information on the web. Fo </qt></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout10</cstring> </property> @@ -40,7 +40,7 @@ Enable shortcuts that allow you to quickly search for information on the web. Fo <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>lbDelimiter</cstring> </property> @@ -62,7 +62,7 @@ Enable shortcuts that allow you to quickly search for information on the web. Fo <string>Choose the delimiter that separates the keyword from the phrase or word to be searched.</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lbDefaultEngine</cstring> </property> @@ -112,7 +112,7 @@ Select the search engine to use for input boxes that provide automatic lookup se </qt></string> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>pbChange</cstring> </property> @@ -126,7 +126,7 @@ Select the search engine to use for input boxes that provide automatic lookup se <string>Modify a search provider.</string> </property> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>pbDelete</cstring> </property> @@ -140,7 +140,7 @@ Select the search engine to use for input boxes that provide automatic lookup se <string>Delete the selected search provider.</string> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>pbNew</cstring> </property> @@ -161,7 +161,7 @@ Select the search engine to use for input boxes that provide automatic lookup se <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>170</height> diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp index 9f3a245fc..0e800a36c 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp @@ -64,7 +64,7 @@ TQString KURISearchFilterEngine::webShortcutQuery( const TQString& typedString ) if (m_bWebShortcutsEnabled) { TQString search = typedString; - int pos = search.find(m_cKeywordDelimiter); + int pos = search.tqfind(m_cKeywordDelimiter); TQString key; if (pos > -1) @@ -98,7 +98,7 @@ TQString KURISearchFilterEngine::autoWebSearchQuery( const TQString& typedString if (m_bWebShortcutsEnabled && !m_defaultSearchEngine.isEmpty()) { // Make sure we ignore supported protocols, e.g. "smb:", "http:" - int pos = typedString.find(':'); + int pos = typedString.tqfind(':'); if (pos == -1 || !KProtocolInfo::isKnownProtocol(typedString.left(pos))) { @@ -147,7 +147,7 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, int i = 0; int n = 0; TQString s = userquery.mid (pos, qsexpr.matchedLength()); - while ((i = s.find(" ")) != -1) + while ((i = s.tqfind(" ")) != -1) { s = s.replace (i, 1, "%20"); n++; @@ -163,11 +163,11 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, // Back-substitute quoted strings (%20 -> " "): { int i = 0; - while ((i = userquery.find("%20")) != -1) - userquery = userquery.replace(i, 3, " "); + while ((i = userquery.tqfind("%20")) != -1) + userquery = userquery.tqreplace(i, 3, " "); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) - *it = (*it).replace("%20", " "); + *it = (*it).tqreplace("%20", " "); } PIDDBG << "Generating substitution map:\n"; @@ -187,23 +187,23 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, v = l[i-1]; // Back-substitute quoted strings (%20 -> " "): - while ((j = v.find("%20")) != -1) - v = v.replace(j, 3, " "); + while ((j = v.tqfind("%20")) != -1) + v = v.tqreplace(j, 3, " "); // Insert partial queries (referenced by \1 ... \n) to map: - map.replace(TQString::number(i), v); + map.tqreplace(TQString::number(i), v); PDVAR (" map['" + nr + "']", map[nr]); // Insert named references (referenced by \name) to map: j = 0; - if ((i>0) && (pos = v.find("=")) > 0) + if ((i>0) && (pos = v.tqfind("=")) > 0) { TQString s = v.mid(pos + 1); TQString k = v.left(pos); // Back-substitute references contained in references (e.g. '\refname' substitutes to 'thisquery=\0') - while ((j = s.find("%5C")) != -1) s = s.replace(j, 3, "\\"); - map.replace(k, s); + while ((j = s.tqfind("%5C")) != -1) s = s.tqreplace(j, 3, "\\"); + map.tqreplace(k, s); PDVAR (" map['" + k + "']", map[k]); } } @@ -231,12 +231,12 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap & // Check, if old style '\1' is found and replace it with \{@} (compatibility mode): { int pos = -1; - if ((pos = newurl.find("\\1")) >= 0) + if ((pos = newurl.tqfind("\\1")) >= 0) { PIDDBG << "WARNING: Using compatibility mode for newurl='" << newurl << "'. Please replace old style '\\1' with new style '\\{0}' " "in the query definition.\n"; - newurl = newurl.replace(pos, 2, "\\{@}"); + newurl = newurl.tqreplace(pos, 2, "\\{@}"); } } @@ -275,7 +275,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap & // Substitute a range of keywords if (range.search(rlitem, 0) >= 0) { - int pos = rlitem.find("-"); + int pos = rlitem.tqfind("-"); int first = rlitem.left(pos).toInt(); int last = rlitem.right(rlitem.length()-pos-1).toInt(); @@ -307,7 +307,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap & v = encodeString(s, encodingMib); PDVAR (" default", s); } - else if (map.contains(rlitem)) + else if (map.tqcontains(rlitem)) { // Use value from substitution map: found = true; @@ -340,7 +340,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap & // Encode '+', otherwise it would be interpreted as space in the resulting url: int vpos = 0; - while ((vpos = v.find('+')) != -1) + while ((vpos = v.tqfind('+')) != -1) v = v.replace (vpos, 1, "%2B"); } @@ -353,7 +353,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap & i++; } - newurl = newurl.replace(pos, reflist.matchedLength(), v); + newurl = newurl.tqreplace(pos, reflist.matchedLength(), v); } // Special handling for \{@}; @@ -370,7 +370,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap & // Substitute \{@} with list of unmatched query strings int vpos = 0; - while ((vpos = newurl.find("\\@")) != -1) + while ((vpos = newurl.tqfind("\\@")) != -1) newurl = newurl.replace (vpos, 2, v); } } @@ -397,7 +397,7 @@ TQString KURISearchFilterEngine::formatResult( const TQString& url, { // Return nothing if userquery is empty and it contains // substitution strings... - if (query.isEmpty() && url.find(TQRegExp(TQRegExp::escape("\\{"))) > 0) + if (query.isEmpty() && url.tqfind(TQRegExp(TQRegExp::escape("\\{"))) > 0) return TQString::null; // Debug info of map: @@ -427,13 +427,13 @@ TQString KURISearchFilterEngine::formatResult( const TQString& url, PDVAR ("query definition", url); // Add charset indicator for the query to substitution map: - map.replace("ikw_charset", cseta); + map.tqreplace("ikw_charset", cseta); // Add charset indicator for the fallback query to substitution map: TQString csetb = cset2; if (csetb.isEmpty()) csetb = "iso-8859-1"; - map.replace("wsc_charset", csetb); + map.tqreplace("wsc_charset", csetb); TQString newurl = substituteQuery (url, map, userquery, csetacodec->mibEnum()); diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp index 586f947ff..183d2a288 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp @@ -60,7 +60,7 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider, m_dlg->leName->setText(m_provider->name()); m_dlg->leQuery->setText(m_provider->query()); m_dlg->leShortcut->setText(m_provider->keys().join(",")); - m_dlg->cbCharset->setCurrentItem(m_provider->charset().isEmpty() ? 0 : charsets.findIndex(m_provider->charset())); + m_dlg->cbCharset->setCurrentItem(m_provider->charset().isEmpty() ? 0 : charsets.tqfindIndex(m_provider->charset())); m_dlg->leName->setEnabled(false); m_dlg->leQuery->setFocus(); } @@ -81,7 +81,7 @@ void SearchProviderDialog::slotChanged() void SearchProviderDialog::slotOk() { - if ((m_dlg->leQuery->text().find("\\{") == -1) + if ((m_dlg->leQuery->text().tqfind("\\{") == -1) && KMessageBox::warningContinueCancel(0, i18n("The URI does not contain a \\{...} placeholder for the user query.\n" "This means that the same page is always going to be visited, " diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui index 1a507c0ff..458de9394 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SearchProviderDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SearchProviderDlgUI</cstring> </property> @@ -27,7 +27,7 @@ <string>Enter the human readable name of the search provider here.</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>lbCharset</cstring> </property> @@ -41,7 +41,7 @@ <string>Select the character set that will be used to encode your search query</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lbQuery</cstring> </property> @@ -58,7 +58,7 @@ Recommended is \{@}, since it removes all query variables (name=value) from the </qt></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lbName</cstring> </property> @@ -82,7 +82,7 @@ The shortcuts entered here can be used as a pseudo-URI scheme in KDE. For exampl </qt></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lbShortcut</cstring> </property> diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp index f0986c188..a893e9f3a 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp @@ -41,7 +41,7 @@ LocalDomainURIFilter::LocalDomainURIFilter( TQObject *parent, const char *name, : KURIFilterPlugin( parent, name ? name : "localdomainurifilter", 1.0 ), DCOPObject( "LocalDomainURIFilterIface" ), last_time( 0 ), - m_hostPortPattern( TQString::fromLatin1(HOSTPORT_PATTERN) ) + m_hostPortPattern( TQString::tqfromLatin1(HOSTPORT_PATTERN) ) { configure(); } @@ -56,7 +56,7 @@ bool LocalDomainURIFilter::filterURI( KURIFilterData& data ) const if( m_hostPortPattern.exactMatch( cmd ) && isLocalDomainHost( cmd ) ) { - cmd.prepend( TQString::fromLatin1("http://") ); + cmd.prepend( TQString::tqfromLatin1("http://") ); setFilteredURI( data, KURL( cmd ) ); setURIType( data, KURIFilterData::NET_PROTOCOL ); @@ -71,12 +71,12 @@ bool LocalDomainURIFilter::filterURI( KURIFilterData& data ) const bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const { // find() returns -1 when no match -> left()/truncate() are noops then - TQString host( cmd.left( cmd.find( '/' ) ) ); - host.truncate( host.find( ':' ) ); // Remove port number + TQString host( cmd.left( cmd.tqfind( '/' ) ) ); + host.truncate( host.tqfind( ':' ) ); // Remove port number if( !(host == last_host && last_time > time( NULL ) - 5 ) ) { - TQString helper = KStandardDirs::findExe(TQString::fromLatin1( "klocaldomainurifilterhelper" )); + TQString helper = KStandardDirs::findExe(TQString::tqfromLatin1( "klocaldomainurifilterhelper" )); if( helper.isEmpty()) return last_result = false; @@ -95,7 +95,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const last_result = proc.wait( 1 ) && proc.normalExit() && !proc.exitStatus(); if( !m_fullname.isEmpty() ) - cmd.replace( 0, host.length(), m_fullname ); + cmd.tqreplace( 0, host.length(), m_fullname ); } return last_result; diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp index 9d15802f1..40d97e29d 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp @@ -43,7 +43,7 @@ #define IPv6_PATTERN "^\\[.*\\]" #define ENV_VAR_PATTERN "\\$[a-zA-Z_][a-zA-Z0-9_]*" -#define QFL1(x) TQString::fromLatin1(x) +#define QFL1(x) TQString::tqfromLatin1(x) /** * IMPORTANT: @@ -66,7 +66,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false ) // Match FQDN_PATTERN exp.setPattern( QFL1(FQDN_PATTERN) ); - if ( cmd.contains( exp ) ) + if ( cmd.tqcontains( exp ) ) { if (verbose) kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd @@ -85,7 +85,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false ) // Match IPv4 addresses exp.setPattern( QFL1(IPv4_PATTERN) ); - if ( cmd.contains( exp ) ) + if ( cmd.tqcontains( exp ) ) { if (verbose) kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd @@ -95,7 +95,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false ) // Match IPv6 addresses exp.setPattern( QFL1(IPv6_PATTERN) ); - if ( cmd.contains( exp ) ) + if ( cmd.tqcontains( exp ) ) { if (verbose) kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd @@ -121,7 +121,7 @@ static TQString removeArgs( const TQString& _cmd ) do { - spacePos = cmd.find( ' ', spacePos+1 ); + spacePos = cmd.tqfind( ' ', spacePos+1 ); } while ( spacePos > 1 && cmd[spacePos - 1] == '\\' ); if( spacePos > 0 ) @@ -164,13 +164,13 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const if (!isMalformed && (url.protocol().length() == 4) && - (url.protocol() != TQString::fromLatin1("http")) && + (url.protocol() != TQString::tqfromLatin1("http")) && (url.protocol()[0]=='h') && (url.protocol()[1]==url.protocol()[2]) && (url.protocol()[3]=='p')) { // Handle "encrypted" URLs like: h++p://www.kde.org - url.setProtocol( TQString::fromLatin1("http")); + url.setProtocol( TQString::tqfromLatin1("http")); setFilteredURI( data, url); setURIType( data, KURIFilterData::NET_PROTOCOL ); return true; @@ -182,7 +182,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const // You mean caching the last filtering, to try and reuse it, to save stat()s? (David) const TQString starthere_proto = QFL1("start-here:"); - if (cmd.find(starthere_proto, 0, true) == 0 ) + if (cmd.tqfind(starthere_proto, 0, true) == 0 ) { setFilteredURI( data, KURL("system:/") ); setURIType( data, KURIFilterData::LOCAL_DIR ); @@ -193,8 +193,8 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const const TQString man_proto = QFL1("man:"); const TQString info_proto = QFL1("info:"); if( cmd[0] == '#' || - cmd.find( man_proto, 0, true ) == 0 || - cmd.find( info_proto, 0, true ) == 0 ) + cmd.tqfind( man_proto, 0, true ) == 0 || + cmd.tqfind( info_proto, 0, true ) == 0 ) { if( cmd.left(2) == QFL1("##") ) cmd = QFL1("info:/") + cmd.mid(2); @@ -210,11 +210,11 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const } // Detect UNC style (aka windows SMB) URLs - if ( cmd.startsWith( TQString::fromLatin1( "\\\\") ) ) + if ( cmd.startsWith( TQString::tqfromLatin1( "\\\\") ) ) { // make sure path is unix style - cmd.replace('\\', '/'); - cmd.prepend( TQString::fromLatin1( "smb:" ) ); + cmd.tqreplace('\\', '/'); + cmd.prepend( TQString::tqfromLatin1( "smb:" ) ); setFilteredURI( data, KURL( cmd )); setURIType( data, KURIFilterData::NET_PROTOCOL ); return true; @@ -257,7 +257,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const if( path[0] == '~' ) { - int slashPos = path.find('/'); + int slashPos = path.tqfind('/'); if( slashPos == -1 ) slashPos = path.length(); if( slashPos == 1 ) // ~/ @@ -293,7 +293,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const const char* exp = getenv( path.mid( 1, r.matchedLength() - 1 ).local8Bit().data() ); if(exp) { - path.replace( 0, r.matchedLength(), TQString::fromLocal8Bit(exp) ); + path.tqreplace( 0, r.matchedLength(), TQString::fromLocal8Bit(exp) ); expanded = true; } } @@ -303,7 +303,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const { // Look for #ref again, after $ and ~ expansion (testcase: $QTDIR/doc/html/functions.html#s) // Can't use KURL here, setPath would escape it... - int pos = path.find('#'); + int pos = path.tqfind('#'); if ( pos > -1 ) { ref = path.mid( pos + 1 ); @@ -354,12 +354,12 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const if ( !exists ) { // Support for name filter (/foo/*.txt), see also KonqMainWindow::detectNameFilter // If the app using this filter doesn't support it, well, it'll simply error out itself - int lastSlash = path.findRev( '/' ); - if ( lastSlash > -1 && path.find( ' ', lastSlash ) == -1 ) // no space after last slash, otherwise it's more likely command-line arguments + int lastSlash = path.tqfindRev( '/' ); + if ( lastSlash > -1 && path.tqfind( ' ', lastSlash ) == -1 ) // no space after last slash, otherwise it's more likely command-line arguments { TQString fileName = path.mid( lastSlash + 1 ); TQString testPath = path.left( lastSlash + 1 ); - if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 ) + if ( ( fileName.tqfind( '*' ) != -1 || fileName.tqfind( '[' ) != -1 || fileName.tqfind( '?' ) != -1 ) && stat( TQFile::encodeName(testPath).data(), &buff ) == 0 ) { nameFilter = fileName; @@ -379,7 +379,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const u.setRef(ref); u.setQuery(query); - if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) + if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("open"), KURL(), u)) { // No authorisation, we pretend it's a file will get // an access denied error later on. @@ -453,7 +453,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const // Okay this is the code that allows users to supply custom matches for // specific URLs using Qt's regexp class. This is hard-coded for now. // TODO: Make configurable at some point... - if ( !cmd.contains( ' ' ) ) + if ( !cmd.tqcontains( ' ' ) ) { TQValueList<URLHint>::ConstIterator it; for( it = m_urlHints.begin(); it != m_urlHints.end(); ++it ) @@ -492,7 +492,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const u.setPath(path); u.setRef(ref); - if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) + if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("open"), KURL(), u)) { // No authorisation, we pretend it exists and will get // an access denied error later on. diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp index eb57f50ac..8ac48a660 100644 --- a/kcontrol/filetypes/filegroupdetails.cpp +++ b/kcontrol/filetypes/filegroupdetails.cpp @@ -27,11 +27,11 @@ FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQWidget * parentWidget = this; - TQVBoxLayout *secondLayout = new TQVBoxLayout(parentWidget, + TQWidget * tqparentWidget = this; + TQVBoxLayout *secondLayout = new TQVBoxLayout(tqparentWidget, 0, KDialog::spacingHint()); - m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), parentWidget ); + m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), tqparentWidget ); m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() ); secondLayout->addWidget( m_autoEmbed ); // The order of those two items is very important. If you change it, fix typeslistitem.cpp ! diff --git a/kcontrol/filetypes/filegroupdetails.h b/kcontrol/filetypes/filegroupdetails.h index bb4d15bd7..6563c5ed1 100644 --- a/kcontrol/filetypes/filegroupdetails.h +++ b/kcontrol/filetypes/filegroupdetails.h @@ -26,7 +26,7 @@ class TQButtonGroup; * This widget contains the details for a filetype group. * Currently this only involves the embedding configuration. */ -class FileGroupDetails : public QWidget +class FileGroupDetails : public TQWidget { Q_OBJECT public: diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp index a678e0eb2..daf7961a1 100644 --- a/kcontrol/filetypes/filetypedetails.cpp +++ b/kcontrol/filetypes/filetypedetails.cpp @@ -100,7 +100,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() ); secondLayout->addWidget( m_autoEmbed, 1 ); - m_autoEmbed->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) ); + m_autoEmbed->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) ); // The order of those three items is very important. If you change it, fix typeslistitem.cpp ! new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed ); @@ -120,7 +120,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) secondLayout->addSpacing(10); embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget ); - embedServiceListWidget->setMinimumHeight( serviceListWidget->sizeHint().height() ); + embedServiceListWidget->setMinimumHeight( serviceListWidget->tqsizeHint().height() ); connect( embedServiceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); secondLayout->addWidget(embedServiceListWidget, 3); diff --git a/kcontrol/filetypes/filetypedetails.h b/kcontrol/filetypes/filetypedetails.h index b364d919d..354419e0e 100644 --- a/kcontrol/filetypes/filetypedetails.h +++ b/kcontrol/filetypes/filetypedetails.h @@ -18,7 +18,7 @@ class KServiceListWidget; * It is implemented as a separate class so that it can be used by * the keditfiletype program to show the details of a single mimetype. */ -class FileTypeDetails : public QTabWidget +class FileTypeDetails : public TQTabWidget { Q_OBJECT public: diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp index ad60fc3de..940d4afa3 100644 --- a/kcontrol/filetypes/filetypesview.cpp +++ b/kcontrol/filetypes/filetypesview.cpp @@ -57,7 +57,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) leftLayout->setSpacing( KDialog::spacingHint() ); leftLayout->setColStretch(1, 1); - l->addLayout( leftLayout ); + l->addLayout( TQT_TQLAYOUT(leftLayout) ); TQLabel *patternFilterLBL = new TQLabel(i18n("F&ind filename pattern:"), this); leftLayout->addMultiCellWidget(patternFilterLBL, 0, 0, 0, 2); @@ -126,7 +126,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) // Widget shown on startup m_emptyWidget = new TQLabel( i18n("Select a file type by name or by extension"), m_widgetStack); - m_emptyWidget->setAlignment(AlignCenter); + m_emptyWidget->tqsetAlignment(AlignCenter); m_widgetStack->addWidget( m_emptyWidget, 3 /*id*/ ); @@ -174,11 +174,11 @@ void FileTypesView::readFileTypes() TQValueListIterator<KMimeType::Ptr> it2(mimetypes.begin()); for (; it2 != mimetypes.end(); ++it2) { TQString mimetype = (*it2)->name(); - int index = mimetype.find("/"); + int index = mimetype.tqfind("/"); TQString maj = mimetype.left(index); TQString min = mimetype.right(mimetype.length() - index+1); - TQMapIterator<TQString,TypesListItem*> mit = m_majorMap.find( maj ); + TQMapIterator<TQString,TypesListItem*> mit = m_majorMap.tqfind( maj ); if ( mit == m_majorMap.end() ) { groupItem = new TypesListItem( typesLV, maj ); m_majorMap.insert( maj, groupItem ); @@ -196,7 +196,7 @@ void FileTypesView::readFileTypes() void FileTypesView::slotEmbedMajor(const TQString &major, bool &embed) { TypesListItem *groupItem; - TQMapIterator<TQString,TypesListItem*> mit = m_majorMap.find( major ); + TQMapIterator<TQString,TypesListItem*> mit = m_majorMap.tqfind( major ); if ( mit == m_majorMap.end() ) return; @@ -301,10 +301,10 @@ void FileTypesView::removeType() if (!li) li = current->itemBelow(); if (!li) - li = current->parent(); + li = current->tqparent(); removedList.append(current->name()); - current->parent()->takeItem(current); + current->tqparent()->takeItem(current); m_itemList.removeRef( current ); setDirty(true); @@ -425,7 +425,7 @@ void FileTypesView::slotDatabaseChanged() TQValueList<TypesListItem *>::Iterator it = m_itemsModified.begin(); for( ; it != m_itemsModified.end(); ++it ) { TQString name = (*it)->name(); - if ( removedList.find( name ) == removedList.end() ) // if not deleted meanwhile + if ( removedList.tqfind( name ) == removedList.end() ) // if not deleted meanwhile (*it)->refresh(); } m_itemsModified.clear(); diff --git a/kcontrol/filetypes/kservicelistwidget.h b/kcontrol/filetypes/kservicelistwidget.h index f17c9583a..0e4a3e3a3 100644 --- a/kcontrol/filetypes/kservicelistwidget.h +++ b/kcontrol/filetypes/kservicelistwidget.h @@ -28,7 +28,7 @@ class TQLineEdit; class TQPushButton; class KService; -class KServiceListItem : public QListBoxText +class KServiceListItem : public TQListBoxText { public: KServiceListItem( KService *pService, int kind ); @@ -43,7 +43,7 @@ public: * module, once for applications and once for services. * The "kind" is determined by the argument given to the constructor. */ -class KServiceListWidget : public QGroupBox +class KServiceListWidget : public TQGroupBox { Q_OBJECT public: diff --git a/kcontrol/filetypes/newtypedlg.cpp b/kcontrol/filetypes/newtypedlg.cpp index fb358f567..ee0e3eab8 100644 --- a/kcontrol/filetypes/newtypedlg.cpp +++ b/kcontrol/filetypes/newtypedlg.cpp @@ -19,7 +19,7 @@ NewTypeDialog::NewTypeDialog(TQStringList groups, TQGridLayout *grid = new TQGridLayout(2, 2); grid->setColStretch(1, 1); - topl->addLayout(grid); + topl->addLayout(TQT_TQLAYOUT(grid)); TQLabel *l = new TQLabel(i18n("Group:"), main); grid->addWidget(l, 0, 0); diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp index 8ff08d157..21061b065 100644 --- a/kcontrol/filetypes/typeslistitem.cpp +++ b/kcontrol/filetypes/typeslistitem.cpp @@ -69,7 +69,7 @@ void TypesListItem::initMeta( const TQString & major ) KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false); config->setGroup("EmbedSettings"); bool defaultValue = defaultEmbeddingSetting( major ); - m_autoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; + m_autoEmbed = config->readBoolEntry( TQString::tqfromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; } bool TypesListItem::defaultEmbeddingSetting( const TQString& major ) @@ -92,7 +92,7 @@ void TypesListItem::init(KMimeType::Ptr mimetype) m_bFullInit = false; m_mimetype = mimetype; - int index = mimetype->name().find("/"); + int index = mimetype->name().tqfind("/"); if (index != -1) { m_major = mimetype->name().left(index); m_minor = mimetype->name().right(mimetype->name().length() - @@ -230,7 +230,7 @@ bool TypesListItem::isDirty() const KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false); config->setGroup("EmbedSettings"); bool defaultValue = defaultEmbeddingSetting(m_major); - unsigned int oldAutoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; + unsigned int oldAutoEmbed = config->readBoolEntry( TQString::tqfromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; if ( m_autoEmbed != oldAutoEmbed ) return true; } @@ -249,7 +249,7 @@ void TypesListItem::sync() { KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false); config->setGroup("EmbedSettings"); - config->writeEntry( TQString::fromLatin1("embed-")+m_major, m_autoEmbed == 0 ); + config->writeEntry( TQString::tqfromLatin1("embed-")+m_major, m_autoEmbed == 0 ); return; } @@ -286,9 +286,9 @@ void TypesListItem::sync() config.writeEntry("Hidden", false); if ( m_autoEmbed == 2 ) - config.deleteEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), false ); + config.deleteEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), false ); else - config.writeEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 ); + config.writeEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 ); m_bNewItem = false; } @@ -343,18 +343,18 @@ void TypesListItem::sync() continue; // Only those which were added in init() // Look in the correct list... - if ( (isApplication && ! m_appServices.contains( pService->desktopEntryPath() )) - || (!isApplication && !m_embedServices.contains( pService->desktopEntryPath() )) + if ( (isApplication && ! m_appServices.tqcontains( pService->desktopEntryPath() )) + || (!isApplication && !m_embedServices.tqcontains( pService->desktopEntryPath() )) ) { // The service was in m_appServices but has been removed // create a new .desktop file without this mimetype if( s_changedServices == NULL ) deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > ); - TQStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath()) + TQStringList mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath()) ? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes(); - if ( mimeTypeList.contains( name() ) ) { + if ( mimeTypeList.tqcontains( name() ) ) { // The mimetype is listed explicitly in the .desktop files, so // just remove it and we're done KConfig *desktop; @@ -370,12 +370,12 @@ void TypesListItem::sync() } desktop->setDesktopGroup(); - mimeTypeList = s_changedServices->contains( pService->desktopEntryPath()) + mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath()) ? (*s_changedServices)[ pService->desktopEntryPath() ] : desktop->readListEntry("MimeType", ';'); // Remove entry and the number that might follow. TQStringList::Iterator it; - for(;(it = mimeTypeList.find(name())) != mimeTypeList.end();) + for(;(it = mimeTypeList.tqfind(name())) != mimeTypeList.end();) { it = mimeTypeList.remove(it); if (it != mimeTypeList.end()) @@ -438,7 +438,7 @@ KMimeType::Ptr TypesListItem::findImplicitAssociation(const TQString &desktop) if( s_changedServices == NULL ) deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > ); - TQStringList mimeTypeList = s_changedServices->contains( s->desktopEntryPath()) + TQStringList mimeTypeList = s_changedServices->tqcontains( s->desktopEntryPath()) ? (*s_changedServices)[ s->desktopEntryPath() ] : s->serviceTypes(); for(TQStringList::ConstIterator it = mimeTypeList.begin(); @@ -477,10 +477,10 @@ void TypesListItem::saveServices( KConfig & profile, TQStringList services, cons // merge new mimetype if( s_changedServices == NULL ) deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > ); - TQStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath()) + TQStringList mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath()) ? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes(); - if (!mimeTypeList.contains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList)) + if (!mimeTypeList.tqcontains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList)) { KConfig *desktop; if ( pService->type() == TQString("Service") ) @@ -495,7 +495,7 @@ void TypesListItem::saveServices( KConfig & profile, TQStringList services, cons } desktop->setDesktopGroup(); - mimeTypeList = s_changedServices->contains( pService->desktopEntryPath()) + mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath()) ? (*s_changedServices)[ pService->desktopEntryPath() ] : desktop->readListEntry("MimeType", ';'); mimeTypeList.append(name()); diff --git a/kcontrol/filetypes/typeslistitem.h b/kcontrol/filetypes/typeslistitem.h index 18dca1af6..1946d9ab7 100644 --- a/kcontrol/filetypes/typeslistitem.h +++ b/kcontrol/filetypes/typeslistitem.h @@ -25,7 +25,7 @@ #include <kmimetype.h> #include <kuserprofile.h> -class TypesListItem : public QListViewItem +class TypesListItem : public TQListViewItem { public: /** diff --git a/kcontrol/fonts/kxftconfig.cpp b/kcontrol/fonts/kxftconfig.cpp index 682672a7a..95888e4db 100644 --- a/kcontrol/fonts/kxftconfig.cpp +++ b/kcontrol/fonts/kxftconfig.cpp @@ -52,7 +52,7 @@ TQString KXftConfig::contractHome(TQString path) unsigned int len = home.length(); if(path.length() == len || path[len] == '/') - return path.replace(0, len, TQString::fromLatin1("~")); + return path.tqreplace(0, len, TQString::tqfromLatin1("~")); } } @@ -62,7 +62,7 @@ TQString KXftConfig::contractHome(TQString path) TQString KXftConfig::expandHome(TQString path) { if(!path.isEmpty() && '~'==path[0]) - return 1==path.length() ? TQDir::homeDirPath() : path.replace(0, 1, TQDir::homeDirPath()); + return 1==path.length() ? TQDir::homeDirPath() : path.tqreplace(0, 1, TQDir::homeDirPath()); return path; } @@ -88,9 +88,9 @@ static TQString dirSyntax(const TQString &d) { TQString ds(d); - ds.replace("//", "/"); + ds.tqreplace("//", "/"); - int slashPos=ds.findRev('/'); + int slashPos=ds.tqfindRev('/'); if(slashPos!=(((int)ds.length())-1)) ds.append('/'); @@ -106,7 +106,7 @@ static TQString xDirSyntax(const TQString &d) if(!d.isNull()) { TQString ds(d); - int slashPos=ds.findRev('/'); + int slashPos=ds.tqfindRev('/'); if(slashPos==(((int)ds.length())-1)) ds.remove(slashPos, 1); @@ -143,7 +143,7 @@ static TQString getDir(const TQString &f) { TQString d(f); - int slashPos=d.findRev('/'); + int slashPos=d.tqfindRev('/'); if(-1!=slashPos) d.remove(slashPos+1, d.length()); @@ -191,11 +191,11 @@ TQString getConfigFile(bool system) if(fExists(f)) { - if(system || 0==fileSyntax(f).find(home)) // For nonsystem, only consider file within $HOME + if(system || 0==fileSyntax(f).tqfind(home)) // For nonsystem, only consider file within $HOME files.append(f); } #if (FC_VERSION>=20300) - if(system && dExists(f) && (-1!=f.find(TQRegExp("/conf\\.d/?$")) || -1!=f.find(TQRegExp("/conf\\.d?$"))) ) + if(system && dExists(f) && (-1!=f.tqfind(TQRegExp("/conf\\.d/?$")) || -1!=f.tqfind(TQRegExp("/conf\\.d?$"))) ) return dirSyntax(f)+constKdeRootFcFile; // This ones good enough for me! #endif } @@ -208,7 +208,7 @@ TQString getConfigFile(bool system) end(files.end()); for(; it!=end; ++it) - if(-1!=(*it).find(TQRegExp(system ? "/local\\.conf$" : "/\\.?fonts\\.conf$"))) + if(-1!=(*it).tqfind(TQRegExp(system ? "/local\\.conf$" : "/\\.?fonts\\.conf$"))) return *it; return files.front(); // Just return the 1st one... } @@ -645,13 +645,13 @@ bool KXftConfig::apply() TQString str(m_doc.toString()); int idx; - if(0!=str.find("<?xml")) + if(0!=str.tqfind("<?xml")) str.insert(0, xmlHeader); - else if(0==str.find(qtXmlHeader)) - str.replace(0, strlen(qtXmlHeader), xmlHeader); + else if(0==str.tqfind(qtXmlHeader)) + str.tqreplace(0, strlen(qtXmlHeader), xmlHeader); - if(-1!=(idx=str.find(qtDocTypeLine))) - str.replace(idx, strlen(qtDocTypeLine), docTypeLine); + if(-1!=(idx=str.tqfind(qtDocTypeLine))) + str.tqreplace(idx, strlen(qtDocTypeLine), docTypeLine); // // Write to file... @@ -947,7 +947,7 @@ bool KXftConfig::hasDir(const TQString &d) ListItem *item; for(item=m_dirs.first(); item; item=m_dirs.next()) - if(0==dir.find(item->str)) + if(0==dir.tqfind(item->str)) return true; return false; @@ -1291,7 +1291,7 @@ void KXftConfig::applySubPixelType() if(m_subPixel.node.isNull()) m_doc.documentElement().appendChild(matchNode); else - m_doc.documentElement().replaceChild(matchNode, m_subPixel.node); + m_doc.documentElement().tqreplaceChild(matchNode, m_subPixel.node); m_subPixel.node=matchNode; } @@ -1323,7 +1323,7 @@ void KXftConfig::applyHintStyle() if(m_hint.node.isNull()) m_doc.documentElement().appendChild(matchNode); else - m_doc.documentElement().replaceChild(matchNode, m_hint.node); + m_doc.documentElement().tqreplaceChild(matchNode, m_hint.node); m_hint.node=matchNode; } } @@ -1344,7 +1344,7 @@ void KXftConfig::applyHinting() if(m_hinting.node.isNull()) m_doc.documentElement().appendChild(matchNode); else - m_doc.documentElement().replaceChild(matchNode, m_hinting.node); + m_doc.documentElement().tqreplaceChild(matchNode, m_hinting.node); m_hinting.node=matchNode; } diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index 41ddfe8e3..e78a70af2 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -65,8 +65,8 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &) { TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); - systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" )); + config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" )); + systemconfig = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" )); KAboutData *about = new KAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("KDE ICC Profile Control Module"), @@ -136,7 +136,7 @@ void KICCConfig::deleteProfile () { // Contract the profile memory numberOfProfiles--; - iccFileArrayNew = new QString[numberOfProfiles*numberOfScreens]; + iccFileArrayNew = new TQString[numberOfProfiles*numberOfScreens]; for (i=0;i<(numberOfProfiles*numberOfScreens);i++) { iccFileArrayNew[i] = iccFileArray[i]; } @@ -206,7 +206,7 @@ void KICCConfig::addProfile () { // Expand the profile memory numberOfProfiles++; - iccFileArrayNew = new QString[numberOfProfiles*numberOfScreens]; + iccFileArrayNew = new TQString[numberOfProfiles*numberOfScreens]; for (i=0;i<((numberOfProfiles-1)*numberOfScreens);i++) { iccFileArrayNew[i] = iccFileArray[i]; } @@ -327,7 +327,7 @@ void KICCConfig::load(bool useDefaults ) } // Load all profiles into memory - iccFileArray = new QString[numberOfProfiles*numberOfScreens]; + iccFileArray = new TQString[numberOfProfiles*numberOfScreens]; for (i=0;i<(base->iccProfileList->count());i++) { config->setGroup(base->iccProfileList->text(i)); for (j=0;j<(base->randrScreenList->count());j++) { diff --git a/kcontrol/iccconfig/iccconfigbase.ui b/kcontrol/iccconfig/iccconfigbase.ui index c9be0818f..98b985229 100644 --- a/kcontrol/iccconfig/iccconfigbase.ui +++ b/kcontrol/iccconfig/iccconfigbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>ICCConfigBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ICCConfigBase</cstring> </property> @@ -16,14 +16,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>TabWidget2</cstring> </property> <property name="enabled"> <bool>true</bool> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupSystemSettings</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" colspan="2"> <property name="name"> <cstring>systemEnableSupport</cstring> </property> @@ -61,7 +61,7 @@ <string>*.icc</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -71,7 +71,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupUserSettings</cstring> </property> @@ -82,7 +82,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" colspan="2"> <property name="name"> <cstring>enableSupport</cstring> </property> @@ -95,7 +95,7 @@ <cstring>iccProfileList</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2_9</cstring> </property> @@ -132,7 +132,7 @@ <cstring>randrScreenList</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2_8</cstring> </property> @@ -148,7 +148,7 @@ <string>*.icc</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index d1454171e..5ad1ae759 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -80,7 +80,7 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name) // Size TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1); - lbl->setFixedSize(lbl->sizeHint()); + lbl->setFixedSize(lbl->tqsizeHint()); grid->addWidget(lbl, 0, 0, Qt::AlignLeft); mpSizeBox = new TQComboBox(m_pTab1); connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int))); @@ -105,8 +105,8 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name) top->activate(); - mpSystrayConfig = new KSimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" )); - mpKickerConfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); + mpSystrayConfig = new KSimpleConfig( TQString::tqfromLatin1( "systemtray_panelappletrc" )); + mpKickerConfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" )); init(); read(); @@ -123,13 +123,13 @@ KIconConfig::~KIconConfig() TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay) { TQLabel *lab = new TQLabel(str, parent); - lay->addWidget(lab, 1, i, AlignCenter); + lay->addWidget(lab, 1, i, Qt::AlignCenter); mpPreview[i] = new TQLabel(parent); - mpPreview[i]->setAlignment(AlignCenter); + mpPreview[i]->tqsetAlignment(AlignCenter); mpPreview[i]->setMinimumSize(105, 105); lay->addWidget(mpPreview[i], 2, i); TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent); - lay->addWidget(push, 3, i, AlignCenter); + lay->addWidget(push, 3, i, Qt::AlignCenter); return push; } @@ -202,22 +202,22 @@ void KIconConfig::initDefaults() mEffects[i][2] = mDefaultEffect[2]; } // Animate desktop icons by default - int group = mGroups.findIndex( "Desktop" ); + int group = mGroups.tqfindIndex( "Desktop" ); if ( group != -1 ) mbAnimated[group] = true; // This is the new default in KDE 2.2, in sync with the kiconeffect of kdelibs Nolden 2001/06/11 - int activeState = mStates.findIndex( "Active" ); + int activeState = mStates.tqfindIndex( "Active" ); if ( activeState != -1 ) { - int group = mGroups.findIndex( "Desktop" ); + int group = mGroups.tqfindIndex( "Desktop" ); if ( group != -1 ) { mEffects[ group ][ activeState ].type = KIconEffect::ToGamma; mEffects[ group ][ activeState ].value = 0.7; } - group = mGroups.findIndex( "Panel" ); + group = mGroups.tqfindIndex( "Panel" ); if ( group != -1 ) { mEffects[ group ][ activeState ].type = KIconEffect::ToGamma; @@ -302,12 +302,12 @@ void KIconConfig::apply() if (mpUsageList->currentText() == i18n("Panel Buttons")) { mpSizeBox->clear(); - mpSizeBox->insertItem(TQString().setNum(16)); - mpSizeBox->insertItem(TQString().setNum(22)); - mpSizeBox->insertItem(TQString().setNum(32)); - mpSizeBox->insertItem(TQString().setNum(48)); - mpSizeBox->insertItem(TQString().setNum(64)); - mpSizeBox->insertItem(TQString().setNum(128)); + mpSizeBox->insertItem(TQString().tqsetNum(16)); + mpSizeBox->insertItem(TQString().tqsetNum(22)); + mpSizeBox->insertItem(TQString().tqsetNum(32)); + mpSizeBox->insertItem(TQString().tqsetNum(48)); + mpSizeBox->insertItem(TQString().tqsetNum(64)); + mpSizeBox->insertItem(TQString().tqsetNum(128)); for (i=0;i<(mpSizeBox->count());i++) { if (mpSizeBox->text(i) == TQString().setNum(mQuickLaunchSize)) { mpSizeBox->setCurrentItem(i); @@ -316,12 +316,12 @@ void KIconConfig::apply() } else if (mpUsageList->currentText() == i18n("System Tray Icons")) { mpSizeBox->clear(); - mpSizeBox->insertItem(TQString().setNum(16)); - mpSizeBox->insertItem(TQString().setNum(22)); - mpSizeBox->insertItem(TQString().setNum(32)); - mpSizeBox->insertItem(TQString().setNum(48)); - mpSizeBox->insertItem(TQString().setNum(64)); - mpSizeBox->insertItem(TQString().setNum(128)); + mpSizeBox->insertItem(TQString().tqsetNum(16)); + mpSizeBox->insertItem(TQString().tqsetNum(22)); + mpSizeBox->insertItem(TQString().tqsetNum(32)); + mpSizeBox->insertItem(TQString().tqsetNum(48)); + mpSizeBox->insertItem(TQString().tqsetNum(64)); + mpSizeBox->insertItem(TQString().tqsetNum(128)); for (i=0;i<(mpSizeBox->count());i++) { if (mpSizeBox->text(i) == TQString().setNum(mSysTraySize)) { mpSizeBox->setCurrentItem(i); @@ -335,7 +335,7 @@ void KIconConfig::apply() if (mUsage < KIcon::LastGroup) { for (it=mAvSizes[mUsage].begin(), i=0; it!=mAvSizes[mUsage].end(); ++it, i++) { - mpSizeBox->insertItem(TQString().setNum(*it)); + mpSizeBox->insertItem(TQString().tqsetNum(*it)); dw = abs(mSizes[mUsage] - *it); if (dw < delta) { @@ -477,8 +477,8 @@ void KIconConfig::save() g.writeEntry("IconUseRoundedRect", mpRoundedCheck->isChecked(), true, true); g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked(), true, true); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", "" ); - kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", "" ); + kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") ); + kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") ); mpConfig->sync(); mpSystrayConfig->sync(); @@ -688,7 +688,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect, top->setRowStretch(1,1); lbl = new TQLabel(i18n("&Effect:"), page); - lbl->setFixedSize(lbl->sizeHint()); + lbl->setFixedSize(lbl->tqsizeHint()); top->addWidget(lbl, 0, 0, Qt::AlignLeft); mpEffectBox = new TQListBox(page); mpEffectBox->insertItem(i18n("No Effect")); @@ -713,7 +713,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect, grid->setRowStretch(1, 1); mpPreview = new TQLabel(frame); - mpPreview->setAlignment(AlignCenter); + mpPreview->tqsetAlignment(AlignCenter); mpPreview->setMinimumSize(105, 105); grid->addWidget(mpPreview, 1, 0); @@ -724,7 +724,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect, mpEffectLabel = new TQLabel(i18n("&Amount:"), mpEffectGroup); grid->addWidget(mpEffectLabel, 1, 0); - mpEffectSlider = new TQSlider(0, 100, 5, 10, TQSlider::Horizontal, mpEffectGroup); + mpEffectSlider = new TQSlider(0, 100, 5, 10, Qt::Horizontal, mpEffectGroup); mpEffectLabel->setBuddy( mpEffectSlider ); connect(mpEffectSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotEffectValue(int))); grid->addWidget(mpEffectSlider, 1, 1); diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index 5d7f924a9..d932c2e18 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/kcontrol/icons/iconthemes.cpp @@ -138,7 +138,7 @@ void IconThemesConfig::loadThemes() tname=name; // Just in case we have duplicated icon theme names on separate directories - for (int i=2; m_themeNames.find(tname)!=m_themeNames.end() ; i++) + for (int i=2; m_themeNames.tqfind(tname)!=m_themeNames.end() ; i++) tname=TQString("%1-%2").arg(name).arg(i); m_iconThemes->insertItem(new TQListViewItem(m_iconThemes,name, diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp index 770b2cdf3..54f0bdf86 100644 --- a/kcontrol/info/info.cpp +++ b/kcontrol/info/info.cpp @@ -80,7 +80,7 @@ static const TQString HexStr(unsigned long val, int digits ) { TQString hexstr; int i; - hexstr = TQString::fromLatin1("0x%1").arg(val, digits, 16/*=HEX*/); + hexstr = TQString::tqfromLatin1("0x%1").arg(val, digits, 16/*=HEX*/); for (i=hexstr.length()-1; i>0; --i) if (hexstr[i]==' ') hexstr[i] = '0'; @@ -167,7 +167,7 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie for (i = 0; i < ndepths; i++) { txt = txt + Value(depths[i]); if (i < ndepths - 1) - txt = txt + TQString::fromLatin1(", "); + txt = txt + TQString::tqfromLatin1(", "); } last = new TQListViewItem(item, last, i18n("Depths (%1)").arg(ndepths,-1), txt); @@ -204,7 +204,7 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie &width, &height); last = new TQListViewItem(item, last, i18n("Largest Cursor"), (width == 65535 && height == 65535) - ? i18n("unlimited") : TQString::fromLatin1("%1 x %2").arg(width).arg(height)); + ? i18n("unlimited") : TQString::tqfromLatin1("%1 x %2").arg(width).arg(height)); last = new TQListViewItem(item, last, i18n("Current Input Event Mask"), HexStr((unsigned long)EventMaskOfScreen(s),HEXDIGITS)); @@ -272,12 +272,12 @@ static bool GetInfo_XServer_Generic( TQListView *lBox ) last = new TQListViewItem(next, i18n("Name of the Display"), DisplayString(dpy)); - last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::fromLatin1(ServerVendor(dpy))); + last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::tqfromLatin1(ServerVendor(dpy))); last = new TQListViewItem(next, last, i18n("Vendor Release Number"), Value((int)VendorRelease(dpy))); last = new TQListViewItem(next, last, i18n("Version Number"), - TQString::fromLatin1("%1.%2").arg((int)ProtocolVersion(dpy)) + TQString::tqfromLatin1("%1.%2").arg((int)ProtocolVersion(dpy)) .arg((int)ProtocolRevision(dpy))); last = item = new TQListViewItem(next, last, i18n("Available Screens")); @@ -294,7 +294,7 @@ static bool GetInfo_XServer_Generic( TQListView *lBox ) int extCount; char **extensions = XListExtensions( dpy, &extCount ); for ( i = 0; i < extCount; i++ ) { - item = new TQListViewItem( last, item, TQString::fromLatin1( extensions[i] ) ); + item = new TQListViewItem( last, item, TQString::tqfromLatin1( extensions[i] ) ); } XFreeExtensionList( extensions ); @@ -356,7 +356,7 @@ void KInfoListWidget::load() retrieve-function. If the function wants the widget to show another string, then it change *GetInfo_ErrorString ! */ ErrorString = i18n("No information available about %1.").arg(title) - + TQString::fromLatin1("\n\n") + DEFAULT_ERRORSTRING; + + TQString::tqfromLatin1("\n\n") + DEFAULT_ERRORSTRING; GetInfo_ErrorString = &ErrorString; /* save the address of ErrorString */ sorting_allowed = true; /* the functions may set that */ @@ -425,7 +425,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) ); NoInfoText = new TQLabel(widgetStack); widgetStack->addWidget(NoInfoText, 1); - NoInfoText->setAlignment(AlignCenter | WordBreak); + NoInfoText->tqsetAlignment(AlignCenter | WordBreak); widgetStack->raiseWidget(NoInfoText); load(); } diff --git a/kcontrol/info/info.h b/kcontrol/info/info.h index 723d35df5..80f200d2a 100644 --- a/kcontrol/info/info.h +++ b/kcontrol/info/info.h @@ -45,8 +45,8 @@ private: bool (*getlistbox) (TQListView *); TQString title; - QLabel *NoInfoText; - QString ErrorString; + TQLabel *NoInfoText; + TQString ErrorString; TQWidgetStack *widgetStack; }; diff --git a/kcontrol/info/info_fbsd.cpp b/kcontrol/info/info_fbsd.cpp index 3ccd1c086..3f67b4b7a 100644 --- a/kcontrol/info/info_fbsd.cpp +++ b/kcontrol/info/info_fbsd.cpp @@ -347,24 +347,24 @@ bool GetInfo_Devices (TQListView *lbox) TQString GetController(const TQString &line) { - if ( ( (line.startsWith("ad")) || (line.startsWith("afd")) || (line.startsWith("acd")) ) && (line.find(":") < 6) ) { + if ( ( (line.startsWith("ad")) || (line.startsWith("afd")) || (line.startsWith("acd")) ) && (line.tqfind(":") < 6) ) { TQString controller = line; - controller.remove(0, controller.find(" at ")+4); - if (controller.find("-slave") != -1) { - controller.remove(controller.find("-slave"), controller.length()); - } else if (controller.find("-master") != -1) { - controller.remove(controller.find("-master"), controller.length()); + controller.remove(0, controller.tqfind(" at ")+4); + if (controller.tqfind("-slave") != -1) { + controller.remove(controller.tqfind("-slave"), controller.length()); + } else if (controller.tqfind("-master") != -1) { + controller.remove(controller.tqfind("-master"), controller.length()); } else controller=TQString::null; if (!controller.isNull()) return controller; } - if (line.find(" on ") != -1) { + if (line.tqfind(" on ") != -1) { TQString controller; controller = line; - controller.remove(0, controller.find(" on ")+4); - if (controller.find(" ") != -1) - controller.remove(controller.find(" "), controller.length()); + controller.remove(0, controller.tqfind(" on ")+4); + if (controller.tqfind(" ") != -1) + controller.remove(controller.tqfind(" "), controller.length()); return controller; } return TQString::null; @@ -373,13 +373,13 @@ TQString GetController(const TQString &line) Device *GetDevice(const TQString &line) { Device *dev; - int colon = line.find(":"); + int colon = line.tqfind(":"); if (colon == -1) return 0; dev = new Device; dev->name = line.mid(0, colon); - dev->description = line.mid(line.find("<")+1, line.length()); - dev->description.remove(dev->description.find(">"), dev->description.length()); + dev->description = line.mid(line.tqfind("<")+1, line.length()); + dev->description.remove(dev->description.tqfind(">"), dev->description.length()); return dev; } diff --git a/kcontrol/info/info_linux.cpp b/kcontrol/info/info_linux.cpp index 18287c45f..196029781 100644 --- a/kcontrol/info/info_linux.cpp +++ b/kcontrol/info/info_linux.cpp @@ -109,7 +109,7 @@ bool GetInfo_ReadfromFile(TQListView * lbox, const char *FileName, line = stream.readLine(); if (!line.isEmpty()) { if (!splitChar.isNull()) { - int pos = line.find(splitChar); + int pos = line.tqfind(splitChar); s1 = line.left(pos-1).stripWhiteSpace(); s2 = line.mid(pos+1).stripWhiteSpace(); } @@ -228,11 +228,11 @@ bool GetInfo_Devices(TQListView * lBox) while (!stream.atEnd()) { line = stream.readLine(); if (!line.isEmpty()) { - if (-1 != line.find("character device",0,false)) { + if (-1 != line.tqfind("character device",0,false)) { parent = new TQListViewItem(lBox,parent,i18n("Character Devices")); parent->setPixmap(0,SmallIcon("chardevice")); parent->setOpen(true); - } else if (-1 != line.find("block device",0,false)) { + } else if (-1 != line.tqfind("block device",0,false)) { parent = new TQListViewItem(lBox,parent,i18n("Block Devices")); parent->setPixmap(0,SmallIcon("blockdevice")); parent->setOpen(true); @@ -293,7 +293,7 @@ static void cleanPassword(TQString & str) while (index >= 0) { - index = str.find(passwd, index, FALSE); + index = str.tqfind(passwd, index, FALSE); if (index >= 0) { index += passwd.length(); while (index < (int) str.length() && @@ -473,7 +473,7 @@ bool GetInfo_Partitions(TQListView * lbox) while (file->readLine(buf, sizeof( buf )) > 0) { str = TQString::fromLocal8Bit(buf); if (str.length()) { - int p = str.find(' '); /* find first space. */ + int p = str.tqfind(' '); /* find first space. */ if (p) str.remove(p, 1024); /* erase all chars including space. */ Mounted_Partitions.append(str); @@ -503,7 +503,7 @@ bool GetInfo_Partitions(TQListView * lbox) #endif { total = avail = 0; /* initialize size.. */ - found_in_List = (Mounted_Partitions.contains(FS_NAME) > 0); + found_in_List = (Mounted_Partitions.tqcontains(FS_NAME) > 0); if (found_in_List && statfs(FS_FILE, &sfs) == 0) { total = ((LONG_TYPE) sfs.f_blocks) * sfs.f_bsize; avail = (getuid()? sfs.f_bavail : sfs.f_bfree) @@ -573,7 +573,7 @@ bool GetInfo_CD_ROM(TQListView * lBox) if (-1 != rx.search(line)) { TQString text = rx.cap(1); TQString value = rx.cap(2); - if (!text.contains('#')) { + if (!text.tqcontains('#')) { if (value == "0") value = KStdGuiItem::no().plainText(); if (value == "1") diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp index 02fd98b1d..8eb9acf2e 100644 --- a/kcontrol/info/info_netbsd.cpp +++ b/kcontrol/info/info_netbsd.cpp @@ -125,18 +125,18 @@ static bool GetDmesgInfo(TQListView *lBox, const char *filter, TQListViewItem *olditem = NULL; while(!(s = t->readLine().local8Bit()).isEmpty()) { if (!seencpu) { - if (s.contains("cpu")) + if (s.tqcontains("cpu")) seencpu = true; else continue; } - if (s.contains("boot device") || - s.contains("WARNING: old BSD partition ID!")) + if (s.tqcontains("boot device") || + s.tqcontains("WARNING: old BSD partition ID!")) break; if (!filter - || (filter[0] == '^' && s.find(&filter[1]) == 0) - || (filter[0] != '^' && s.contains(filter))) { + || (filter[0] == '^' && s.tqfind(&filter[1]) == 0) + || (filter[0] != '^' && s.tqcontains(filter))) { if (func) func(lBox, s); else @@ -163,7 +163,7 @@ AddIRQLine(TQListView *lBox, TQString s) int pos, irqnum; char numstr[3]; - pos = s.find(" irq "); + pos = s.tqfind(" irq "); irqnum = (pos < 0) ? 0 : atoi(&s.ascii()[pos+5]); if (irqnum) snprintf(numstr, 3, "%02d", irqnum); @@ -221,7 +221,7 @@ bool GetInfo_Sound (TQListView *lbox) s = lvitem->text(0); // The autoconf message is in form 'audio0 at auvia0: ...' - if (s.find("audio") == 0 && (pos = s.find(" at ")) > 0) { + if (s.tqfind("audio") == 0 && (pos = s.tqfind(" at ")) > 0) { pos += 4; // skip " at " start = s.ascii() + pos; len = (int) strcspn(start, ":\n\t "); @@ -253,7 +253,7 @@ bool GetInfo_SCSI (TQListView *lbox) for(; lvitem; lvitem = lvitem->nextSibling()) { TQString s = lvitem->text(0); - if (s.contains("seconds for devices to settle")) { + if (s.tqcontains("seconds for devices to settle")) { lbox->removeItem(lvitem); break; } @@ -296,18 +296,18 @@ bool GetInfo_Partitions (TQListView *lbox) // convert to strings vv[0] = KIO::convertSize(big[0]); - vv[1] = TQString::fromLatin1("%1 (%2%%)") + vv[1] = TQString::tqfromLatin1("%1 (%2%%)") .arg(KIO::convertSize(big[1])) .arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0); // FIXME: these two are large enough to punctuate vv[2] = TQString::number(mnt->f_files); - vv[3] = TQString::fromLatin1("%1 (%2%%) ") + vv[3] = TQString::tqfromLatin1("%1 (%2%%) ") .arg(mnt->f_ffree) .arg(mnt->f_files ? mnt->f_ffree*100/mnt->f_files : 0); vv[4] = TQString::null; -#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::fromLatin1(#x " "); +#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::tqfromLatin1(#x " "); MNTF(ASYNC) MNTF(DEFEXPORTED) MNTF(EXKERB) diff --git a/kcontrol/info/info_openbsd.cpp b/kcontrol/info/info_openbsd.cpp index 12ec8ee2d..6a68e33cb 100644 --- a/kcontrol/info/info_openbsd.cpp +++ b/kcontrol/info/info_openbsd.cpp @@ -122,16 +122,16 @@ static bool GetDmesgInfo(TQListView *lBox, const char *filter, TQListViewItem *olditem = NULL; while(!(s = t->readLine()).isNull()) { if (!seencpu) { - if (s.contains("cpu")) + if (s.tqcontains("cpu")) seencpu = true; else continue; } - if (s.contains("boot device") || - s.contains("WARNING: old BSD partition ID!")) + if (s.tqcontains("boot device") || + s.tqcontains("WARNING: old BSD partition ID!")) break; - if (!filter || s.contains(filter)) { + if (!filter || s.tqcontains(filter)) { if (func) { func(lBox, s, &opaque, false); } @@ -180,7 +180,7 @@ void AddIRQLine(TQListView *lBox, TQString s, void **opaque, bool ending) return; } - pos = s.find(" irq "); + pos = s.tqfind(" irq "); irqnum = (pos < 0) ? 0 : atoi(&p[pos+5]); if (irqnum) { s.sprintf("%02d%s", irqnum, p); @@ -232,7 +232,7 @@ bool GetInfo_Sound (TQListView *lbox) char *dev; s = lvitem->text(0); - if ((pos = s.find("at ")) >= 0) { + if ((pos = s.tqfind("at ")) >= 0) { pos += 3; // skip "at " start = end = s.ascii(); for(; (*end!=':') && (*end!='\n'); end++); diff --git a/kcontrol/info/info_solaris.cpp b/kcontrol/info/info_solaris.cpp index 9f2b17e1b..6dd215f55 100644 --- a/kcontrol/info/info_solaris.cpp +++ b/kcontrol/info/info_solaris.cpp @@ -184,10 +184,10 @@ bool GetInfo_Partitions( TQListView *lBox ) { lBox->addColumn( i18n( "Mount Point" )); lBox->addColumn( i18n( "FS Type" )); lBox->addColumn( i18n( "Total Size" )); - // XXX: FIXME: how do I set column alignment correctly? + // XXX: FIXME: how do I set column tqalignment correctly? lBox->setColumnAlignment( 3, 2 ); lBox->addColumn( i18n( "Free Size" )); - // XXX: FIXME: how do I set column alignment correctly? + // XXX: FIXME: how do I set column tqalignment correctly? lBox->setColumnAlignment( 4, 2 ); lBox->addColumn( i18n( "Mount Time" )); lBox->addColumn( i18n( "Mount Options" )); diff --git a/kcontrol/info/info_svr4.cpp b/kcontrol/info/info_svr4.cpp index ba491a50e..1f71246b7 100644 --- a/kcontrol/info/info_svr4.cpp +++ b/kcontrol/info/info_svr4.cpp @@ -55,9 +55,9 @@ bool GetInfo_ReadfromFile( TQListView *lBox, char *Name, char splitchar ) } TQString s1 = TQString::fromLocal8Bit(buf); - TQString s2 = s1.mid(s1.find(splitchar)+1); + TQString s2 = s1.mid(s1.tqfind(splitchar)+1); - s1.truncate(s1.find(splitchar)); + s1.truncate(s1.tqfind(splitchar)); if(!(s1.isEmpty() || s2.isEmpty())) olditem = new TQListViewItem(lBox, olditem, s1, s2); } diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index 7bfe52948..cd7c9b010 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -163,7 +163,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) break; }; Widget = new TQLabel(title, this); - Widget->setAlignment(AlignLeft); + Widget->tqsetAlignment(AlignLeft); vbox->addWidget(Widget, 1); } @@ -174,7 +174,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) if (i == SWAP_MEM) vbox->addSpacing(SPACING); Widget = new TQLabel(this); - Widget->setAlignment(AlignRight); + Widget->tqsetAlignment(AlignRight); MemSizeLabel[i][j] = Widget; vbox->addWidget(Widget, 1); } @@ -228,7 +228,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) hint = "<qt>" + hint + "</qt>"; Widget = new TQLabel("<b>" + title + "</b>", this); - Widget->setAlignment(AlignCenter); + Widget->tqsetAlignment(AlignCenter); TQToolTip::add(Widget, hint); vbox->addWidget(Widget); vbox->addSpacing(SPACING / 2); @@ -243,7 +243,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) vbox->addSpacing(SPACING / 2); Widget = new TQLabel(this); /* xx MB used. */ - Widget->setAlignment(AlignCenter); + Widget->tqsetAlignment(AlignCenter); TQToolTip::add(Widget, hint); GraphLabel[i] = Widget; vbox->addWidget(Widget); @@ -288,7 +288,7 @@ bool KMemoryWidget::Display_Graph(int widgetindex, TQPixmap pm(width, height); TQPainter paint; - paint.begin(&pm, this); + paint.tqbegin(&pm, this); TQPen pen(TQColor(0, 0, 0)); @@ -342,7 +342,7 @@ bool KMemoryWidget::Display_Graph(int widgetindex, /* draw surrounding box */ paint.setPen(pen); TQRect r = graph->rect(); - qDrawShadePanel(&paint, r.x(), r.y(), r.width(), r.height(), palette().active(), true, 1); + qDrawShadePanel(&paint, r.x(), r.y(), r.width(), r.height(), tqpalette().active(), true, 1); paint.end(); bitBlt(graph, 0, 0, &pm); diff --git a/kcontrol/info/opengl.cpp b/kcontrol/info/opengl.cpp index 061e368e6..c92d85721 100644 --- a/kcontrol/info/opengl.cpp +++ b/kcontrol/info/opengl.cpp @@ -107,7 +107,7 @@ static bool get_dri_device() TQTextStream stream(&file); TQString line = stream.readLine(); if (!line.isEmpty()) { - dri_info.module = line.mid(0, line.find(0x20)); + dri_info.module = line.mid(0, line.tqfind(0x20)); // possible formats, for regression testing // line = " PCI:01:00:0"; @@ -115,8 +115,8 @@ static bool get_dri_device() TQRegExp rx = TQRegExp("\\b[Pp][Cc][Ii][:]([0-9a-fA-F]+[:])?([0-9a-fA-F]+[:][0-9a-fA-F]+[:.][0-9a-fA-F]+)\\b"); if (rx.search(line)>0) { dri_info.pci = rx.cap(2); - int end = dri_info.pci.findRev(':'); - int end2 = dri_info.pci.findRev('.'); + int end = dri_info.pci.tqfindRev(':'); + int end2 = dri_info.pci.tqfindRev('.'); if (end2>end) end=end2; dri_info.pci[end]='.'; @@ -151,7 +151,7 @@ static bool get_dri_device() { TQStringList pci_info; if (ReadPipe("sysctl -n hw.dri.0.name",pci_info)) { - dri_info.module = pci_info[0].mid(0, pci_info[0].find(0x20)); + dri_info.module = pci_info[0].mid(0, pci_info[0].tqfind(0x20)); } return false; } @@ -194,7 +194,7 @@ print_extension_list(const char *ext, TQListViewItem *l1) if (!ext || !ext[0]) return; - TQString qext = TQString::fromLatin1(ext); + TQString qext = TQString::tqfromLatin1(ext); TQListViewItem *l2 = NULL; i = j = 0; diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp index a2b5f1b86..73ab04b8c 100644 --- a/kcontrol/input/core/themepage.cpp +++ b/kcontrol/input/core/themepage.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003 Fredrik H�glund <[email protected]> + * Copyright (C) 2003 Fredrik H�glund <[email protected]> * * Based on the large cursor code written by Rik Hemsley, * Copyright (c) 2000 Rik Hemsley <[email protected]> @@ -130,7 +130,7 @@ void ThemePage::load( bool useDefaults ) currentTheme = whiteCursor ? "SmallWhite" : "SmallBlack"; selectedTheme = currentTheme; - TQListViewItem *item = listview->findItem( currentTheme, DirColumn ); + TQListViewItem *item = listview->tqfindItem( currentTheme, DirColumn ); item->setSelected( true ); } diff --git a/kcontrol/input/core/themepage.h b/kcontrol/input/core/themepage.h index 6ab6dcedd..646354d91 100644 --- a/kcontrol/input/core/themepage.h +++ b/kcontrol/input/core/themepage.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003 Fredrik H�glund <[email protected]> + * Copyright (C) 2003 Fredrik H�glund <[email protected]> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -22,7 +22,7 @@ class KListView; class TQListViewItem; -class ThemePage : public QWidget +class ThemePage : public TQWidget { Q_OBJECT diff --git a/kcontrol/input/kapplymousetheme.cpp b/kcontrol/input/kapplymousetheme.cpp index 99d6d1077..4cc1a8b4f 100644 --- a/kcontrol/input/kapplymousetheme.cpp +++ b/kcontrol/input/kapplymousetheme.cpp @@ -35,8 +35,8 @@ #endif static Display* dpy; -static Display* qt_xdisplay() { return dpy; }\ -static Window qt_xrootwin() { return DefaultRootWindow( dpy ); } +static Display* trinity_qt_xdisplay() { return dpy; }\ +static Window trinity_qt_xrootwin() { return DefaultRootWindow( dpy ); } bool isEmpty( const char* str ) { @@ -63,8 +63,8 @@ int main( int argc, char* argv[] ) // use a default value for theme only if it's not configured at all, not even in X resources if( isEmpty( theme ) - && isEmpty( XGetDefault( qt_xdisplay(), "Xcursor", "theme" )) - && isEmpty( XcursorGetTheme( qt_xdisplay()))) + && isEmpty( XGetDefault( trinity_qt_xdisplay(), "Xcursor", "theme" )) + && isEmpty( XcursorGetTheme( trinity_qt_xdisplay()))) { theme = "default"; ret = 10; // means to switch to default @@ -72,19 +72,19 @@ int main( int argc, char* argv[] ) // Apply the KDE cursor theme to ourselves if( !isEmpty( theme )) - XcursorSetTheme(qt_xdisplay(), theme ); + XcursorSetTheme(trinity_qt_xdisplay(), theme ); if (!isEmpty( size )) - XcursorSetDefaultSize(qt_xdisplay(), atoi( size )); + XcursorSetDefaultSize(trinity_qt_xdisplay(), atoi( size )); // Load the default cursor from the theme and apply it to the root window. - Cursor handle = XcursorLibraryLoadCursor(qt_xdisplay(), "left_ptr"); - XDefineCursor(qt_xdisplay(), qt_xrootwin(), handle); - XFreeCursor(qt_xdisplay(), handle); // Don't leak the cursor + Cursor handle = XcursorLibraryLoadCursor(trinity_qt_xdisplay(), "left_ptr"); + XDefineCursor(trinity_qt_xdisplay(), trinity_qt_xrootwin(), handle); + XFreeCursor(trinity_qt_xdisplay(), handle); // Don't leak the cursor #else - ( void ) qt_xdisplay(); - ( void ) qt_xrootwin(); + ( void ) trinity_qt_xdisplay(); + ( void ) trinity_qt_xrootwin(); ( void ) argv; #endif XCloseDisplay( dpy ); diff --git a/kcontrol/input/kmousedlg.ui b/kcontrol/input/kmousedlg.ui index 01ba9966f..f3e14fc53 100644 --- a/kcontrol/input/kmousedlg.ui +++ b/kcontrol/input/kmousedlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KMouseDlg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KMouseDlg</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>handedBox</cstring> </property> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -74,14 +74,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>rightHanded</cstring> </property> @@ -92,7 +92,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>leftHanded</cstring> </property> @@ -100,7 +100,7 @@ <string>Le&ft handed</string> </property> </widget> - <widget class="QLabel" row="0" column="1" rowspan="3" colspan="1"> + <widget class="TQLabel" row="0" column="1" rowspan="3" colspan="1"> <property name="name"> <cstring>mousePix</cstring> </property> @@ -112,7 +112,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>115</height> @@ -124,7 +124,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbScrollPolarity</cstring> </property> @@ -135,7 +135,7 @@ <string>Change the direction of scrolling for the mouse wheel or the 4th and 5th mouse buttons.</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -146,7 +146,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>doubleClick</cstring> </property> @@ -171,7 +171,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>cbVisualActivate</cstring> </property> @@ -179,18 +179,18 @@ <string>Visual f&eedback on activation</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> - <cstring>cb_pointershape</cstring> + <cstring>cb_pointertqshape</cstring> </property> <property name="text"> - <string>Cha&nge pointer shape over icons</string> + <string>Cha&nge pointer tqshape over icons</string> </property> <property name="checked"> <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>cbAutoSelect</cstring> </property> @@ -208,14 +208,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="4" column="2"> + <widget class="TQLayoutWidget" row="4" column="2"> <property name="name"> <cstring>layout7</cstring> </property> @@ -223,7 +223,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lb_short</cstring> </property> @@ -231,11 +231,11 @@ <string>Short</string> </property> </widget> - <widget class="QSlider" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQSlider" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>slAutoSelect</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>250</width> <height>0</height> @@ -258,14 +258,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>230</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lDelay</cstring> </property> @@ -276,14 +276,14 @@ <cstring>slAutoSelect</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>lb_long</cstring> </property> <property name="text"> <string>Long</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -301,14 +301,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> </size> </property> </spacer> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>singleClick</cstring> </property> @@ -331,7 +331,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -344,7 +344,7 @@ <connection> <sender>singleClick</sender> <signal>toggled(bool)</signal> - <receiver>cb_pointershape</receiver> + <receiver>cb_pointertqshape</receiver> <slot>setEnabled(bool)</slot> </connection> <connection> @@ -364,7 +364,7 @@ <tabstop>rightHanded</tabstop> <tabstop>leftHanded</tabstop> <tabstop>singleClick</tabstop> - <tabstop>cb_pointershape</tabstop> + <tabstop>cb_pointertqshape</tabstop> <tabstop>cbAutoSelect</tabstop> <tabstop>slAutoSelect</tabstop> <tabstop>doubleClick</tabstop> diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp index 9fc8daf32..23defa614 100644 --- a/kcontrol/input/logitechmouse.cpp +++ b/kcontrol/input/logitechmouse.cpp @@ -238,7 +238,7 @@ void LogitechMouse::save(KConfig * /*config*/) kdDebug() << "Logitech mouse settings not saved - not implemented yet" << endl; } -Q_UINT8 LogitechMouse::resolution() +TQ_UINT8 LogitechMouse::resolution() { // kdDebug() << "resolution: " << m_resolution << endl; if ( 0 == m_resolution ) { @@ -299,13 +299,13 @@ void LogitechMouse::setLogitechTo400() } } -Q_UINT8 LogitechMouse::batteryLevel() +TQ_UINT8 LogitechMouse::batteryLevel() { return m_batteryLevel; } -Q_UINT8 LogitechMouse::channel() +TQ_UINT8 LogitechMouse::channel() { return m_channel; } diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h index 4ea296725..1eae2d60f 100644 --- a/kcontrol/input/logitechmouse.h +++ b/kcontrol/input/logitechmouse.h @@ -68,10 +68,10 @@ private: void setLogitechTo800(); TQString cordlessName(); - Q_UINT8 resolution(); + TQ_UINT8 resolution(); void updateResolution(); - Q_UINT8 batteryLevel(); - Q_UINT8 channel(); + TQ_UINT8 batteryLevel(); + TQ_UINT8 channel(); bool isDualChannelCapable(); TQTimer *doUpdate; @@ -83,14 +83,14 @@ private: // of the receiver's CONNECT button bool m_waitLock; // true if receiver searching for new mouse because the // CONNECT button on the receiver was pressed - Q_UINT8 m_batteryLevel; - Q_UINT8 m_channel; - Q_UINT8 m_cordlessNameIndex; // this gets convered into a TQString in cordlessName() - Q_UINT16 m_cordlessSecurity; - Q_UINT16 m_useSecondChannel; - Q_UINT8 m_caseShape; - Q_UINT8 m_numberOfButtons; - Q_UINT8 m_resolution; + TQ_UINT8 m_batteryLevel; + TQ_UINT8 m_channel; + TQ_UINT8 m_cordlessNameIndex; // this gets convered into a TQString in cordlessName() + TQ_UINT16 m_cordlessSecurity; + TQ_UINT16 m_useSecondChannel; + TQ_UINT8 m_caseShape; + TQ_UINT8 m_numberOfButtons; + TQ_UINT8 m_resolution; bool m_twoChannelCapable; // true if the mouse supports dual channels bool m_verticalRoller; // true if the mouse has a vertical roller (wheel) bool m_horizontalRoller; // true if the mouse has a horizontal roller (wheel) diff --git a/kcontrol/input/logitechmouse_base.ui b/kcontrol/input/logitechmouse_base.ui index 5c9c1cd9a..acee892a0 100644 --- a/kcontrol/input/logitechmouse_base.ui +++ b/kcontrol/input/logitechmouse_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>LogitechMouseBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>LogitechMouseBase</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>cordlessNameLabel</cstring> </property> @@ -24,18 +24,18 @@ <string>Cordless Name</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>permissionProblemText</cstring> </property> <property name="text"> <string>You have a Logitech Mouse connected, and libusb was found at compile time, but it was not possible to access this mouse. This is probably caused by a permissions problem - you should consult the manual on how to fix this.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>resolutionSelector</cstring> </property> @@ -52,7 +52,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>button400cpi</cstring> </property> @@ -63,7 +63,7 @@ <number>1</number> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>button800cpi</cstring> </property> @@ -76,7 +76,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>batteryBox</cstring> </property> @@ -90,7 +90,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QProgressBar"> + <widget class="TQProgressBar"> <property name="name"> <cstring>batteryBar</cstring> </property> @@ -100,7 +100,7 @@ </widget> </hbox> </widget> - <widget class="QButtonGroup" row="3" column="0"> + <widget class="TQButtonGroup" row="3" column="0"> <property name="name"> <cstring>channelSelector</cstring> </property> @@ -117,7 +117,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>channel1</cstring> </property> @@ -131,7 +131,7 @@ <number>3</number> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>channel2</cstring> </property> diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 68f376474..1b64dbb9c 100644 --- a/kcontrol/input/mouse.cpp +++ b/kcontrol/input/mouse.cpp @@ -150,7 +150,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) connect(tab1->slAutoSelect, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); connect(tab1->cbVisualActivate, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(tab1->cb_pointershape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(tab1->cb_pointertqshape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClick())); @@ -291,7 +291,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) TQBoxLayout *vbox = new TQVBoxLayout(mouse, KDialog::marginHint(), KDialog::spacingHint()); - TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->layout(), KDialog::spacingHint()); + TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->tqlayout(), KDialog::spacingHint()); mouseKeys = new TQCheckBox(i18n("&Move pointer with keyboard (using the num pad)"), mouse); vvbox->addWidget(mouseKeys); @@ -506,7 +506,7 @@ void MouseConfig::load( bool useDefaults ) tab1->singleClick->setChecked( settings->singleClick ); tab1->doubleClick->setChecked(!settings->singleClick); - tab1->cb_pointershape->setChecked(settings->changeCursor); + tab1->cb_pointertqshape->setChecked(settings->changeCursor); tab1->cbAutoSelect->setChecked( settings->autoSelectDelay >= 0 ); if ( settings->autoSelectDelay < 0 ) tab1->slAutoSelect->setValue( 0 ); @@ -564,7 +564,7 @@ void MouseConfig::save() settings->autoSelectDelay = tab1->cbAutoSelect->isChecked()? tab1->slAutoSelect->value():-1; settings->visualActivate = tab1->cbVisualActivate->isChecked(); // settings->changeCursor = tab1->singleClick->isChecked(); - settings->changeCursor = tab1->cb_pointershape->isChecked(); + settings->changeCursor = tab1->cb_pointertqshape->isChecked(); settings->reverseScrollPolarity = tab1->cbScrollPolarity->isChecked(); settings->apply(); @@ -723,7 +723,7 @@ void MouseConfig::slotWheelScrollLinesChanged(int value) void MouseSettings::apply(bool force) { XChangePointerControl( kapp->getDisplay(), - true, true, int(qRound(accelRate*10)), 10, thresholdMove); + true, true, int(tqRound(accelRate*10)), 10, thresholdMove); // 256 might seems extreme, but X has already been known to return 32, // and we don't want to truncate things. Xlib limits the table to 256 bytes, diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp index ceb399648..e0b33cf1b 100644 --- a/kcontrol/input/xcursor/previewwidget.cpp +++ b/kcontrol/input/xcursor/previewwidget.cpp @@ -303,7 +303,7 @@ void PreviewWidget::setTheme( const TQString &theme ) current = -1; setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) ); setUpdatesEnabled( true ); - repaint( false ); + tqrepaint( false ); } @@ -311,7 +311,7 @@ void PreviewWidget::paintEvent( TQPaintEvent * ) { TQPixmap buffer( size() ); TQPainter p( &buffer ); - p.fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) ); + p.fillRect( rect(), tqcolorGroup().brush( TQColorGroup::Background ) ); Picture dest; if ( !qt_has_xft || !qt_use_xrender ) { diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index 7caf18c3f..27438a4d2 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -122,7 +122,7 @@ ThemePage::ThemePage( TQWidget* parent, const char* name ) ( !icons.exists() && !TQFileInfo( TQDir::homeDirPath() ).isWritable() ) ) installButton->setEnabled( false ); - if ( !themeDirs.contains( path ) ) + if ( !themeDirs.tqcontains( path ) ) installButton->setEnabled( false ); selectionChanged( listview->currentItem() ); @@ -395,7 +395,7 @@ const TQStringList ThemePage::getThemeBaseDirs() const TQString path = XcursorLibraryPath(); #endif // Expand all occurences of ~ to the home dir - path.replace( "~/", TQDir::homeDirPath() + '/' ); + path.tqreplace( "~/", TQDir::homeDirPath() + '/' ); return TQStringList::split( ':', path ); } @@ -414,7 +414,7 @@ bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const continue; const TQStringList subdirs( dir.entryList( TQDir::Dirs ) ); - if ( subdirs.contains( theme ) ) + if ( subdirs.tqcontains( theme ) ) { const TQString path = *it + '/' + theme; const TQString indexfile = path + "/index.theme"; @@ -585,7 +585,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample ) image.setAlphaBuffer( true ); // Clear the image - Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( image.bits() ); + TQ_UINT32 *dst = reinterpret_cast<TQ_UINT32*>( image.bits() ); for ( int i = 0; i < image.width() * image.height(); i++ ) dst[i] = 0; @@ -593,26 +593,26 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample ) TQPoint dstOffset( (image.width() - r.width()) / 2, (image.height() - r.height()) / 2 ); TQPoint srcOffset( r.topLeft() ); - dst = reinterpret_cast<Q_UINT32*>( image.scanLine(dstOffset.y()) ) + dstOffset.x(); - src = reinterpret_cast<Q_UINT32*>( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x(); + dst = reinterpret_cast<TQ_UINT32*>( image.scanLine(dstOffset.y()) ) + dstOffset.x(); + src = reinterpret_cast<TQ_UINT32*>( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x(); // Copy the XcursorImage into the TQImage, converting it from premultiplied // to non-premultiplied alpha and cropping it if needed. for ( int y = 0; y < r.height(); y++ ) { for ( int x = 0; x < r.width(); x++, dst++, src++ ) { - const Q_UINT32 pixel = *src; + const TQ_UINT32 pixel = *src; - const Q_UINT8 a = qAlpha( pixel ); - const Q_UINT8 r = qRed( pixel ); - const Q_UINT8 g = qGreen( pixel ); - const Q_UINT8 b = qBlue( pixel ); + const TQ_UINT8 a = tqAlpha( pixel ); + const TQ_UINT8 r = tqRed( pixel ); + const TQ_UINT8 g = tqGreen( pixel ); + const TQ_UINT8 b = tqBlue( pixel ); if ( !a || a == 255 ) { *dst = pixel; } else { float alpha = a / 255.0; - *dst = qRgba( int(r / alpha), int(g / alpha), int(b / alpha), a ); + *dst = tqRgba( int(r / alpha), int(g / alpha), int(b / alpha), a ); } } dst += ( image.width() - r.width() ); @@ -630,7 +630,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample ) TQImage image( iconSize, iconSize, 32 ); image.setAlphaBuffer( true ); - Q_UINT32 *data = reinterpret_cast< Q_UINT32* >( image.bits() ); + TQ_UINT32 *data = reinterpret_cast< TQ_UINT32* >( image.bits() ); for ( int i = 0; i < image.width() * image.height(); i++ ) data[ i ] = 0; diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp index e2014a1ca..cb0f7de11 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp @@ -97,13 +97,13 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin void KCMIOSlaveInfo::slaveHelp( KIO::Job *, const TQByteArray &data) { if ( data.size() == 0 ) { // EOF - int index = helpData.find( "<meta http-equiv=\"Content-Type\"" ); - index = helpData.find( "charset=", index ) + 8; - TQString charset = helpData.mid( index, helpData.find( '\"', index ) - index ); + int index = helpData.tqfind( "<meta http-equiv=\"Content-Type\"" ); + index = helpData.tqfind( "charset=", index ) + 8; + TQString charset = helpData.mid( index, helpData.tqfind( '\"', index ) - index ); TQString text = TQTextCodec::codecForName(charset.latin1())->toUnicode( helpData ); - index = text.find( "<div class=\"titlepage\">" ); + index = text.tqfind( "<div class=\"titlepage\">" ); text = text.mid( index ); - index = text.find( "<table width=\"100%\" class=\"bottom-nav\"" ); + index = text.tqfind( "<table width=\"100%\" class=\"bottom-nav\"" ); text = text.left( index ); m_info->setText(text); return; diff --git a/kcontrol/joystick/caldialog.cpp b/kcontrol/joystick/caldialog.cpp index 095f18f41..4b6d5fc9b 100644 --- a/kcontrol/joystick/caldialog.cpp +++ b/kcontrol/joystick/caldialog.cpp @@ -65,7 +65,7 @@ void CalDialog::calibrate() do { - qApp->processEvents(2000); + tqApp->tqprocessEvents(2000); } while ( ti.isActive() && (result() != TQDialog::Rejected) ); @@ -165,7 +165,7 @@ void CalDialog::waitButton(int axis, bool press, int &lastVal) // loop until the user presses a button on the device or on the dialog do { - qApp->processEvents(100); + tqApp->tqprocessEvents(100); if ( joydev->getEvent(type, number, value) ) { diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp index 3ffc0e1d7..87b6f4e05 100644 --- a/kcontrol/joystick/joystick.cpp +++ b/kcontrol/joystick/joystick.cpp @@ -95,7 +95,7 @@ joystick::joystick(TQWidget *parent, const char *name, const TQStringList &) joyWidget = new JoyWidget(this); - setMinimumSize(joyWidget->minimumSize()); + setMinimumSize(joyWidget->tqminimumSize()); setButtons(KCModule::Default); } diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp index cfc293b89..0f2349050 100644 --- a/kcontrol/joystick/joywidget.cpp +++ b/kcontrol/joystick/joywidget.cpp @@ -56,7 +56,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name) TQLabel *icon = new TQLabel(messageBox); icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true)); - icon->setFixedSize(icon->sizeHint()); + icon->setFixedSize(icon->tqsizeHint()); message = new TQLabel(messageBox); messageBox->hide(); } @@ -170,7 +170,7 @@ void JoyWidget::init() // we found one - device->insertItem(TQString("%1 (%2)").arg(joy->text()).arg(joy->device())); + device->insertItem(TQString("%1 (%2)").tqarg(joy->text()).tqarg(joy->device())); // display values for first device if ( first ) @@ -213,7 +213,7 @@ void JoyWidget::restoreCurrDev() { // try to find the current open device in the combobox list TQListBoxItem *item; - item = device->listBox()->findItem(joydev->device(), Qt::Contains); + item = device->listBox()->tqfindItem(joydev->device(), TQt::Contains); if ( !item ) // the current open device is one the user entered (not in the list) device->setCurrentText(joydev->device()); @@ -230,7 +230,7 @@ void JoyWidget::deviceChanged(const TQString &dev) int start, stop; TQString devName; - if ( (start = dev.find("/dev")) == -1 ) + if ( (start = dev.tqfind("/dev")) == -1 ) { KMessageBox::sorry(this, i18n("The given device name is invalid (does not contain /dev).\n" @@ -241,7 +241,7 @@ void JoyWidget::deviceChanged(const TQString &dev) return; } - if ( (stop = dev.find(")", start)) != -1 ) // seems to be text selected from our list + if ( (stop = dev.tqfind(")", start)) != -1 ) // seems to be text selected from our list devName = dev.mid(start, stop - start); else devName = dev.mid(start); diff --git a/kcontrol/joystick/joywidget.h b/kcontrol/joystick/joywidget.h index 06b05a4ba..47261408d 100644 --- a/kcontrol/joystick/joywidget.h +++ b/kcontrol/joystick/joywidget.h @@ -35,7 +35,7 @@ class TQCheckBox; class TQHBox; // the widget which displays all buttons, values, etc. -class JoyWidget : public QWidget +class JoyWidget : public TQWidget { Q_OBJECT diff --git a/kcontrol/joystick/poswidget.h b/kcontrol/joystick/poswidget.h index a4d57117e..abe1785c3 100644 --- a/kcontrol/joystick/poswidget.h +++ b/kcontrol/joystick/poswidget.h @@ -26,7 +26,7 @@ /** Widget to display the joystick-selected (x,y) position */ -class PosWidget : public QWidget +class PosWidget : public TQWidget { Q_OBJECT diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index f25eae002..9c7d25898 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -82,7 +82,7 @@ AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* ca // set qwhatsthis help TQWhatsThis::add(this, i18n(intro_text)); _viewer = new KHTMLPart( this, "_viewer" ); - _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ); + _viewer->widget()->tqsetSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ); connect( _viewer->browserExtension(), TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) ); diff --git a/kcontrol/kcontrol/aboutwidget.h b/kcontrol/kcontrol/aboutwidget.h index 595e394e7..37a9b8537 100644 --- a/kcontrol/kcontrol/aboutwidget.h +++ b/kcontrol/kcontrol/aboutwidget.h @@ -31,7 +31,7 @@ class ConfigModule; class KHTMLPart; class KURL; -class AboutWidget : public QHBox +class AboutWidget : public TQHBox { Q_OBJECT diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp index 598807a2d..9acab1129 100644 --- a/kcontrol/kcontrol/dockcontainer.cpp +++ b/kcontrol/kcontrol/dockcontainer.cpp @@ -39,7 +39,7 @@ #include "modules.h" #include "proxywidget.h" -class ModuleTitle : public QHBox +class ModuleTitle : public TQHBox { public: ModuleTitle( TQWidget *parent, const char *name=0 ); @@ -131,7 +131,7 @@ DockContainer::DockContainer(TQWidget *parent) , _module(0L) { _busyw = new TQLabel(i18n("<big><b>Loading...</b></big>"), this); - _busyw->setAlignment(AlignCenter); + _busyw->tqsetAlignment(AlignCenter); _busyw->setTextFormat(RichText); _busyw->setGeometry(0,0, width(), height()); addWidget( _busyw ); @@ -163,7 +163,7 @@ void DockContainer::setBaseWidget(TQWidget *widget) ProxyWidget* DockContainer::loadModule( ConfigModule *module ) { - TQApplication::setOverrideCursor( waitCursor ); + TQApplication::setOverrideCursor( tqwaitCursor ); ProxyWidget *widget = _modulew->load( module ); @@ -221,7 +221,7 @@ i18n("There are unsaved changes in the active module.\n" ProxyWidget *widget = loadModule( module ); - KCGlobal::repairAccels( topLevelWidget() ); + KCGlobal::repairAccels( tqtopLevelWidget() ); return ( widget!=0 ); } diff --git a/kcontrol/kcontrol/dockcontainer.h b/kcontrol/kcontrol/dockcontainer.h index 9c1dfb88f..ea62495bd 100644 --- a/kcontrol/kcontrol/dockcontainer.h +++ b/kcontrol/kcontrol/dockcontainer.h @@ -28,7 +28,7 @@ class ModuleTitle; class ProxyWidget; class TQLabel; -class ModuleWidget : public QVBox +class ModuleWidget : public TQVBox { Q_OBJECT @@ -46,7 +46,7 @@ class ModuleWidget : public QVBox TQVBox *m_body; }; -class DockContainer : public QWidgetStack +class DockContainer : public TQWidgetStack { Q_OBJECT diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp index 0a409b7e0..ed892ac70 100644 --- a/kcontrol/kcontrol/global.cpp +++ b/kcontrol/kcontrol/global.cpp @@ -91,12 +91,12 @@ TQString KCGlobal::baseGroup() if (_infocenter) { kdWarning() << "No K menu group with X-KDE-BaseGroup=info found ! Defaulting to Settings/Information/" << endl; - _baseGroup = TQString::fromLatin1("Settings/Information/"); + _baseGroup = TQString::tqfromLatin1("Settings/Information/"); } else { kdWarning() << "No K menu group with X-KDE-BaseGroup=settings found ! Defaulting to Settings/" << endl; - _baseGroup = TQString::fromLatin1("Settings/"); + _baseGroup = TQString::tqfromLatin1("Settings/"); } } } diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp index bc4e402f8..9cb2037eb 100644 --- a/kcontrol/kcontrol/helpwidget.cpp +++ b/kcontrol/kcontrol/helpwidget.cpp @@ -42,7 +42,7 @@ void HelpWidget::setText(const TQString& docPath, const TQString& text) helptext = text; else helptext = (text + i18n("<p>Use the \"What's This?\" (Shift+F1) to get help on specific options.</p><p>To read the full manual click <a href=\"%1\">here</a>.</p>") - .arg(docPath.local8Bit())); + .tqarg(static_cast<const char *>(docPath.local8Bit()))); } void HelpWidget::setBaseText() @@ -69,7 +69,7 @@ bool HelpWidget::clicked(const TQString & _url) if ( _url.isNull() ) return true; - if ( _url.find('@') > -1 ) { + if ( _url.tqfind('@') > -1 ) { kapp->invokeMailer(_url); return true; } diff --git a/kcontrol/kcontrol/helpwidget.h b/kcontrol/kcontrol/helpwidget.h index 5a78e87d3..1a01cc860 100644 --- a/kcontrol/kcontrol/helpwidget.h +++ b/kcontrol/kcontrol/helpwidget.h @@ -23,7 +23,7 @@ class TQWidget; class TQWhatsThis; -class HelpWidget : public QWhatsThis +class HelpWidget : public TQWhatsThis { public: HelpWidget(TQWidget *parent); diff --git a/kcontrol/kcontrol/indexwidget.cpp b/kcontrol/kcontrol/indexwidget.cpp index cf57dc0e4..92b9cf0a0 100644 --- a/kcontrol/kcontrol/indexwidget.cpp +++ b/kcontrol/kcontrol/indexwidget.cpp @@ -60,7 +60,7 @@ void IndexWidget::resizeEvent(TQResizeEvent *e) void IndexWidget::moduleSelected(ConfigModule *m) { - const TQObject *obj = sender(); + const TQObject *obj = TQT_TQOBJECT_CONST(sender()); if(!m) return; emit moduleActivated(m); diff --git a/kcontrol/kcontrol/indexwidget.h b/kcontrol/kcontrol/indexwidget.h index a0591fcd1..6471e0ec3 100644 --- a/kcontrol/kcontrol/indexwidget.h +++ b/kcontrol/kcontrol/indexwidget.h @@ -29,7 +29,7 @@ class ConfigModule; class ModuleTreeView; class ModuleIconView; -class IndexWidget : public QWidgetStack +class IndexWidget : public TQWidgetStack { Q_OBJECT diff --git a/kcontrol/kcontrol/kcrootonly.cpp b/kcontrol/kcontrol/kcrootonly.cpp index 723895de3..9b7991298 100644 --- a/kcontrol/kcontrol/kcrootonly.cpp +++ b/kcontrol/kcontrol/kcrootonly.cpp @@ -30,9 +30,9 @@ KCRootOnly::KCRootOnly(TQWidget *parent, const char *name) TQLabel *label = new TQLabel(i18n("<big>You need super user privileges to run this control module.</big><br>" "Click on the \"Administrator Mode\" button below."), this); layout->addWidget(label); - label->setAlignment(AlignCenter); + label->tqsetAlignment(AlignCenter); label->setTextFormat(RichText); - label->setMinimumSize(label->sizeHint()); + label->setMinimumSize(label->tqsizeHint()); } diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 758b742fd..a780b608e 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -59,7 +59,7 @@ KControlApp::KControlApp() KGlobal::setActiveInstance(this); // KUniqueApplication does dcop regitration for us - ModuleIface *modIface = new ModuleIface(toplevel, "moduleIface"); + ModuleIface *modIface = new ModuleIface(TQT_TQOBJECT(toplevel), "moduleIface"); connect (modIface, TQT_SIGNAL(helpClicked()), toplevel, TQT_SLOT(slotHelpRequest())); connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest())); @@ -77,9 +77,9 @@ KControlApp::KControlApp() int fontSize = toplevel->fontInfo().pointSize(); if (fontSize == 0) fontSize = (toplevel->fontInfo().pixelSize() * 72) / pdm.logicalDpiX(); - int x = config->readNumEntry(TQString::fromLatin1("InitialWidth %1").arg(desk.width()), + int x = config->readNumEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk.width()), QMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) ); - int y = config->readNumEntry(TQString::fromLatin1("InitialHeight %1").arg(desk.height()), + int y = config->readNumEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk.height()), QMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) ); toplevel->resize(x,y); } @@ -90,9 +90,9 @@ KControlApp::~KControlApp() { KConfig *config = KGlobal::config(); config->setGroup("General"); - TQWidget *desk = TQApplication::desktop(); - config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); - config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height()); + TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop()); + config->writeEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); + config->writeEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height()); config->sync(); } delete toplevel; diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp index 6d40a8bf7..687b3a412 100644 --- a/kcontrol/kcontrol/moduleIface.cpp +++ b/kcontrol/kcontrol/moduleIface.cpp @@ -26,7 +26,7 @@ ModuleIface::ModuleIface(TQObject *parent, const char *name) : TQObject(parent, name), DCOPObject(name) { - _parent = static_cast<TQWidget *>(parent); + _parent = TQT_TQWIDGET(parent); } diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp index c6df5cb71..c8e9bdc01 100644 --- a/kcontrol/kcontrol/moduleiconview.cpp +++ b/kcontrol/kcontrol/moduleiconview.cpp @@ -92,7 +92,7 @@ void ModuleIconView::fill() // go-back node ModuleIconItem *i = new ModuleIconItem(this, i18n("Back"), icon); i->setOrderNo(0); - int last_slash = _path.findRev('/', -2); + int last_slash = _path.tqfindRev('/', -2); if (last_slash == -1) i->setTag(TQString::null); else diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp index ad60eda5a..908b6003e 100644 --- a/kcontrol/kcontrol/modulemenu.cpp +++ b/kcontrol/kcontrol/modulemenu.cpp @@ -70,7 +70,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath) // Item names may contain ampersands. To avoid them being converted to // accelators, replace them with two ampersands. TQString name = group->caption(); - name.replace("&", "&&"); + name.tqreplace("&", "&&"); parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall) , name, menu); @@ -85,7 +85,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath) // Item names may contain ampersands. To avoid them being converted to // accelators, replace them with two ampersands. TQString name = module->moduleName(); - name.replace("&", "&&"); + name.tqreplace("&", "&&"); int realid = parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall) , name, id); diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index cc8c63af4..97b36719a 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -142,12 +142,12 @@ void ConfigModule::runAsRoot() // create an embed widget that will embed the // kcmshell running as root - _embedLayout = new TQVBoxLayout(_module->parentWidget()); - _embedFrame = new TQVBox( _module->parentWidget() ); + _embedLayout = new TQVBoxLayout(_module->tqparentWidget()); + _embedFrame = new TQVBox( _module->tqparentWidget() ); _embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised ); TQPalette pal( red ); pal.setColor( TQColorGroup::Background, - _module->parentWidget()->colorGroup().background() ); + _module->tqparentWidget()->tqcolorGroup().background() ); _embedFrame->setPalette( pal ); _embedFrame->setLineWidth( 2 ); _embedFrame->setMidLineWidth( 2 ); @@ -158,7 +158,7 @@ void ConfigModule::runAsRoot() _module->hide(); _embedFrame->show(); TQLabel *_busy = new TQLabel(i18n("<big>Loading...</big>"), _embedStack); - _busy->setAlignment(AlignCenter); + _busy->tqsetAlignment(AlignCenter); _busy->setTextFormat(RichText); _busy->setGeometry(0,0, _module->width(), _module->height()); _busy->show(); @@ -170,18 +170,18 @@ void ConfigModule::runAsRoot() bool kdeshell = false; if (cmd.left(5) == "kdesu") { - cmd = cmd.remove(0,5).stripWhiteSpace(); + cmd = TQString(cmd.remove(0,5)).stripWhiteSpace(); // remove all kdesu switches while( cmd.length() > 1 && cmd[ 0 ] == '-' ) { - int pos = cmd.find( ' ' ); - cmd = cmd.remove( 0, pos ).stripWhiteSpace(); + int pos = cmd.tqfind( ' ' ); + cmd = TQString(cmd.remove( 0, pos )).stripWhiteSpace(); } } if (cmd.left(8) == "kcmshell") { - cmd = cmd.remove(0,8).stripWhiteSpace(); + cmd = TQString(cmd.remove(0,8)).stripWhiteSpace(); kdeshell = true; } @@ -316,7 +316,7 @@ bool ConfigModuleList::readDesktopEntriesRecursive(const TQString &path) TQPtrList<ConfigModule> ConfigModuleList::modules(const TQString &path) { - Menu *menu = subMenus.find(path); + Menu *menu = subMenus.tqfind(path); if (menu) return menu->modules; @@ -325,7 +325,7 @@ TQPtrList<ConfigModule> ConfigModuleList::modules(const TQString &path) TQStringList ConfigModuleList::submenus(const TQString &path) { - Menu *menu = subMenus.find(path); + Menu *menu = subMenus.tqfind(path); if (menu) return menu->submenus; @@ -338,7 +338,7 @@ TQString ConfigModuleList::findModule(ConfigModule *module) Menu *menu; for(;(menu = it.current());++it) { - if (menu->modules.containsRef(module)) + if (menu->modules.tqcontainsRef(module)) return it.currentKey(); } return TQString::null; diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index 6f767ab20..d685f7fe8 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -49,7 +49,7 @@ static TQPixmap appIcon(const TQString &iconName) return normal; } -class ModuleTreeWhatsThis : public QWhatsThis +class ModuleTreeWhatsThis : public TQWhatsThis { public: ModuleTreeWhatsThis( ModuleTreeView* tree) @@ -133,9 +133,9 @@ void ModuleTreeView::fill(ModuleTreeItem *parent, const TQString &parentPath) -TQSize ModuleTreeView::sizeHint() const +TQSize ModuleTreeView::tqsizeHint() const { - return TQListView::sizeHint().boundedTo( + return TQListView::tqsizeHint().boundedTo( TQSize( fontMetrics().maxWidth()*35, QWIDGETSIZE_MAX) ); } @@ -166,7 +166,7 @@ void ModuleTreeView::expandItem(TQListViewItem *item, TQPtrList<TQListViewItem> { while (item) { - setOpen(item, parentList->contains(item)); + setOpen(item, parentList-.tqcontains(item)); if (item->childCount() != 0) expandItem(item->firstChild(), parentList); @@ -312,7 +312,7 @@ void ModuleTreeItem::setPixmap(int column, const TQPixmap& pm) { if (!pm.isNull()) { - ModuleTreeItem* p = dynamic_cast<ModuleTreeItem*>(parent()); + ModuleTreeItem* p = dynamic_cast<ModuleTreeItem*>(tqparent()); if (p) p->regChildIconWidth(pm.width()); } @@ -331,7 +331,7 @@ void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int colu if (!pixmap(0)) { int offset = 0; - ModuleTreeItem* parentItem = dynamic_cast<ModuleTreeItem*>(parent()); + ModuleTreeItem* parentItem = dynamic_cast<ModuleTreeItem*>(tqparent()); if (parentItem) { offset = parentItem->maxChildIconWidth(); @@ -356,7 +356,7 @@ void ModuleTreeItem::setGroup(const TQString &path) { KServiceGroup::Ptr group = KServiceGroup::group(path); TQString defName = path.left(path.length()-1); - int pos = defName.findRev('/'); + int pos = defName.tqfindRev('/'); if (pos >= 0) defName = defName.mid(pos+1); if (group && group->isValid()) diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h index ede3c8a52..ff01cc24a 100644 --- a/kcontrol/kcontrol/moduletreeview.h +++ b/kcontrol/kcontrol/moduletreeview.h @@ -31,7 +31,7 @@ class ConfigModule; class ConfigModuleList; class TQPainter; -class ModuleTreeItem : public QListViewItem +class ModuleTreeItem : public TQListViewItem { public: @@ -74,7 +74,7 @@ public: void makeSelected(ConfigModule* module); void makeVisible(ConfigModule *module); void fill(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; signals: void moduleSelected(ConfigModule*); diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index b8f83c5fc..f3b80bda0 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -39,7 +39,7 @@ #include <kdebug.h> #include <tqtimer.h> -class WhatsThis : public QWhatsThis +class WhatsThis : public TQWhatsThis { public: WhatsThis( ProxyWidget* parent ) @@ -60,7 +60,7 @@ private: //////////////////////////////////////////////////////////////////////////////////////////////////////// -static void setVisible(TQPushButton *btn, bool vis) +static void trinity_setVisible(TQPushButton *btn, bool vis) { if (vis) btn->show(); @@ -72,7 +72,7 @@ static void setVisible(TQPushButton *btn, bool vis) //////////////////////////////////////////////////////////////////////////////////////////////////////// -class RootInfoWidget : public QLabel +class RootInfoWidget : public TQLabel { public: RootInfoWidget(TQWidget *parent, const char *name); @@ -100,7 +100,7 @@ RootInfoWidget::RootInfoWidget(TQWidget *parent, const char *name = 0) //////////////////////////////////////////////////////////////////////////////////////////////////////// -class ProxyView : public QScrollView +class ProxyView : public TQScrollView { public: ProxyView(KCModule *client, const TQString& title, TQWidget *parent, bool run_as_root, const char *name); @@ -113,14 +113,14 @@ private: bool scroll; }; -class ProxyContentWidget : public QWidget +class ProxyContentWidget : public TQWidget { public: ProxyContentWidget( TQWidget* parent ) : TQWidget( parent ) {} ~ProxyContentWidget(){} // this should be really done by qscrollview in AutoOneFit mode! - TQSize sizeHint() const { return minimumSizeHint(); } + TQSize tqsizeHint() const { return tqminimumSizeHint(); } }; @@ -144,7 +144,7 @@ ProxyView::ProxyView(KCModule *_client, const TQString&, TQWidget *parent, bool } client->reparent(contentWidget,0,TQPoint(0,0),true); vbox->addWidget( client ); - vbox->activate(); // make sure we have a proper minimumSizeHint + vbox->activate(); // make sure we have a proper tqminimumSizeHint addChild(contentWidget); } @@ -215,11 +215,11 @@ ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name, // only enable the requested buttons int b = _client->buttons(); - setVisible(_handbook, (b & KCModule::Help)); - setVisible(_default, mayModify && (b & KCModule::Default)); - setVisible(_apply, mayModify && (b & KCModule::Apply)); - setVisible(_reset, mayModify && (b & KCModule::Apply)); - setVisible(_root, run_as_root); + trinity_setVisible(_handbook, (b & KCModule::Help)); + trinity_setVisible(_default, mayModify && (b & KCModule::Default)); + trinity_setVisible(_apply, mayModify && (b & KCModule::Apply)); + trinity_setVisible(_reset, mayModify && (b & KCModule::Apply)); + trinity_setVisible(_root, run_as_root); // disable initial buttons _apply->setEnabled( false ); diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h index 6fc062dc8..f8a7e9ee3 100644 --- a/kcontrol/kcontrol/proxywidget.h +++ b/kcontrol/kcontrol/proxywidget.h @@ -36,7 +36,7 @@ class KAboutData; class ProxyView; -class ProxyWidget : public QWidget +class ProxyWidget : public TQWidget { Q_OBJECT diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp index e4949622d..2333774ba 100644 --- a/kcontrol/kcontrol/searchwidget.cpp +++ b/kcontrol/kcontrol/searchwidget.cpp @@ -34,7 +34,7 @@ /** * Helper class for sorting icon modules by name without losing the fileName ID */ -class ModuleItem : public QListBoxPixmap +class ModuleItem : public TQListBoxPixmap { public: ModuleItem(ConfigModule *module, TQListBox * listbox = 0) : diff --git a/kcontrol/kcontrol/searchwidget.h b/kcontrol/kcontrol/searchwidget.h index 42827f1f4..abf094c2d 100644 --- a/kcontrol/kcontrol/searchwidget.h +++ b/kcontrol/kcontrol/searchwidget.h @@ -48,7 +48,7 @@ class KeywordListEntry }; -class SearchWidget : public QWidget +class SearchWidget : public TQWidget { Q_OBJECT diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index aac3427ff..a4023f88c 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -49,7 +49,7 @@ #include "toplevel.moc" TopLevel::TopLevel(const char* name) - : KMainWindow( 0, name, WStyle_ContextHelp ) + : KMainWindow( 0, name, (WFlags)WStyle_ContextHelp ) , _active(0), dummyAbout(0) { setCaption(TQString::null); @@ -86,7 +86,7 @@ TopLevel::TopLevel(const char* name) } // create the layout box - _splitter = new TQSplitter( TQSplitter::Horizontal, this ); + _splitter = new TQSplitter( Qt::Horizontal, this ); TQFrame* leftFrame = new TQFrame ( _splitter ); TQBoxLayout *leftFrameLayout = new TQVBoxLayout( leftFrame ); @@ -142,7 +142,7 @@ TopLevel::TopLevel(const char* name) // help widget _help = new HelpWidget(_dock); - _stack->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + _stack->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); // Restore sizes config->setGroup("General"); @@ -234,40 +234,40 @@ bool TopLevel::queryClose() void TopLevel::setupActions() { - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); icon_view = new KRadioAction - (i18n("&Icon View"), 0, this, TQT_SLOT(activateIconView()), + (i18n("&Icon View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateIconView()), actionCollection(), "activate_iconview"); icon_view->setExclusiveGroup( "viewmode" ); tree_view = new KRadioAction - (i18n("&Tree View"), 0, this, TQT_SLOT(activateTreeView()), + (i18n("&Tree View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateTreeView()), actionCollection(), "activate_treeview"); tree_view->setExclusiveGroup( "viewmode" ); icon_small = new KRadioAction - (i18n("&Small"), 0, this, TQT_SLOT(activateSmallIcons()), + (i18n("&Small"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateSmallIcons()), actionCollection(), "activate_smallicons"); icon_small->setExclusiveGroup( "iconsize" ); icon_medium = new KRadioAction - (i18n("&Medium"), 0, this, TQT_SLOT(activateMediumIcons()), + (i18n("&Medium"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateMediumIcons()), actionCollection(), "activate_mediumicons"); icon_medium->setExclusiveGroup( "iconsize" ); icon_large = new KRadioAction - (i18n("&Large"), 0, this, TQT_SLOT(activateLargeIcons()), + (i18n("&Large"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateLargeIcons()), actionCollection(), "activate_largeicons"); icon_large->setExclusiveGroup( "iconsize" ); icon_huge = new KRadioAction - (i18n("&Huge"), 0, this, TQT_SLOT(activateHugeIcons()), + (i18n("&Huge"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateHugeIcons()), actionCollection(), "activate_hugeicons"); icon_huge->setExclusiveGroup( "iconsize" ); - about_module = new KAction(i18n("About Current Module"), 0, this, TQT_SLOT(aboutModule()), actionCollection(), "help_about_module"); + about_module = new KAction(i18n("About Current Module"), 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), actionCollection(), "help_about_module"); about_module->setEnabled(false); // I need to add this so that each module can get a bug reported, @@ -514,7 +514,7 @@ void TopLevel::aboutModule() TQString TopLevel::handleAmpersand( TQString modulename ) const { - if( modulename.contains( '&' )) // double it + if( modulename.tqcontains( '&' )) // double it { for( int i = modulename.length(); i >= 0; diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index f24af2c1e..2a7a7cbfb 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/kcontrol/kded/kcmkded.cpp @@ -96,7 +96,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) _lvStartup->setAllColumnsShowFocus(true); _lvStartup->header()->setStretchEnabled(true, 2); - KButtonBox *buttonBox = new KButtonBox( gb, Horizontal); + KButtonBox *buttonBox = new KButtonBox( gb, Qt::Horizontal); _pbStart = buttonBox->addButton( i18n("Start")); _pbStop = buttonBox->addButton( i18n("Stop")); @@ -113,10 +113,10 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) void setModuleGroup(KConfig *config, const TQString &filename) { TQString module = filename; - int i = module.findRev('/'); + int i = module.tqfindRev('/'); if (i != -1) module = module.mid(i+1); - i = module.findRev('.'); + i = module.tqfindRev('.'); if (i != -1) module = module.left(i); @@ -149,7 +149,7 @@ void KDEDConfig::load( bool useDefaults ) { TQStringList files; KGlobal::dirs()->findAllResources( "services", - TQString::fromLatin1( "kded/*.desktop" ), + TQString::tqfromLatin1( "kded/*.desktop" ), true, true, files ); TQListViewItem* item = 0L; @@ -187,7 +187,7 @@ void KDEDConfig::save() { TQStringList files; KGlobal::dirs()->findAllResources( "services", - TQString::fromLatin1( "kded/*.desktop" ), + TQString::tqfromLatin1( "kded/*.desktop" ), true, true, files ); KConfig kdedrc("kdedrc", false, false); @@ -201,7 +201,7 @@ void KDEDConfig::save() { if (file.readBoolEntry("X-KDE-Kded-autoload")){ - item = static_cast<TQCheckListItem *>(_lvStartup->findItem(file.readEntry("X-KDE-Library"),4)); + item = static_cast<TQCheckListItem *>(_lvStartup->tqfindItem(file.readEntry("X-KDE-Library"),4)); if (item) { // we found a match, now compare and see what changed setAutoloadEnabled(&kdedrc, *it, item->isOn()); @@ -251,13 +251,13 @@ void KDEDConfig::getServiceStatus() it.current()->setText(3, NOT_RUNNING); for ( QCStringList::Iterator it = modules.begin(); it != modules.end(); ++it ) { - TQListViewItem *item = _lvLoD->findItem(*it, 4); + TQListViewItem *item = _lvLoD->tqfindItem(*it, 4); if ( item ) { item->setText(2, RUNNING); } - item = _lvStartup->findItem(*it, 4); + item = _lvStartup->tqfindItem(*it, 4); if ( item ) { item->setText(3, RUNNING); @@ -269,7 +269,7 @@ void KDEDConfig::slotReload() { TQString current = _lvStartup->currentItem()->text(4); load(); - TQListViewItem *item = _lvStartup->findItem(current, 4); + TQListViewItem *item = _lvStartup->tqfindItem(current, 4); if (item) _lvStartup->setCurrentItem(item); } diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h index 8e6ff8d9a..1e9e42e72 100644 --- a/kcontrol/kded/kcmkded.h +++ b/kcontrol/kded/kcmkded.h @@ -62,7 +62,7 @@ private: TQString NOT_RUNNING; }; -class CheckListItem : public TQObject, public QCheckListItem +class CheckListItem : public TQObject, public TQCheckListItem { Q_OBJECT public: diff --git a/kcontrol/kdm/background.h b/kcontrol/kdm/background.h index 76b0070c3..2e5182b16 100644 --- a/kcontrol/kdm/background.h +++ b/kcontrol/kdm/background.h @@ -20,7 +20,7 @@ class KGlobalBackgroundSettings; class TQCheckBox; class TQLabel; -class KBackground: public QWidget +class KBackground: public TQWidget { Q_OBJECT public: diff --git a/kcontrol/kdm/kbackedcombobox.cpp b/kcontrol/kdm/kbackedcombobox.cpp index 1ba598e49..9f651b433 100644 --- a/kcontrol/kdm/kbackedcombobox.cpp +++ b/kcontrol/kdm/kbackedcombobox.cpp @@ -28,7 +28,7 @@ void KBackedComboBox::insertItem( const TQString &id, const TQString &name ) void KBackedComboBox::setCurrentId( const TQString &id ) { - if (id2name.contains( id )) + if (id2name.tqcontains( id )) setCurrentItem( id2name[id] ); else setCurrentItem( 0 ); diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp index 58696902b..90631e3bf 100644 --- a/kcontrol/kdm/kdm-appear.cpp +++ b/kcontrol/kdm/kdm-appear.cpp @@ -124,7 +124,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name) logobutton->installEventFilter(this); // for drag and drop connect(logobutton, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogoButtonClicked())); hglay->addWidget(logoLabel, 1, 0); - hglay->addWidget(logobutton, 1, 1, AlignCenter); + hglay->addWidget(logobutton, 1, 1, Qt::AlignCenter); hglay->addRowSpacing(1, 110); wtstr = i18n("Click here to choose an image that KDM will display. " "You can also drag and drop an image onto this button " @@ -139,8 +139,8 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name) grid->addLayout(hglay, 2, 1); label = new TQLabel(i18n("Position:"), group); - hglay->addMultiCellWidget(label, 0,1, 0,0, AlignVCenter); - TQValidator *posValidator = new TQIntValidator(0, 100, group); + hglay->addMultiCellWidget(label, 0,1, 0,0, Qt::AlignVCenter); + TQValidator *posValidator = new TQIntValidator(0, 100, TQT_TQOBJECT(group)); TQLabel *xLineLabel = new TQLabel(i18n("&X:"), group); hglay->addWidget(xLineLabel, 0, 1); xLineEdit = new TQLineEdit (group); @@ -209,7 +209,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name) // The Language group box - group = new TQGroupBox(0, Vertical, i18n("Locale"), this); + group = new TQGroupBox(0, Qt::Vertical, i18n("Locale"), this); vbox->addWidget(group); langcombo = new KLanguageButton(group); @@ -250,19 +250,19 @@ void KDMAppearanceWidget::makeReadOnly() void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo) { TQStringList langlist = KGlobal::dirs()->findAllResources("locale", - TQString::fromLatin1("*/entry.desktop")); + TQString::tqfromLatin1("*/entry.desktop")); langlist.sort(); for ( TQStringList::ConstIterator it = langlist.begin(); it != langlist.end(); ++it ) { TQString fpath = (*it).left((*it).length() - 14); - int index = fpath.findRev('/'); + int index = fpath.tqfindRev('/'); TQString nid = fpath.mid(index + 1); KSimpleConfig entry(*it); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); - combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString::null); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); + combo->insertLanguage(nid, name, TQString::tqfromLatin1("l10n/"), TQString::null); } } @@ -280,7 +280,7 @@ void KDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo) if (!(str = config.readEntry("Name")).isEmpty() || !(str = config.readEntry("name")).isEmpty()) { - TQString str2 = (*it).mid( (*it).findRev( '/' ) + 1 ); // strip off path + TQString str2 = (*it).mid( (*it).tqfindRev( '/' ) + 1 ); // strip off path str2.setLength( str2.length() - 6 ); // strip off ".kcsrc combo->insertItem( str2, str ); } @@ -316,15 +316,15 @@ void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo) bool KDMAppearanceWidget::setLogo(TQString logo) { TQString flogo = logo.isEmpty() ? - locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) : + locate("data", TQString::tqfromLatin1("kdm/pics/kdelogo.png") ) : logo; TQImage p(flogo); if (p.isNull()) return false; if (p.width() > 100 || p.height() > 100) - p = p.smoothScale(100, 100, TQImage::ScaleMin); + p = p.smoothScale(100, 100, TQ_ScaleMin); logobutton->setPixmap(p); - uint bd = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2; + uint bd = tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2; logobutton->setFixedSize(p.width() + bd, p.height() + bd); logopath = logo; return true; @@ -334,7 +334,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo) void KDMAppearanceWidget::slotLogoButtonClicked() { KImageIO::registerFormats(); - KFileDialog dialogue(locate("data", TQString::fromLatin1("kdm/pics/")), + KFileDialog dialogue(locate("data", TQString::tqfromLatin1("kdm/pics/")), KImageIO::pattern( KImageIO::Reading ), this, 0, true); dialogue.setOperationMode( KFileDialog::Opening ); @@ -392,7 +392,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) if(!url->isLocalFile()) { pixurl.setPath(KGlobal::dirs()->resourceDirs("data").last() + "kdm/pics/" + url->fileName()); - KIO::NetAccess::copy(*url, pixurl, parentWidget()); + KIO::NetAccess::copy(*url, pixurl, tqparentWidget()); istmp = true; } else { pixurl = *url; @@ -401,7 +401,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) // By now url should be "file:/..." if (!setLogo(pixurl.path())) { - KIO::NetAccess::del(pixurl, parentWidget()); + KIO::NetAccess::del(pixurl, tqparentWidget()); TQString msg = i18n("There was an error loading the image:\n" "%1\n" "It will not be saved.") diff --git a/kcontrol/kdm/kdm-appear.h b/kcontrol/kdm/kdm-appear.h index 3481635b6..91aad8173 100644 --- a/kcontrol/kdm/kdm-appear.h +++ b/kcontrol/kdm/kdm-appear.h @@ -42,7 +42,7 @@ class TQLineEdit; class KLineEdit; -class KDMAppearanceWidget : public QWidget +class KDMAppearanceWidget : public TQWidget { Q_OBJECT diff --git a/kcontrol/kdm/kdm-conv.cpp b/kcontrol/kdm/kdm-conv.cpp index 155d5b380..94e64debb 100644 --- a/kcontrol/kdm/kdm-conv.cpp +++ b/kcontrol/kdm/kdm-conv.cpp @@ -50,7 +50,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name) alGroup = new TQVGroupBox( i18n("Enable Au&to-Login"), this ); alGroup->setCheckable( true ); - alGroup->setSizePolicy( vpref ); + alGroup->tqsetSizePolicy( vpref ); TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature." " This applies only to KDM's graphical login." @@ -92,7 +92,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name) puGroup = new TQVButtonGroup(i18n("Preselect User"), this ); - puGroup->setSizePolicy( vpref ); + puGroup->tqsetSizePolicy( vpref ); connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPresChanged())); connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged())); @@ -295,7 +295,7 @@ void KDMConvenienceWidget::slotUpdateNoPassUser( TQListViewItem *item ) if ( !item ) return; TQCheckListItem *itm = (TQCheckListItem *)item; - TQStringList::iterator it = noPassUsers.find( itm->text() ); + TQStringList::iterator it = noPassUsers.tqfind( itm->text() ); if (itm->isOn()) { if (it == noPassUsers.end()) noPassUsers.append( itm->text() ); @@ -328,7 +328,7 @@ void KDMConvenienceWidget::slotAddUsers(const TQMap<TQString,int> &users) } if (it.data() != 0) (new TQCheckListItem(npuserlv, it.key(), TQCheckListItem::CheckBox))-> - setOn(noPassUsers.find(it.key()) != noPassUsers.end()); + setOn(noPassUsers.tqfind(it.key()) != noPassUsers.end()); } if (userlb->listBox()) @@ -349,13 +349,13 @@ void KDMConvenienceWidget::slotDelUsers(const TQMap<TQString,int> &users) if (it.data() > 0) { if (it.key() != autoUser && userlb->listBox()) delete userlb->listBox()-> - findItem( it.key(), ExactMatch | CaseSensitive ); + tqfindItem( it.key(), ExactMatch | CaseSensitive ); if (it.key() != preselUser && puserlb->listBox()) delete puserlb->listBox()-> - findItem( it.key(), ExactMatch | CaseSensitive ); + tqfindItem( it.key(), ExactMatch | CaseSensitive ); } if (it.data() != 0) - delete npuserlv->findItem( it.key(), 0 ); + delete npuserlv->tqfindItem( it.key(), 0 ); } } diff --git a/kcontrol/kdm/kdm-conv.h b/kcontrol/kdm/kdm-conv.h index 611ab9797..be8bebf35 100644 --- a/kcontrol/kdm/kdm-conv.h +++ b/kcontrol/kdm/kdm-conv.h @@ -39,7 +39,7 @@ #include <pwd.h> -class KDMConvenienceWidget : public QWidget +class KDMConvenienceWidget : public TQWidget { Q_OBJECT @@ -68,15 +68,15 @@ private slots: void slotUpdateNoPassUser( TQListViewItem *item ); private: - QGroupBox *alGroup, *puGroup, *npGroup, *btGroup; - QCheckBox *againcb, *cbarlen, *cbjumppw, *autoLockCheck; - QRadioButton *npRadio, *ppRadio, *spRadio; + TQGroupBox *alGroup, *puGroup, *npGroup, *btGroup; + TQCheckBox *againcb, *cbarlen, *cbjumppw, *autoLockCheck; + TQRadioButton *npRadio, *ppRadio, *spRadio; KComboBox *userlb, *puserlb; - QSpinBox *delaysb; + TQSpinBox *delaysb; KListView *npuserlv; - QLabel *u_label, *d_label, *pu_label, *w_label, *n_label, *pl_label; - QString autoUser, preselUser; - QStringList noPassUsers; + TQLabel *u_label, *d_label, *pu_label, *w_label, *n_label, *pl_label; + TQString autoUser, preselUser; + TQStringList noPassUsers; }; #endif diff --git a/kcontrol/kdm/kdm-font.h b/kcontrol/kdm/kdm-font.h index 427da8e8b..c636a6f90 100644 --- a/kcontrol/kdm/kdm-font.h +++ b/kcontrol/kdm/kdm-font.h @@ -25,7 +25,7 @@ class KFontRequester; class TQCheckBox; -class KDMFontWidget : public QWidget +class KDMFontWidget : public TQWidget { Q_OBJECT @@ -45,7 +45,7 @@ protected slots: void set_def(); private: - QCheckBox *aacb; + TQCheckBox *aacb; KFontRequester *greetingFontChooser; KFontRequester *failFontChooser; KFontRequester *stdFontChooser; diff --git a/kcontrol/kdm/kdm-shut.h b/kcontrol/kdm/kdm-shut.h index b8513cac5..0e7cdb654 100644 --- a/kcontrol/kdm/kdm-shut.h +++ b/kcontrol/kdm/kdm-shut.h @@ -28,7 +28,7 @@ class TQCheckBox; class KURLRequester; class KBackedComboBox; -class KDMSessionsWidget : public QWidget +class KDMSessionsWidget : public TQWidget { Q_OBJECT @@ -52,8 +52,8 @@ private: void readSD (TQComboBox *, TQString); void writeSD (TQComboBox *); - QComboBox *sdlcombo, *sdrcombo; - QLabel *sdllabel, *sdrlabel; + TQComboBox *sdlcombo, *sdrcombo; + TQLabel *sdllabel, *sdrlabel; KURLRequester *restart_lined, *shutdown_lined; KBackedComboBox *bm_combo; }; diff --git a/kcontrol/kdm/kdm-users.cpp b/kcontrol/kdm/kdm-users.cpp index ce27f6498..75139c284 100644 --- a/kcontrol/kdm/kdm-users.cpp +++ b/kcontrol/kdm/kdm-users.cpp @@ -85,23 +85,23 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) TQString wtstr; - minGroup = new TQGroupBox( 2, Horizontal, i18n("System U&IDs"), this ); + minGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("System U&IDs"), this ); TQWhatsThis::add( minGroup, i18n("Users with a UID (numerical user identification) outside this range will not be listed by KDM and this setup dialog." " Note that users with the UID 0 (typically root) are not affected by this and must be" " explicitly hidden in \"Not hidden\" mode.")); TQSizePolicy sp_ign_fix( TQSizePolicy::Ignored, TQSizePolicy::Fixed ); - TQValidator *valid = new TQIntValidator( 0, 999999, minGroup ); + TQValidator *valid = new TQIntValidator( 0, 999999, TQT_TQOBJECT(minGroup) ); TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup ); leminuid = new KLineEdit( minGroup ); minlab->setBuddy( leminuid ); - leminuid->setSizePolicy( sp_ign_fix ); + leminuid->tqsetSizePolicy( sp_ign_fix ); leminuid->setValidator( valid ); connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup ); lemaxuid = new KLineEdit( minGroup ); maxlab->setBuddy( lemaxuid ); - lemaxuid->setSizePolicy( sp_ign_fix ); + lemaxuid->tqsetSizePolicy( sp_ign_fix ); lemaxuid->setValidator( valid ); connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); @@ -168,7 +168,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) userbutton = new TQPushButton( hlpw ); userbutton->setAcceptDrops( true ); userbutton->installEventFilter( this ); // for drag and drop - uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48; + uint sz = tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48; userbutton->setFixedSize( sz, sz ); connect( userbutton, TQT_SIGNAL(clicked()), TQT_SLOT(slotUserButtonClicked()) ); @@ -183,8 +183,8 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) hlpl->addWidget( userlabel, 0, 0 ); // hlpl->addSpacing( KDialog::spacingHint() ); hlpl->addWidget( usercombo, 0, 1 ); - hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, AlignHCenter ); - hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, AlignHCenter ); + hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, Qt::AlignHCenter ); + hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, Qt::AlignHCenter ); TQHBoxLayout *main = new TQHBoxLayout( this, 10 ); @@ -263,7 +263,7 @@ void KDMUsersWidget::slotUserSelected() p.load( m_userPixDir + ".default.face.icon" ); rstuserbutton->setEnabled( false ); } - userbutton->setPixmap( p.smoothScale( 48, 48, TQImage::ScaleMin ) ); + userbutton->setPixmap( p.smoothScale( 48, 48, TQ_ScaleMin ) ); } @@ -286,7 +286,7 @@ void KDMUsersWidget::changeUserPix(const TQString &pix) return; } - p = p.smoothScale( 48, 48, TQImage::ScaleMin ); + p = p.smoothScale( 48, 48, TQ_ScaleMin ); TQString userpix = m_userPixDir + user + ".face.icon"; if (!p.save( userpix, "PNG" )) KMessageBox::sorry(this, @@ -346,7 +346,7 @@ void KDMUsersWidget::userButtonDropEvent(TQDropEvent *e) KURL *url = decodeImgDrop(e, this); if (url) { TQString pixpath; - KIO::NetAccess::download(*url, pixpath, parentWidget()); + KIO::NetAccess::download(*url, pixpath, tqparentWidget()); changeUserPix( pixpath ); KIO::NetAccess::removeTempFile(pixpath); delete url; @@ -381,7 +381,7 @@ void KDMUsersWidget::updateOptList( TQListViewItem *item, TQStringList &list ) if ( !item ) return; TQCheckListItem *itm = (TQCheckListItem *)item; - TQStringList::iterator it = list.find( itm->text() ); + TQStringList::iterator it = list.tqfind( itm->text() ); if (itm->isOn()) { if (it == list.end()) list.append( itm->text() ); @@ -415,9 +415,9 @@ void KDMUsersWidget::slotAddUsers(const TQMap<TQString,int> &users) for (it = users.begin(); it != users.end(); ++it) { const TQString *name = &it.key(); (new TQCheckListItem(optinlv, *name, TQCheckListItem::CheckBox))-> - setOn(selectedUsers.find(*name) != selectedUsers.end()); + setOn(selectedUsers.tqfind(*name) != selectedUsers.end()); (new TQCheckListItem(optoutlv, *name, TQCheckListItem::CheckBox))-> - setOn(hiddenUsers.find(*name) != hiddenUsers.end()); + setOn(hiddenUsers.tqfind(*name) != hiddenUsers.end()); if ((*name)[0] != '@') usercombo->insertItem(*name); } @@ -433,9 +433,9 @@ void KDMUsersWidget::slotDelUsers(const TQMap<TQString,int> &users) for (it = users.begin(); it != users.end(); ++it) { const TQString *name = &it.key(); if (usercombo->listBox()) - delete usercombo->listBox()->findItem( *name, ExactMatch | CaseSensitive ); - delete optinlv->findItem( *name, 0 ); - delete optoutlv->findItem( *name, 0 ); + delete usercombo->listBox()->tqfindItem( *name, ExactMatch | CaseSensitive ); + delete optinlv->tqfindItem( *name, 0 ); + delete optoutlv->tqfindItem( *name, 0 ); } } @@ -457,11 +457,11 @@ void KDMUsersWidget::load() cbusrsrt->setChecked(config->readBoolEntry("SortUsers", true)); TQString ps = config->readEntry( "FaceSource" ); - if (ps == TQString::fromLatin1("UserOnly")) + if (ps == TQString::tqfromLatin1("UserOnly")) rbusronly->setChecked(true); - else if (ps == TQString::fromLatin1("PreferUser")) + else if (ps == TQString::tqfromLatin1("PreferUser")) rbprefusr->setChecked(true); - else if (ps == TQString::fromLatin1("PreferAdmin")) + else if (ps == TQString::tqfromLatin1("PreferAdmin")) rbprefadm->setChecked(true); else rbadmonly->setChecked(true); diff --git a/kcontrol/kdm/kdm-users.h b/kcontrol/kdm/kdm-users.h index 129f5301d..574a9d1ed 100644 --- a/kcontrol/kdm/kdm-users.h +++ b/kcontrol/kdm/kdm-users.h @@ -37,7 +37,7 @@ #include <pwd.h> -class KDMUsersWidget : public QWidget +class KDMUsersWidget : public TQWidget { Q_OBJECT @@ -76,27 +76,27 @@ private: void userButtonDropEvent( TQDropEvent *e ); void changeUserPix( const TQString & ); - QGroupBox *minGroup; // top left - QLineEdit *leminuid, *lemaxuid; + TQGroupBox *minGroup; // top left + TQLineEdit *leminuid, *lemaxuid; - QButtonGroup *usrGroup; // right below - QCheckBox *cbshowlist, *cbcomplete, *cbinverted, *cbusrsrt; + TQButtonGroup *usrGroup; // right below + TQCheckBox *cbshowlist, *cbcomplete, *cbinverted, *cbusrsrt; - QLabel *s_label; // middle - QWidgetStack *wstack; + TQLabel *s_label; // middle + TQWidgetStack *wstack; KListView *optoutlv, *optinlv; - QButtonGroup *faceGroup; // right - QRadioButton *rbadmonly, *rbprefadm, *rbprefusr, *rbusronly; + TQButtonGroup *faceGroup; // right + TQRadioButton *rbadmonly, *rbprefadm, *rbprefusr, *rbusronly; KComboBox *usercombo; // right below - QPushButton *userbutton; - QPushButton *rstuserbutton; + TQPushButton *userbutton; + TQPushButton *rstuserbutton; - QString m_userPixDir; - QString m_defaultText; - QStringList hiddenUsers, selectedUsers; - QString defminuid, defmaxuid; + TQString m_userPixDir; + TQString m_defaultText; + TQStringList hiddenUsers, selectedUsers; + TQString defminuid, defmaxuid; bool m_notFirst; }; diff --git a/kcontrol/kdm/main.cpp b/kcontrol/kdm/main.cpp index ae99b51f5..103e60428 100644 --- a/kcontrol/kdm/main.cpp +++ b/kcontrol/kdm/main.cpp @@ -132,9 +132,9 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &) struct passwd *ps; for (setpwent(); (ps = getpwent()); ) { TQString un( TQFile::decodeName( ps->pw_name ) ); - if (usermap.find( un ) == usermap.end()) { + if (usermap.tqfind( un ) == usermap.end()) { usermap.insert( un, QPair<int,TQStringList>( ps->pw_uid, sl ) ); - if ((tgmapi = tgmap.find( ps->pw_gid )) != tgmap.end()) + if ((tgmapi = tgmap.tqfind( ps->pw_gid )) != tgmap.end()) (*tgmapi).append( un ); else tgmap[ps->pw_gid] = un; @@ -146,7 +146,7 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &) for (setgrent(); (grp = getgrent()); ) { TQString gn( TQFile::decodeName( grp->gr_name ) ); bool delme = false; - if ((tgmapi = tgmap.find( grp->gr_gid )) != tgmap.end()) { + if ((tgmapi = tgmap.tqfind( grp->gr_gid )) != tgmap.end()) { if ((*tgmapi).count() == 1 && (*tgmapi).first() == gn) delme = true; else @@ -160,8 +160,8 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &) continue; do { TQString un( TQFile::decodeName( *grp->gr_mem ) ); - if ((umapi = usermap.find( un )) != usermap.end()) { - if ((*umapi).second.find( gn ) == (*umapi).second.end()) + if ((umapi = usermap.tqfind( un )) != usermap.end()) { + if ((*umapi).second.tqfind( gn ) == (*umapi).second.end()) (*umapi).second.append( gn ); } else kdWarning() << "group '" << gn << "' contains unknown user '" << un << "'" << endl; @@ -173,7 +173,7 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &) kdWarning() << "user(s) '" << tgmapci.data().join(",") << "' have unknown GID " << tgmapci.key() << endl; - config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); + config = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); TQVBoxLayout *top = new TQVBoxLayout(this); tab = new TQTabWidget(this); @@ -281,7 +281,7 @@ void KDModule::propagateUsers() if (!uid || (uid >= minshowuid && uid <= maxshowuid)) { lusers[it.key()] = uid; for (jt = it.data().second.begin(); jt != it.data().second.end(); ++jt) - if ((gmapi = groupmap.find( *jt )) == groupmap.end()) { + if ((gmapi = groupmap.tqfind( *jt )) == groupmap.end()) { groupmap[*jt] = 1; lusers['@' + *jt] = -uid; } else @@ -307,7 +307,7 @@ void KDModule::slotMinMaxUID(int min, int max) dlusers[it.key()] = uid; for (jt = it.data().second.begin(); jt != it.data().second.end(); ++jt) { - gmapi = groupmap.find( *jt ); + gmapi = groupmap.tqfind( *jt ); if (!--(*gmapi)) { groupmap.remove( gmapi ); dlusers['@' + *jt] = -uid; @@ -319,7 +319,7 @@ void KDModule::slotMinMaxUID(int min, int max) alusers[it.key()] = uid; for (jt = it.data().second.begin(); jt != it.data().second.end(); ++jt) - if ((gmapi = groupmap.find( *jt )) == groupmap.end()) { + if ((gmapi = groupmap.tqfind( *jt )) == groupmap.end()) { groupmap[*jt] = 1; alusers['@' + *jt] = -uid; } else diff --git a/kcontrol/kdm/main.h b/kcontrol/kdm/main.h index 8bec1a715..90e88ceb9 100644 --- a/kcontrol/kdm/main.h +++ b/kcontrol/kdm/main.h @@ -61,7 +61,7 @@ signals: private: - QTabWidget *tab; + TQTabWidget *tab; KDMAppearanceWidget *appearance; KBackground *background; diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp index a38f46f29..fb0f06681 100644 --- a/kcontrol/keys/commandShortcuts.cpp +++ b/kcontrol/keys/commandShortcuts.cpp @@ -83,13 +83,13 @@ void CommandShortcutsModule::initGUI() label->setText(i18n("<qt>Below is a list of known commands which you may assign keyboard shortcuts to. " "To edit, add or remove entries from this list use the " "<a href=\"launchMenuEditor\">KDE menu editor</a>.</qt>")); - label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); + label->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); disconnect(label, TQT_SIGNAL(linkClicked(const TQString &)), label, TQT_SLOT(openLink(const TQString &))); connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor())); mainLayout->addWidget(label); m_tree = new AppTreeView(this, "appTreeView"); - m_tree->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + m_tree->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); mainLayout->setStretchFactor(m_tree, 10); mainLayout->addWidget(m_tree); TQWhatsThis::add(m_tree, @@ -131,7 +131,7 @@ void CommandShortcutsModule::initGUI() void CommandShortcutsModule::launchMenuEditor() { if ( KApplication::startServiceByDesktopName( "kmenuedit", - TQString::null /*url*/, + TQString() /*url*/, 0 /*error*/, 0 /*dcopservice*/, 0 /*pid*/, @@ -156,9 +156,9 @@ void CommandShortcutsModule::shortcutRadioToggled(bool remove) if (remove) { - m_shortcutButton->setShortcut(TQString::null, false); - item->setAccel(TQString::null); - if (m_changedItems.findRef(item) == -1) + m_shortcutButton->setShortcut(TQString(), false); + item->setAccel(TQString()); + if (m_changedItems.tqfindRef(item) == -1) { m_changedItems.append(item); } @@ -186,7 +186,7 @@ void CommandShortcutsModule::shortcutChanged(const KShortcut& shortcut) m_shortcutButton->setShortcut(accel, false); item->setAccel(accel); m_noneRadio->blockSignals(false); - if (m_changedItems.findRef(item) == -1) + if (m_changedItems.tqfindRef(item) == -1) { m_changedItems.append(item); } diff --git a/kcontrol/keys/commandShortcuts.h b/kcontrol/keys/commandShortcuts.h index d9194e0bc..3650b4e8c 100644 --- a/kcontrol/keys/commandShortcuts.h +++ b/kcontrol/keys/commandShortcuts.h @@ -35,7 +35,7 @@ class TQListViewItem; typedef TQPtrList<AppTreeItem> treeItemList; typedef TQPtrListIterator<AppTreeItem> treeItemListIterator; -class CommandShortcutsModule : public QWidget +class CommandShortcutsModule : public TQWidget { Q_OBJECT public: diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h index 144427d9c..e28846a3a 100644 --- a/kcontrol/keys/kaccelaction.h +++ b/kcontrol/keys/kaccelaction.h @@ -111,7 +111,7 @@ class KAccelAction bool setKeySequence( uint i, const KKeySequence& ); void clearShortcut(); - bool contains( const KKeySequence& ); + bool tqcontains( const KKeySequence& ); TQString toString() const; TQString toStringInternal() const; diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index 09726de63..0bd08b1fd 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -75,7 +75,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) for( uint i = 0; i < actions.size(); i++ ) { TQString sConfigKey = actions[i].m_sName; //kdDebug(125) << "sConfigKey: " << sConfigKey << endl; - int iLastSpace = sConfigKey.findRev( ' ' ); + int iLastSpace = sConfigKey.tqfindRev( ' ' ); bool bIsNum = false; if( iLastSpace >= 0 ) sConfigKey.mid( iLastSpace+1 ).toInt( &bIsNum ); @@ -83,7 +83,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) kdDebug(125) << "sConfigKey: " << sConfigKey << " bIsNum: " << bIsNum << " bSeriesOnly: " << bSeriesOnly << endl; - if( ((bSeriesOnly && !bIsNum) || (bSeriesNone && bIsNum)) && !sConfigKey.contains( ':' ) ) { + if( ((bSeriesOnly && !bIsNum) || (bSeriesNone && bIsNum)) && !sConfigKey.tqcontains( ':' ) ) { actions.removeAction( sConfigKey ); i--; } @@ -170,7 +170,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) topLayout->addRowSpacing(3, 15); topLayout->addMultiCellWidget(kc, 5, 5, 0, 1); - setMinimumSize(topLayout->sizeHint()); + setMinimumSize(topLayout->tqsizeHint()); } KKeyModule::~KKeyModule (){ @@ -318,7 +318,7 @@ void KKeyModule::readScheme( int index ) // parse the string for first white space - ind = sFile.find(" "); + ind = sFile.tqfind(" "); if (ind == -1) { ind = sFile.length(); break; @@ -332,7 +332,7 @@ void KKeyModule::readScheme( int index ) TQString s = sFile.mid( ind, 1 ); s = s.upper(); - sFile.replace( ind, 1, s ); + sFile.tqreplace( ind, 1, s ); } @@ -416,8 +416,8 @@ void KKeyModule::readScheme( int index ) // Set various appropriate for the scheme if ( indx < nSysSchemes || - (*sFileList->at(indx)).contains( "/global-" ) || - (*sFileList->at(indx)).contains( "/app-" ) ) { + (*sFileList->at(indx)).tqcontains( "/global-" ) || + (*sFileList->at(indx)).tqcontains( "/app-" ) ) { removeBt->setEnabled( FALSE ); } else { removeBt->setEnabled( TRUE ); diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h index c7291fa78..cecadf328 100644 --- a/kcontrol/keys/keyconfig.h +++ b/kcontrol/keys/keyconfig.h @@ -20,7 +20,7 @@ class TQCheckBox; class KeyChooserSpec; -class KKeyModule : public QWidget +class KKeyModule : public TQWidget { Q_OBJECT public: diff --git a/kcontrol/keys/modifiers.h b/kcontrol/keys/modifiers.h index f19dc8481..5cb57bfcb 100644 --- a/kcontrol/keys/modifiers.h +++ b/kcontrol/keys/modifiers.h @@ -8,7 +8,7 @@ class TQLabel; class KComboBox; class KListView; -class ModifiersModule : public QWidget +class ModifiersModule : public TQWidget { Q_OBJECT public: diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index 9f997b7e5..acd55e47f 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -145,7 +145,7 @@ void ShortcutsModule::initGUI() m_pcbSchemes = new KComboBox( this ); m_pcbSchemes->setMinimumWidth( 100 ); - m_pcbSchemes->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); + m_pcbSchemes->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) ); pHLayout->addWidget( m_pcbSchemes ); @@ -190,10 +190,10 @@ void ShortcutsModule::initGUI() m_pListGeneral = new KAccelShortcutList( m_actionsGeneral, true ); m_pkcGeneral = new KKeyChooser( m_pListGeneral, this, KKeyChooser::Global, false ); - m_pkcGeneral->resize (m_pkcGeneral->sizeHint() ); + m_pkcGeneral->resize (m_pkcGeneral->tqsizeHint() ); if (system("xmodmap 1> /dev/null 2> /dev/null") == 0) { m_useRmWinKeys = new TQCheckBox( i18n("Use Win key as modifier (uncheck to bind Win key to Menu)"), this ); - m_useRmWinKeys->resize( m_useRmWinKeys->sizeHint() ); + m_useRmWinKeys->resize( m_useRmWinKeys->tqsizeHint() ); m_useRmWinKeys->setChecked( m_bUseRmWinKeys ); pVLayout->addWidget( m_useRmWinKeys, 1, 0 ); connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) ); @@ -227,14 +227,14 @@ void ShortcutsModule::createActionsGeneral() for( uint i = 0; i < actions.count(); i++ ) { TQString sConfigKey = actions[i].name(); //kdDebug(125) << "sConfigKey: " << sConfigKey << endl; - int iLastSpace = sConfigKey.findRev( ' ' ); + int iLastSpace = sConfigKey.tqfindRev( ' ' ); bool bIsNum = false; if( iLastSpace >= 0 ) sConfigKey.mid( iLastSpace+1 ).toInt( &bIsNum ); //kdDebug(125) << "sConfigKey: " << sConfigKey // << " bIsNum: " << bIsNum << endl; - if( bIsNum && !sConfigKey.contains( ':' ) ) { + if( bIsNum && !sConfigKey.tqcontains( ':' ) ) { actions[i].setConfigurable( false ); actions[i].setName( TQString::null ); } @@ -248,14 +248,14 @@ void ShortcutsModule::createActionsSequence() for( uint i = 0; i < actions.count(); i++ ) { TQString sConfigKey = actions[i].name(); //kdDebug(125) << "sConfigKey: " << sConfigKey << endl; - int iLastSpace = sConfigKey.findRev( ' ' ); + int iLastSpace = sConfigKey.tqfindRev( ' ' ); bool bIsNum = false; if( iLastSpace >= 0 ) sConfigKey.mid( iLastSpace+1 ).toInt( &bIsNum ); //kdDebug(125) << "sConfigKey: " << sConfigKey // << " bIsNum: " << bIsNum << endl; - if( !bIsNum && !sConfigKey.contains( ':' ) ) { + if( !bIsNum && !sConfigKey.tqcontains( ':' ) ) { actions[i].setConfigurable( false ); actions[i].setName( TQString::null ); } @@ -372,7 +372,7 @@ void ShortcutsModule::slotSaveSchemeAs() int ind = 0; while( ind < (int) sFile.length() ) { // parse the string for first white space - ind = sFile.find(" "); + ind = sFile.tqfind(" "); if( ind == -1 ) { ind = sFile.length(); break; @@ -384,7 +384,7 @@ void ShortcutsModule::slotSaveSchemeAs() // Make the next letter upper case TQString s = sFile.mid( ind, 1 ); s = s.upper(); - sFile.replace( ind, 1, s ); + sFile.tqreplace( ind, 1, s ); } iScheme = -1; diff --git a/kcontrol/keys/shortcuts.h b/kcontrol/keys/shortcuts.h index d45034c9d..0fa8818a8 100644 --- a/kcontrol/keys/shortcuts.h +++ b/kcontrol/keys/shortcuts.h @@ -33,7 +33,7 @@ #include <kcombobox.h> #include <kkeydialog.h> -class ShortcutsModule : public QWidget +class ShortcutsModule : public TQWidget { Q_OBJECT public: diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp index 58de8a1f5..4d41b91c2 100644 --- a/kcontrol/keys/treeview.cpp +++ b/kcontrol/keys/treeview.cpp @@ -55,7 +55,7 @@ void AppTreeItem::setName(const TQString &name) void AppTreeItem::setAccel(const TQString &accel) { m_accel = accel; - int temp = accel.find(';'); + int temp = accel.tqfind(';'); if (temp != -1) { setText(1, accel.left(temp)); @@ -157,7 +157,7 @@ void AppTreeView::fillBranch(const TQString& rPath, AppTreeItem *parent) // Item names may contain ampersands. To avoid them being converted // to accelerators, replace them with two ampersands. - groupCaption.replace("&", "&&"); + groupCaption.tqreplace("&", "&&"); AppTreeItem *item; if (parent == 0) @@ -178,7 +178,7 @@ void AppTreeView::fillBranch(const TQString& rPath, AppTreeItem *parent) // Item names may contain ampersands. To avoid them being converted // to accelerators, replace them with two ampersands. - serviceCaption.replace("&", "&&"); + serviceCaption.tqreplace("&", "&&"); AppTreeItem* item; if (parent == 0) @@ -209,7 +209,7 @@ TQStringList AppTreeView::fileList(const TQString& rPath) TQString relativePath = rPath; // truncate "/.directory" - int pos = relativePath.findRev("/.directory"); + int pos = relativePath.tqfindRev("/.directory"); if (pos > 0) relativePath.truncate(pos); TQStringList filelist; @@ -228,7 +228,7 @@ TQStringList AppTreeView::fileList(const TQString& rPath) TQStringList files = dir.entryList(); for (TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) { // does not work?! - //if (filelist.contains(*it)) continue; + //if (filelist.tqcontains(*it)) continue; if (relativePath.isEmpty()) { filelist.remove(*it); // hack @@ -248,7 +248,7 @@ TQStringList AppTreeView::dirList(const TQString& rPath) TQString relativePath = rPath; // truncate "/.directory" - int pos = relativePath.findRev("/.directory"); + int pos = relativePath.tqfindRev("/.directory"); if (pos > 0) relativePath.truncate(pos); TQStringList dirlist; @@ -266,7 +266,7 @@ TQStringList AppTreeView::dirList(const TQString& rPath) for (TQStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it) { if ((*it) == "." || (*it) == "..") continue; // does not work?! - // if (dirlist.contains(*it)) continue; + // if (dirlist.tqcontains(*it)) continue; if (relativePath.isEmpty()) { dirlist.remove(*it); //hack diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index c525cd337..044b2a38d 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -112,8 +112,8 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) { itsSplitter=new TQSplitter(this); fontsFrame=new TQFrame(itsSplitter), - itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart"); - itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(itsSplitter), "kcmfontinst", "KParts::ReadOnlyPart"); + itsSplitter->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES)); @@ -129,7 +129,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) { #endif fontsFrame=new TQFrame(this); - fontsFrame->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + fontsFrame->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); #ifdef HAVE_XFT } #endif @@ -140,7 +140,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) bool showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false)); fontsFrame->setLineWidth(0); - toolbar->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); + toolbar->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); toolbar->setMovingEnabled(false); TQString previousPath=itsConfig.readEntry(CFG_PATH); @@ -151,14 +151,14 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsDirOp->setMinimumSize(TQSize(96, 64)); setMimeTypes(showBitmap); itsDirOp->dirLister()->setMainWindow(this); - itsDirOp->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + itsDirOp->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1); KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts())); - button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + button->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); fontsLayout->addWidget(button, 1, 0); - fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + TQT_TQLAYOUT(fontsLayout)->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); layout->addWidget(toolbar); #ifdef HAVE_XFT @@ -210,14 +210,14 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsListAct->plug(toolbar); } - itsShowBitmapAct=new KToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, this, TQT_SLOT(filterFonts()), + itsShowBitmapAct=new KToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()), itsDirOp->actionCollection(), "showbitmap"); itsShowBitmapAct->setChecked(showBitmap); itsShowBitmapAct->plug(toolbar); toolbar->insertLineSeparator(); - act=new KAction(i18n("Add Fonts..."), "newfont", 0, this, TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); + act=new KAction(i18n("Add Fonts..."), "newfont", 0, TQT_TQOBJECT(this), TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); act->plug(toolbar); topMnu->insert(act); @@ -231,11 +231,11 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) } toolbar->insertLineSeparator(); - act=new KAction(i18n("Configure..."), "configure", 0, this, TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure"); + act=new KAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure"); act->plug(toolbar); #ifdef HAVE_XFT toolbar->insertLineSeparator(); - act=new KAction(i18n("Print..."), "fileprint", 0, this, TQT_SLOT(print()), itsDirOp->actionCollection(), "print"); + act=new KAction(i18n("Print..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print"); act->plug(toolbar); #endif @@ -390,7 +390,7 @@ void CKCmFontInst::fileHighlighted(const KFileItem *item) ? list->getFirst() : NULL; - if(previewItem && list && list->contains(previewItem)) // OK, check its been selected - not deselected!!! + if(previewItem && list && list->tqcontains(previewItem)) // OK, check its been selected - not deselected!!! itsPreview->openURL(previewItem->url()); } #endif @@ -550,7 +550,7 @@ void CKCmFontInst::infoMessage(const TQString &msg) static TQString family(const TQString &name) { - int commaPos=name.find(','); + int commaPos=name.tqfind(','); return -1==commaPos ? name : name.left(commaPos); } @@ -570,7 +570,7 @@ void CKCmFontInst::updateInformation(int, int fonts) TQString fam(family(item->text())); size+=item->size(); - if(-1==families.findIndex(fam)) + if(-1==families.tqfindIndex(fam)) families+=fam; } } diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h index b4766c5c4..b1bb35e88 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h @@ -88,7 +88,7 @@ class CFontListViewItem : public KListViewItem TQRect rect() const { - TQRect r = listView()->itemRect(this); + TQRect r = listView()->tqitemRect(this); return TQRect(listView()->viewportToContents(r.topLeft()), TQSize(r.width(), r.height())); } diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp index 112e3562b..430e9c8b8 100644 --- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp +++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp @@ -44,35 +44,35 @@ static int strToWeight(const TQString &str) { if(NULL==str) return FC_WEIGHT_MEDIUM; - else if(str.contains("Bold", false)) + else if(str.tqcontains("Bold", false)) return FC_WEIGHT_BOLD; - else if(str.contains("Heavy", false)) + else if(str.tqcontains("Heavy", false)) return FC_WEIGHT_HEAVY; - else if(str.contains("Black", false)) + else if(str.tqcontains("Black", false)) return FC_WEIGHT_BLACK; - else if(str.contains("ExtraBold", false)) + else if(str.tqcontains("ExtraBold", false)) return FC_WEIGHT_EXTRABOLD; - else if(str.contains("UltraBold", false)) + else if(str.tqcontains("UltraBold", false)) return FC_WEIGHT_ULTRABOLD; - else if(str.contains("ExtraLight", false)) + else if(str.tqcontains("ExtraLight", false)) return FC_WEIGHT_EXTRALIGHT; - else if(str.contains("UltraLight", false)) + else if(str.tqcontains("UltraLight", false)) return FC_WEIGHT_ULTRALIGHT; - else if(str.contains("Light", false)) + else if(str.tqcontains("Light", false)) return FC_WEIGHT_LIGHT; - else if(str.contains("Medium", false) || str.contains("Normal", false) || str.contains("Roman", false)) + else if(str.tqcontains("Medium", false) || str.tqcontains("Normal", false) || str.tqcontains("Roman", false)) return FC_WEIGHT_MEDIUM; - else if(str.contains("Regular", false)) + else if(str.tqcontains("Regular", false)) return FC_WEIGHT_REGULAR; - else if(str.contains("SemiBold", false)) + else if(str.tqcontains("SemiBold", false)) return FC_WEIGHT_SEMIBOLD; - else if(str.contains("DemiBold", false)) + else if(str.tqcontains("DemiBold", false)) return FC_WEIGHT_DEMIBOLD; - else if(str.contains("Thin", false)) + else if(str.tqcontains("Thin", false)) return FC_WEIGHT_THIN; - else if(str.contains("Book", false)) + else if(str.tqcontains("Book", false)) return FC_WEIGHT_NORMAL; - else if(str.contains("Demi", false)) + else if(str.tqcontains("Demi", false)) return FC_WEIGHT_NORMAL; else return FC_WEIGHT_MEDIUM; @@ -83,21 +83,21 @@ static int strToWidth(const TQString &str) { if(str.isEmpty()) return FC_WIDTH_NORMAL; - else if(str.contains("UltraCondensed", false)) + else if(str.tqcontains("UltraCondensed", false)) return FC_WIDTH_ULTRACONDENSED; - else if(str.contains("ExtraCondensed", false)) + else if(str.tqcontains("ExtraCondensed", false)) return FC_WIDTH_EXTRACONDENSED; - else if(str.contains("SemiCondensed", false)) + else if(str.tqcontains("SemiCondensed", false)) return FC_WIDTH_SEMICONDENSED; - else if(str.contains("Condensed", false)) + else if(str.tqcontains("Condensed", false)) return FC_WIDTH_CONDENSED; - else if(str.contains("SemiExpanded", false)) + else if(str.tqcontains("SemiExpanded", false)) return FC_WIDTH_SEMIEXPANDED; - else if(str.contains("UltraExpanded", false)) + else if(str.tqcontains("UltraExpanded", false)) return FC_WIDTH_ULTRAEXPANDED; - else if(str.contains("ExtraExpanded", false)) + else if(str.tqcontains("ExtraExpanded", false)) return FC_WIDTH_EXTRAEXPANDED; - else if(str.contains("Expanded", false)) + else if(str.tqcontains("Expanded", false)) return FC_WIDTH_EXPANDED; else return FC_WIDTH_NORMAL; @@ -201,7 +201,7 @@ static bool readAfm(const TQString &file, TQString &full, TQString &family, TQSt if(inMetrics) { - if(0==line.find("FullName ")) + if(0==line.tqfind("FullName ")) { full=line.mid(9); #ifndef KFI_FC_NO_WIDTHS @@ -209,24 +209,24 @@ static bool readAfm(const TQString &file, TQString &full, TQString &family, TQSt #endif foundName=true; } - else if(0==line.find("FamilyName ")) + else if(0==line.tqfind("FamilyName ")) { family=line.mid(11); foundFamily=true; } - else if(0==line.find("Weight ")) + else if(0==line.tqfind("Weight ")) intWeight=strToWeight(line.mid(7)); - else if(0==line.find("ItalicAngle ")) + else if(0==line.tqfind("ItalicAngle ")) intSlant=0.0f==line.mid(12).toFloat() ? FC_SLANT_ROMAN : FC_SLANT_ITALIC; - else if(0==line.find("IsFixedPitch ")) - intSpacing=0==line.mid(13).find("false", 0, false) ? FC_PROPORTIONAL : FC_MONO; - else if(0==line.find("Notice ")) + else if(0==line.tqfind("IsFixedPitch ")) + intSpacing=0==line.mid(13).tqfind("false", 0, false) ? FC_PROPORTIONAL : FC_MONO; + else if(0==line.tqfind("Notice ")) foundry=getFoundry(line.mid(7).latin1()); - else if(0==line.find("StartCharMetrics")) + else if(0==line.tqfind("StartCharMetrics")) break; } else - if(0==line.find("StartFontMetrics")) + if(0==line.tqfind("StartFontMetrics")) inMetrics=true; }; f.close(); @@ -237,7 +237,7 @@ static bool readAfm(const TQString &file, TQString &full, TQString &family, TQSt foundFamily=true; } - if(foundName && FC_SLANT_ITALIC==intItalic && (-1!=full.find("Oblique") || -1!=full.find("Slanted"))) + if(foundName && FC_SLANT_ITALIC==intItalic && (-1!=full.tqfind("Oblique") || -1!=full.tqfind("Slanted"))) intItalic=FC_SLANT_OBLIQUE; } @@ -372,7 +372,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what) const FoundryMap *entry; for(entry=map; NULL!=entry->foundry; entry++) - if(foundryAll.length()==entry->len && foundryAll.contains(entry->foundry, false)) + if(foundryAll.length()==entry->len && foundryAll.tqcontains(entry->foundry, false)) { foundryAll=entry->foundry; break; diff --git a/kcontrol/kfontinst/kfontinst/FontEngine.cpp b/kcontrol/kfontinst/kfontinst/FontEngine.cpp index 4fe823c23..7f14d556f 100644 --- a/kcontrol/kfontinst/kfontinst/FontEngine.cpp +++ b/kcontrol/kfontinst/kfontinst/FontEngine.cpp @@ -157,13 +157,13 @@ CFontEngine::EWeight CFontEngine::strToWeight(const char *str) static void removeSymbols(TQString &str) { - str.replace(TQRegExp("[\\-\\[\\]()]"), " "); + str.tqreplace(TQRegExp("[\\-\\[\\]()]"), " "); int len=str.length(); TQChar space(' '); for(int c=0; c<len; ++c) - if(str[c].unicode()<0x20 || str[c].unicode()>0x7E) + if(str[c].tqunicode()<0x20 || str[c].tqunicode()>0x7E) str[c]=space; str=str.simplifyWhiteSpace(); diff --git a/kcontrol/kfontinst/kfontinst/Fontmap.cpp b/kcontrol/kfontinst/kfontinst/Fontmap.cpp index 476b422bd..c8e63c403 100644 --- a/kcontrol/kfontinst/kfontinst/Fontmap.cpp +++ b/kcontrol/kfontinst/kfontinst/Fontmap.cpp @@ -113,7 +113,7 @@ static TQString createX11PsName(const TQString &font) unsigned int ch; bool newWord=true; - newName.replace(TQRegExp("\\-"), "_"); + newName.tqreplace(TQRegExp("\\-"), "_"); for(ch=0; ch<newName.length(); ++ch) { @@ -136,7 +136,7 @@ static TQString createX11PsName(const TQString &font) } } - newName.replace(" ", TQString::null); + newName.tqreplace(" ", TQString()); return newName; } @@ -180,7 +180,7 @@ static TQString getEntry(TQStringList &list, const TQString &name) end(list.end()); for( ; it!=end; ++it) - if(0==(*it).find('/'+name+' ')) + if(0==(*it).tqfind('/'+name+' ')) return *it; return TQString::null; @@ -188,7 +188,7 @@ static TQString getEntry(TQStringList &list, const TQString &name) inline bool isAlias(const TQString &entry) { - return -1==entry.findRev(TQRegExp(")\\s*;\\s*$")); + return -1==entry.tqfindRev(TQRegExp(")\\s*;\\s*$")); } static void addEntry(TQStringList &list, const TQString &name, const TQString &file, const TQString &fmapDir) @@ -209,7 +209,7 @@ static void addEntry(TQStringList &list, const TQString &name, const TQString &f str << '/' << name << " ("; - if(0==file.find(fmapDir)) + if(0==file.tqfind(fmapDir)) str << file.mid(fmapDir.length()); else str << file; @@ -244,11 +244,11 @@ static TQString locateFile(const char *dir, const char *file, int level=0) if(d.isReadable()) { - const QFileInfoList *fList=d.entryInfoList(); + const TQFileInfoList *fList=d.entryInfoList(); if(fList) { - QFileInfoListIterator it(*fList); + TQFileInfoListIterator it(*fList); TQFileInfo *fInfo; TQString str; @@ -266,7 +266,7 @@ static TQString locateFile(const char *dir, const char *file, int level=0) } } - return TQString::null; + return TQString(); } static TQString locateFile(const char *file, const char **dirs) @@ -309,7 +309,7 @@ bool create(const TQString &dir, CFontEngine &fe) TQString fName(Misc::fileSyntax(CFcEngine::getFcString(fs->fonts[i], FC_FILE))); FcBool scalable=FcFalse; - if(!fName.isEmpty() && (root || dir.isEmpty() || 0==fName.find(dir)) && + if(!fName.isEmpty() && (root || dir.isEmpty() || 0==fName.tqfind(dir)) && FcResultMatch==FcPatternGetBool(fs->fonts[i], FC_SCALABLE, 0, &scalable) && scalable) { const TQStringList *existing=old.getEntries(fName); @@ -552,7 +552,7 @@ CFile::CFile(const TQString &dir) const TQStringList * CFile::getEntries(const TQString &fname) { - TEntry *entry=findEntry(0==fname.find(itsDir) ? fname.mid(itsDir.length()) : fname, false); + TEntry *entry=findEntry(0==fname.tqfind(itsDir) ? fname.mid(itsDir.length()) : fname, false); return entry ? &entry->entries : NULL; } diff --git a/kcontrol/kfontinst/kfontinst/Main.cpp b/kcontrol/kfontinst/kfontinst/Main.cpp index a2aa5766b..f0e6d3152 100644 --- a/kcontrol/kfontinst/kfontinst/Main.cpp +++ b/kcontrol/kfontinst/kfontinst/Main.cpp @@ -269,7 +269,7 @@ int main(int argc, char *argv[]) if(folderRequired && !KFI::Misc::dExists(folder)) { - std::cerr << "ERROR: " << TQFile::encodeName(folder) << " does not exist!" << std::endl; + std::cerr << "ERROR: " << static_cast<const char *>(TQFile::encodeName(folder)) << " does not exist!" << std::endl; rv=-2; } else @@ -285,7 +285,7 @@ int main(int argc, char *argv[]) bool found=false; while((dir=FcStrListNext(list))) - if(0==KFI::Misc::dirSyntax((const char *)dir).find(folder)) + if(0==KFI::Misc::dirSyntax((const char *)dir).tqfind(folder)) found=true; if(!found) diff --git a/kcontrol/kfontinst/kfontinst/XConfig.cpp b/kcontrol/kfontinst/kfontinst/XConfig.cpp index 112ab3d3c..36bd153df 100644 --- a/kcontrol/kfontinst/kfontinst/XConfig.cpp +++ b/kcontrol/kfontinst/kfontinst/XConfig.cpp @@ -748,9 +748,9 @@ CXConfig::TPath::EType CXConfig::TPath::getType(const TQString &d) { TQString str(d); - str.replace(TQRegExp("\\s*"), ""); + str.tqreplace(TQRegExp("\\s*"), ""); - return 0==str.find("unix/:") + return 0==str.tqfind("unix/:") ? FONT_SERVER : "fontconfig"==str ? FONT_CONFIG diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp index ee1d2dc3c..cefa5188d 100644 --- a/kcontrol/kfontinst/kio/KioFonts.cpp +++ b/kcontrol/kfontinst/kio/KioFonts.cpp @@ -136,7 +136,7 @@ static TQString removeMultipleExtension(const KURL &url) TQString fname(url.fileName()); int pos; - if(-1!=(pos=fname.findRev(TQString::fromLatin1(constMultipleExtension)))) + if(-1!=(pos=fname.tqfindRev(TQString::tqfromLatin1(constMultipleExtension)))) fname=fname.left(pos); return fname; @@ -147,7 +147,7 @@ static TQString modifyName(const TQString &fname) static const char constSymbols[]={ '-', ' ', ':', 0 }; TQString rv(fname); - int dotPos=rv.findRev('.'); + int dotPos=rv.tqfindRev('.'); if(-1!=dotPos) { @@ -158,7 +158,7 @@ static TQString modifyName(const TQString &fname) } for(int s=0; constSymbols[s]; ++s) - rv=rv.replace(constSymbols[s], '_'); + rv=rv.tqreplace(constSymbols[s], '_'); return rv; } @@ -292,7 +292,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con ? KFI_KIO_FONTS_PROTOCOL"/system-folder" : KFI_KIO_FONTS_PROTOCOL"/folder"); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); - TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/")); + TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/")); return true; } else if (sys && !Misc::root()) // Default system fonts folder does not actually exist yet! @@ -393,15 +393,15 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name()); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); - TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/")); + TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/")); if(!Misc::root()) { url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER); - url+=TQString::fromLatin1("/"); + url+=TQString::tqfromLatin1("/"); } if(multiple) - url+=name+TQString::fromLatin1(constMultipleExtension); + url+=name+TQString::tqfromLatin1(constMultipleExtension); else url+=Misc::getFile(path); addAtom(entry, KIO::UDS_URL, 0, url); @@ -427,7 +427,7 @@ static KURL getRedirect(const KURL &u) sect(CKioFonts::getSect(path)); path.remove(sect); - path.replace("//", "/"); + path.tqreplace("//", "/"); redirect.setPath(path); KFI_DBUG << "Redirect from " << u.path() << " to " << redirect.path() << endl; @@ -441,7 +441,7 @@ static bool nonRootSys(const KURL &u) static TQString getFontFolder(const TQString &defaultDir, const TQString &root, TQStringList &dirs) { - if(dirs.contains(defaultDir)) + if(dirs.tqcontains(defaultDir)) return defaultDir; else { @@ -450,7 +450,7 @@ static TQString getFontFolder(const TQString &defaultDir, const TQString &root, bool found=false; for(it=dirs.begin(); it!=end && !found; ++it) - if(0==(*it).find(root)) + if(0==(*it).tqfind(root)) return *it; } @@ -494,7 +494,7 @@ static bool isAAfm(const TQString &fname) { line=stream.readLine(); - if(line.contains("StartFontMetrics")) + if(line.tqcontains("StartFontMetrics")) { file.close(); return true; @@ -646,11 +646,11 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma { TQString name(Misc::getFile(*it)), path(Misc::getDir(*it)); - TQValueList<FontList>::Iterator entry=list.find(FontList(name)); + TQValueList<FontList>::Iterator entry=list.tqfind(FontList(name)); if(entry!=list.end()) { - if(!(*entry).paths.contains(path)) + if(!(*entry).paths.tqcontains(path)) (*entry).paths.append(path); } else @@ -682,17 +682,17 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma for(; pIt!=pEnd; ++pIt) { - unsigned int len=QMIN((*pIt).orig.length(), beginLen); + unsigned int len=TQMIN((*pIt).orig.length(), beginLen); for(unsigned int i=0; i<len; ++i) if((*pIt).orig[i]!=(*pBegin).orig[i]) { (*pIt).modified=(*pIt).orig.mid(i); - (*pIt).modified=(*pIt).modified.replace('/', '_'); + (*pIt).modified=(*pIt).modified.tqreplace('/', '_'); if((*pBegin).modified.isEmpty()) { (*pBegin).modified=(*pBegin).orig.mid(i); - (*pBegin).modified=(*pBegin).modified.replace('/', '_'); + (*pBegin).modified=(*pBegin).modified.tqreplace('/', '_'); } break; } @@ -806,9 +806,9 @@ CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app) { TQString str(paths[path]); - str.replace(TQRegExp("\\s*"), ""); + str.tqreplace(TQRegExp("\\s*"), ""); - if(0==str.find("unix/:")) + if(0==str.tqfind("unix/:")) itsUsingXfsFpe=true; else if("fontconfig"==str) itsUsingFcFpe=true; @@ -1185,7 +1185,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo if (markPartial) { - TQString destPart(destOrig+TQString::fromLatin1(".part")); + TQString destPart(destOrig+TQString::tqfromLatin1(".part")); TQCString destPartC(TQFile::encodeName(destPart)); dest = destPart; @@ -1751,9 +1751,9 @@ void CKioFonts::special(const TQByteArray &a) finished(); break; case SPECIAL_RECONFIG: // Only itended to be called from kcmfontinst - when a user has re-enabled doX or doGs - if(itsRoot && !itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location)) + if(itsRoot && !itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location)) itsFolders[FOLDER_SYS].modified.add(itsFolders[FOLDER_SYS].location); - else if(!itsRoot && !itsFolders[FOLDER_USER].modified.contains(itsFolders[FOLDER_USER].location)) + else if(!itsRoot && !itsFolders[FOLDER_USER].modified.tqcontains(itsFolders[FOLDER_USER].location)) itsFolders[FOLDER_USER].modified.add(itsFolders[FOLDER_USER].location); doModified(); @@ -1831,7 +1831,7 @@ void CKioFonts::doModified() // // If a non-default folder has been modified, always configure X if(NULL==strchr(itsKfiParams, 'x') && - (itsFolders[FOLDER_SYS].modified.count()>1 || !itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location))) + (itsFolders[FOLDER_SYS].modified.count()>1 || !itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location))) { if(0==itsKfiParams[0]) strcpy(itsKfiParams, "-x"); @@ -1850,7 +1850,7 @@ void CKioFonts::doModified() KFI_DBUG << "RUN(root): kfontinst " << itsKfiParams << ' ' << *it << endl; } - if(itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location)) + if(itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location)) { itsHasSys=true; itsAddToSysFc=false; @@ -1862,7 +1862,7 @@ void CKioFonts::doModified() TQCString cmd; createRootRefreshCmd(cmd, itsFolders[FOLDER_SYS].modified, false); - if(doRootCmd(cmd, false) && itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location)) + if(doRootCmd(cmd, false) && itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location)) { itsHasSys=true; itsAddToSysFc=false; @@ -2039,7 +2039,7 @@ bool CKioFonts::updateFontList() if(!file.isEmpty()) { - if(!itsRoot && 0==file.find(home)) + if(!itsRoot && 0==file.tqfind(home)) folder=FOLDER_USER; TQValueList<FcPattern *> &patterns= @@ -2079,14 +2079,14 @@ CKioFonts::EFolder CKioFonts::getFolder(const KURL &url) TQMap<TQString, TQValueList<FcPattern *> >::Iterator CKioFonts::getMap(const KURL &url) { EFolder folder(getFolder(url)); - TQMap<TQString, TQValueList<FcPattern *> >::Iterator it=itsFolders[folder].fontMap.find(removeMultipleExtension(url)); + TQMap<TQString, TQValueList<FcPattern *> >::Iterator it=itsFolders[folder].fontMap.tqfind(removeMultipleExtension(url)); if(it==itsFolders[folder].fontMap.end()) // Perhaps it was fonts:/System/times.ttf ??? { FcPattern *pat=getEntry(folder, url.fileName(), false); if(pat) - it=itsFolders[folder].fontMap.find(CFcEngine::createName(pat)); + it=itsFolders[folder].fontMap.tqfind(CFcEngine::createName(pat)); } return it; @@ -2180,7 +2180,7 @@ bool CKioFonts::getSourceFiles(const KURL &src, TQStringList &files) uEnd=urls.end(); for(uIt=urls.begin(); uIt!=uEnd; ++uIt) - if(-1==files.findIndex((*uIt).path())) + if(-1==files.tqfindIndex((*uIt).path())) files.append((*uIt).path()); } } @@ -2290,7 +2290,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFol { TQString name(CFcEngine::createName(pat)); - if(-1==fonts.findIndex(name)) + if(-1==fonts.tqfindIndex(name)) fonts.append(name); } } @@ -2356,7 +2356,7 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk) if(itsRoot) { if((isSysFolder(sect) || isUserFolder(sect)) && - (itsFolders[FOLDER_SYS].fontMap.end()==itsFolders[FOLDER_SYS].fontMap.find(sect))) + (itsFolders[FOLDER_SYS].fontMap.end()==itsFolders[FOLDER_SYS].fontMap.tqfind(sect))) //CPD: TODO: || it has a font specified! e.g. fonts:/System/Times -> even in have a fonts:/System font, redirect //should still happen { @@ -2385,8 +2385,8 @@ bool CKioFonts::checkAllowed(const KURL &u) if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) || ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) || - ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) || - ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/'))) + ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) || + ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/'))) { error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".") .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \ diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h index 57dc8516a..32d5a384e 100644 --- a/kcontrol/kfontinst/kio/KioFonts.h +++ b/kcontrol/kfontinst/kio/KioFonts.h @@ -75,14 +75,14 @@ class CKioFonts : public KIO::SlaveBase OP_DELETE }; - class CDirList : public QStringList + class CDirList : public TQStringList { public: CDirList() { } CDirList(const TQString &str) : TQStringList(str) { } - void add(const TQString &d) { if (!contains(d)) append(d); } + void add(const TQString &d) { if ( tqcontains(d)) append(d); } }; struct TFolder diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp index 44d180fd2..ec4f833a3 100644 --- a/kcontrol/kfontinst/lib/FcEngine.cpp +++ b/kcontrol/kfontinst/lib/FcEngine.cpp @@ -185,72 +185,72 @@ static int fcSpacing(int spacing) static int strToWeight(const TQString &str, TQString &newStr) { - if(0==str.find(i18n(KFI_WEIGHT_THIN), 0, false)) + if(0==str.tqfind(i18n(KFI_WEIGHT_THIN), 0, false)) { newStr=str.mid(i18n(KFI_WEIGHT_THIN).length()); return FC_WEIGHT_THIN; } - if(0==str.find(i18n(KFI_WEIGHT_EXTRALIGHT), 0, false)) + if(0==str.tqfind(i18n(KFI_WEIGHT_EXTRALIGHT), 0, false)) { newStr=str.mid(i18n(KFI_WEIGHT_EXTRALIGHT).length()); return FC_WEIGHT_EXTRALIGHT; } - if(0==str.find(i18n(KFI_WEIGHT_ULTRALIGHT), 0, false)) + if(0==str.tqfind(i18n(KFI_WEIGHT_ULTRALIGHT), 0, false)) { newStr=str.mid(i18n(KFI_WEIGHT_ULTRALIGHT).length()); return FC_WEIGHT_ULTRALIGHT; } - if(0==str.find(i18n(KFI_WEIGHT_LIGHT), 0, false)) + if(0==str.tqfind(i18n(KFI_WEIGHT_LIGHT), 0, false)) { newStr=str.mid(i18n(KFI_WEIGHT_LIGHT).length()); return FC_WEIGHT_LIGHT; } - if(0==str.find(i18n(KFI_WEIGHT_REGULAR), 0, false)) + if(0==str.tqfind(i18n(KFI_WEIGHT_REGULAR), 0, false)) { newStr=str.mid(i18n(KFI_WEIGHT_REGULAR).length()); return FC_WEIGHT_REGULAR; } - if(0==str.find(i18n(KFI_WEIGHT_NORMAL), 0, false)) + if(0==str.tqfind(i18n(KFI_WEIGHT_NORMAL), 0, false)) { newStr=str.mid(i18n(KFI_WEIGHT_NORMAL).length()); return FC_WEIGHT_NORMAL; } - if(0==str.find(i18n(KFI_WEIGHT_MEDIUM), 0, false)) + if(0==str.tqfind(i18n(KFI_WEIGHT_MEDIUM), 0, false)) { newStr=str.mid(i18n(KFI_WEIGHT_MEDIUM).length()); return FC_WEIGHT_MEDIUM; } - if(0==str.find(i18n(KFI_WEIGHT_DEMIBOLD), 0, false)) + if(0==str.tqfind(i18n(KFI_WEIGHT_DEMIBOLD), 0, false)) { newStr=str.mid(i18n(KFI_WEIGHT_DEMIBOLD).length()); return FC_WEIGHT_SEMIBOLD; } - if(0==str.find(i18n(KFI_WEIGHT_SEMIBOLD), 0, false)) + if(0==str.tqfind(i18n(KFI_WEIGHT_SEMIBOLD), 0, false)) { newStr=str.mid(i18n(KFI_WEIGHT_SEMIBOLD).length()); return FC_WEIGHT_SEMIBOLD; } - if(0==str.find(i18n(KFI_WEIGHT_BOLD), 0, false)) + if(0==str.tqfind(i18n(KFI_WEIGHT_BOLD), 0, false)) { newStr=str.mid(i18n(KFI_WEIGHT_BOLD).length()); return FC_WEIGHT_BOLD; } - if(0==str.find(i18n(KFI_WEIGHT_EXTRABOLD), 0, false)) + if(0==str.tqfind(i18n(KFI_WEIGHT_EXTRABOLD), 0, false)) { newStr=str.mid(i18n(KFI_WEIGHT_EXTRABOLD).length()); return FC_WEIGHT_EXTRABOLD; } - if(0==str.find(i18n(KFI_WEIGHT_ULTRABOLD), 0, false)) + if(0==str.tqfind(i18n(KFI_WEIGHT_ULTRABOLD), 0, false)) { newStr=str.mid(i18n(KFI_WEIGHT_ULTRABOLD).length()); return FC_WEIGHT_ULTRABOLD; } - if(0==str.find(i18n(KFI_WEIGHT_BLACK), 0, false)) + if(0==str.tqfind(i18n(KFI_WEIGHT_BLACK), 0, false)) { newStr=str.mid(i18n(KFI_WEIGHT_BLACK).length()); return FC_WEIGHT_BLACK; } - if(0==str.find(i18n(KFI_WEIGHT_HEAVY), 0, false)) + if(0==str.tqfind(i18n(KFI_WEIGHT_HEAVY), 0, false)) { newStr=str.mid(i18n(KFI_WEIGHT_HEAVY).length()); return FC_WEIGHT_HEAVY; @@ -263,47 +263,47 @@ static int strToWeight(const TQString &str, TQString &newStr) #ifndef KFI_FC_NO_WIDTHS static int strToWidth(const TQString &str, TQString &newStr) { - if(0==str.find(i18n(KFI_WIDTH_ULTRACONDENSED), 0, false)) + if(0==str.tqfind(i18n(KFI_WIDTH_ULTRACONDENSED), 0, false)) { newStr=str.mid(i18n(KFI_WIDTH_ULTRACONDENSED).length()); return FC_WIDTH_ULTRACONDENSED; } - if(0==str.find(i18n(KFI_WIDTH_EXTRACONDENSED), 0, false)) + if(0==str.tqfind(i18n(KFI_WIDTH_EXTRACONDENSED), 0, false)) { newStr=str.mid(i18n(KFI_WIDTH_EXTRACONDENSED).length()); return FC_WIDTH_EXTRACONDENSED; } - if(0==str.find(i18n(KFI_WIDTH_CONDENSED), 0, false)) + if(0==str.tqfind(i18n(KFI_WIDTH_CONDENSED), 0, false)) { newStr=str.mid(i18n(KFI_WIDTH_CONDENSED).length()); return FC_WIDTH_CONDENSED; } - if(0==str.find(i18n(KFI_WIDTH_SEMICONDENSED), 0, false)) + if(0==str.tqfind(i18n(KFI_WIDTH_SEMICONDENSED), 0, false)) { newStr=str.mid(i18n(KFI_WIDTH_SEMICONDENSED).length()); return FC_WIDTH_SEMICONDENSED; } - if(0==str.find(i18n(KFI_WIDTH_NORMAL), 0, false)) + if(0==str.tqfind(i18n(KFI_WIDTH_NORMAL), 0, false)) { newStr=str.mid(i18n(KFI_WIDTH_NORMAL).length()); return FC_WIDTH_NORMAL; } - if(0==str.find(i18n(KFI_WIDTH_SEMIEXPANDED), 0, false)) + if(0==str.tqfind(i18n(KFI_WIDTH_SEMIEXPANDED), 0, false)) { newStr=str.mid(i18n(KFI_WIDTH_SEMIEXPANDED).length()); return FC_WIDTH_SEMIEXPANDED; } - if(0==str.find(i18n(KFI_WIDTH_EXPANDED), 0, false)) + if(0==str.tqfind(i18n(KFI_WIDTH_EXPANDED), 0, false)) { newStr=str.mid(i18n(KFI_WIDTH_EXPANDED).length()); return FC_WIDTH_EXPANDED; } - if(0==str.find(i18n(KFI_WIDTH_EXTRAEXPANDED), 0, false)) + if(0==str.tqfind(i18n(KFI_WIDTH_EXTRAEXPANDED), 0, false)) { newStr=str.mid(i18n(KFI_WIDTH_EXTRAEXPANDED).length()); return FC_WIDTH_EXTRAEXPANDED; } - if(0==str.find(i18n(KFI_WIDTH_ULTRAEXPANDED), 0, false)) + if(0==str.tqfind(i18n(KFI_WIDTH_ULTRAEXPANDED), 0, false)) { newStr=str.mid(i18n(KFI_WIDTH_ULTRAEXPANDED).length()); return FC_WIDTH_ULTRAEXPANDED; @@ -316,9 +316,9 @@ static int strToWidth(const TQString &str, TQString &newStr) static int strToSlant(const TQString &str) { - if(-1!=str.find(i18n(KFI_SLANT_ITALIC))) + if(-1!=str.tqfind(i18n(KFI_SLANT_ITALIC))) return FC_SLANT_ITALIC; - if(-1!=str.find(i18n(KFI_SLANT_OBLIQUE))) + if(-1!=str.tqfind(i18n(KFI_SLANT_OBLIQUE))) return FC_SLANT_OBLIQUE; return FC_SLANT_ROMAN; } @@ -439,7 +439,7 @@ static bool hasStr(XftFont *font, TQString &str) ch; for(ch=0; ch<slen; ++ch) - if(!FcCharSetHasChar(font->charset, str[ch].unicode())) + if(!FcCharSetHasChar(font->charset, str[ch].tqunicode())) return false; return true; } @@ -867,7 +867,7 @@ bool CFcEngine::getInfo(const KURL &url, int faceNo, TQString &full, TQString &f { int pos; - if(-1==(pos=itsDescriptiveName.find(", "))) // No style information... + if(-1==(pos=itsDescriptiveName.tqfind(", "))) // No style information... family=itsDescriptiveName; else family=itsDescriptiveName.left(pos); @@ -948,7 +948,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all) TQTextStream stream(&file); thumbUrl=stream.readLine(); - isThumbnailUrl=0==thumbUrl.find(KFI_KIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all); + isThumbnailUrl=0==thumbUrl.tqfind(KFI_KIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all); file.close(); } @@ -1003,7 +1003,7 @@ void CFcEngine::parseName(const TQString &name, int faceNo, bool all) itsDescriptiveName=name; itsSpacing=FC_PROPORTIONAL; - if(-1==(pos=name.find(", "))) // No style information... + if(-1==(pos=name.tqfind(", "))) // No style information... { itsWeight=FC_WEIGHT_NORMAL; #ifndef KFI_FC_NO_WIDTHS diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp index 1e779b514..6e87c9b02 100644 --- a/kcontrol/kfontinst/lib/Misc.cpp +++ b/kcontrol/kfontinst/lib/Misc.cpp @@ -65,9 +65,9 @@ TQString dirSyntax(const TQString &d) { TQString ds(d); - ds.replace("//", "/"); + ds.tqreplace("//", "/"); - int slashPos=ds.findRev('/'); + int slashPos=ds.tqfindRev('/'); if(slashPos!=(((int)ds.length())-1)) ds.append('/'); @@ -84,9 +84,9 @@ TQString xDirSyntax(const TQString &d) { TQString ds(d); - ds.replace("//", "/"); + ds.tqreplace("//", "/"); - int slashPos=ds.findRev('/'); + int slashPos=ds.tqfindRev('/'); if(slashPos==(((int)ds.length())-1)) ds.remove(slashPos, 1); @@ -100,7 +100,7 @@ TQString getDir(const TQString &f) { TQString d(f); - int slashPos=d.findRev('/'); + int slashPos=d.tqfindRev('/'); if(slashPos!=-1) d.remove(slashPos+1, d.length()); @@ -112,7 +112,7 @@ TQString getFile(const TQString &f) { TQString d(f); - int slashPos=d.findRev('/'); + int slashPos=d.tqfindRev('/'); if(slashPos!=-1) d.remove(0, slashPos+1); @@ -152,7 +152,7 @@ bool doCmd(const TQString &cmd, const TQString &p1, const TQString &p2, const TQ TQString changeExt(const TQString &f, const TQString &newExt) { TQString newStr(f); - int dotPos=newStr.findRev('.'); + int dotPos=newStr.tqfindRev('.'); if(-1==dotPos) newStr+=TQChar('.')+newExt; diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/kfontinst/viewpart/FontPreview.cpp index 3679be252..4382f5feb 100644 --- a/kcontrol/kfontinst/viewpart/FontPreview.cpp +++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp @@ -88,7 +88,7 @@ void CFontPreview::paintEvent(TQPaintEvent *) { if(!itsCurrentUrl.isEmpty()) { - paint.setPen(kapp->palette().active().text()); + paint.setPen(kapp->tqpalette().active().text()); paint.drawText(rect(), AlignCenter, i18n(" No preview available")); } } @@ -103,12 +103,12 @@ void CFontPreview::paintEvent(TQPaintEvent *) } } -TQSize CFontPreview::sizeHint() const +TQSize CFontPreview::tqsizeHint() const { return TQSize(132, 132); } -TQSize CFontPreview::minimumSizeHint() const +TQSize CFontPreview::tqminimumSizeHint() const { return TQSize(32, 32); } diff --git a/kcontrol/kfontinst/viewpart/FontPreview.h b/kcontrol/kfontinst/viewpart/FontPreview.h index a57e9b9c9..f8f922b62 100644 --- a/kcontrol/kfontinst/viewpart/FontPreview.h +++ b/kcontrol/kfontinst/viewpart/FontPreview.h @@ -40,7 +40,7 @@ namespace KFI { -class CFontPreview : public QWidget +class CFontPreview : public TQWidget { Q_OBJECT @@ -50,8 +50,8 @@ class CFontPreview : public QWidget virtual ~CFontPreview() {} void paintEvent(TQPaintEvent *); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; void showFont(const KURL &url); void showFont(); diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp index 14bda4024..deaf5587e 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp @@ -81,14 +81,14 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint()); itsFrame->setFrameShape(TQFrame::NoFrame); - itsFrame->setFocusPolicy(TQWidget::ClickFocus); + itsFrame->setFocusPolicy(TQ_ClickFocus); itsToolsFrame->setFrameShape(TQFrame::NoFrame); previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised); previewFrame->setFrameShape(TQFrame::Panel); setInstance(new KInstance("kfontview")); itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview"); - itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + itsPreview->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); itsFaceLabel=new TQLabel(i18n("Face:"), itsToolsFrame); itsFaceSelector=new KIntNumInput(1, itsToolsFrame); itsInstallButton=new TQPushButton(i18n("Install..."), itsToolsFrame, "button"); @@ -165,17 +165,17 @@ void CFontViewPart::timeout() if(Misc::root()) { destUrl=TQString("fonts:/")+itsPreview->engine().getName(m_url); - itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()); + itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget()); } else { destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url); - if(KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget())) + if(KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget())) itsShowInstallButton=false; else { destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url); - itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()); + itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget()); } } } @@ -220,7 +220,7 @@ void CFontViewPart::install() { KURL destUrl(getDest(m_url, KMessageBox::No==resp)); - if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget())) + if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->tqparentWidget())) { // // OK file copied, now look for any AFM or PFM file... @@ -236,7 +236,7 @@ void CFontViewPart::install() for(it=urls.begin(); it!=end; ++it) { destUrl=getDest(*it, KMessageBox::No==resp); - KIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget()); + KIO::NetAccess::copy(*it, destUrl, itsFrame->tqparentWidget()); } } @@ -274,7 +274,7 @@ void CFontViewPart::print() items.append(itsPreview->engine().getName(m_url)); - Print::printItems(items, 0, itsFrame->parentWidget(), itsPreview->engine()); + Print::printItems(items, 0, itsFrame->tqparentWidget(), itsPreview->engine()); } } diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp index 56540171e..09617ade8 100644 --- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp @@ -49,10 +49,10 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() if(factory) { - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); - itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart"); + itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(this), "fontvier", "KParts::ReadOnlyPart"); KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); KURL openURL; diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp index 372104c4a..6da3bca4a 100644 --- a/kcontrol/kicker/advancedDialog.cpp +++ b/kcontrol/kicker/advancedDialog.cpp @@ -51,7 +51,7 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name) layout->addWidget(m_advancedWidget); layout->addStretch(); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed())); @@ -86,7 +86,7 @@ void advancedDialog::load() int defaultHideButtonSize = c.readNumEntry("HideButtonSize", 14); m_advancedWidget->hideButtonSize->setValue(defaultHideButtonSize); - TQColor color = c.readColorEntry( "TintColor", &colorGroup().mid() ); + TQColor color = c.readColorEntry( "TintColor", &tqcolorGroup().mid() ); m_advancedWidget->tintColorB->setColor( color ); int tintValue = c.readNumEntry( "TintValue", 33 ); m_advancedWidget->tintSlider->setValue( tintValue ); @@ -123,7 +123,7 @@ void advancedDialog::save() // is there a config group for this extension? if(!c.hasGroup(group) || - group.contains("Extension") < 1) + group.tqcontains("Extension") < 1) { continue; } diff --git a/kcontrol/kicker/advancedOptions.ui b/kcontrol/kicker/advancedOptions.ui index 215ef7e8b..b867b6094 100644 --- a/kcontrol/kicker/advancedOptions.ui +++ b/kcontrol/kicker/advancedOptions.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>advancedKickerOptions</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>advancedKickerOptions</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -71,7 +71,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>20</height> @@ -80,7 +80,7 @@ </spacer> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>handles</cstring> </property> @@ -91,7 +91,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>visibleHandles</cstring> </property> @@ -108,7 +108,7 @@ </qt></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>fadeOutHandles</cstring> </property> @@ -122,7 +122,7 @@ </qt></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>hideHandles</cstring> </property> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -154,7 +154,7 @@ </spacer> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -194,21 +194,21 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> <string>Min</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="whatsThis" stdset="0"> @@ -225,14 +225,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>81</width> <height>20</height> </size> </property> </spacer> - <widget class="QSlider" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQSlider" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>tintSlider</cstring> </property> @@ -243,21 +243,21 @@ <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> <property name="text"> <string>Max</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="whatsThis" stdset="0"> <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -271,7 +271,7 @@ <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -285,7 +285,7 @@ <string>Click on this button to set the color to use when tinting transparent panels.</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>menubarPanelTransparent</cstring> </property> diff --git a/kcontrol/kicker/applettab.ui b/kcontrol/kicker/applettab.ui index 6ebfa2c88..8b0aeb223 100644 --- a/kcontrol/kicker/applettab.ui +++ b/kcontrol/kicker/applettab.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AppletTabBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AppletTabBase</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>level_group</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>trusted_rb</cstring> </property> @@ -35,7 +35,7 @@ <string>Load only trusted applets internal</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>new_rb</cstring> </property> @@ -43,7 +43,7 @@ <string>Load startup config applets internal</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>all_rb</cstring> </property> @@ -53,7 +53,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>list_group</cstring> </property> @@ -70,7 +70,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout13</cstring> </property> @@ -78,7 +78,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Available Applets</string> @@ -94,7 +94,7 @@ <cstring>lb_available</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout12</cstring> </property> @@ -112,18 +112,18 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>pb_add</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -143,14 +143,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>pb_remove</cstring> </property> @@ -162,7 +162,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -191,7 +191,7 @@ </spacer> </vbox> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Trusted Applets</string> diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp index a8b7cdb20..534f2cbdb 100644 --- a/kcontrol/kicker/applettab_impl.cpp +++ b/kcontrol/kicker/applettab_impl.cpp @@ -132,7 +132,7 @@ void AppletTab::load( bool useDefaults ) TQStringList list = c.readListEntry("TrustedApplets"); for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - if(available.contains(*it)) + if(available.tqcontains(*it)) l_trusted << (*it); } } @@ -142,7 +142,7 @@ void AppletTab::load( bool useDefaults ) for ( TQStringList::Iterator it = available.begin(); it != available.end(); ++it ) { - if(!l_trusted.contains(*it)) + if(!l_trusted.tqcontains(*it)) l_available << (*it); } diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp index d1a0b2766..89f000410 100644 --- a/kcontrol/kicker/extensionInfo.cpp +++ b/kcontrol/kicker/extensionInfo.cpp @@ -125,7 +125,7 @@ void ExtensionInfo::load() c.setGroup("General"); _position = c.readNumEntry ("Position", _position); - _alignment = c.readNumEntry ("Alignment", _alignment); + _tqalignment = c.readNumEntry ("Alignment", _tqalignment); _xineramaScreen = c.readNumEntry ("XineramaScreen", _xineramaScreen); _showLeftHB = c.readBoolEntry("ShowLeftHideButton", _showLeftHB); _showRightHB = c.readBoolEntry("ShowRightHideButton", _showRightHB); @@ -147,7 +147,7 @@ void ExtensionInfo::load() } _orig_position = _position; - _orig_alignment = _alignment; + _orig_tqalignment = _tqalignment; _orig_size = _size; _orig_customSize = _customSize; @@ -170,10 +170,10 @@ void ExtensionInfo::configChanged() _orig_position = _position = position; } - int alignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0); - if (alignment != _alignment && alignment != _orig_alignment) + int tqalignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0); + if (tqalignment != _tqalignment && tqalignment != _orig_tqalignment) { - _orig_alignment = _alignment = alignment; + _orig_tqalignment = _tqalignment = tqalignment; } if (_resizeable) @@ -197,7 +197,7 @@ void ExtensionInfo::setDefaults() { // defaults _position = 3; - _alignment = TQApplication::reverseLayout() ? 2 : 0; + _tqalignment = TQApplication::reverseLayout() ? 2 : 0; _xineramaScreen = TQApplication::desktop()->primaryScreen(); _size = 2; _showLeftHB = false; @@ -225,7 +225,7 @@ void ExtensionInfo::save() c.setGroup("General"); c.writeEntry("Position", _position); - c.writeEntry("Alignment", _alignment); + c.writeEntry("Alignment", _tqalignment); c.writeEntry("XineramaScreen", _xineramaScreen); c.writeEntry("ShowLeftHideButton", _showLeftHB); c.writeEntry("ShowRightHideButton", _showRightHB); @@ -251,7 +251,7 @@ void ExtensionInfo::save() } _orig_position = _position; - _orig_alignment = _alignment; + _orig_tqalignment = _tqalignment; _orig_size = _size; _orig_customSize = _customSize; diff --git a/kcontrol/kicker/extensionInfo.h b/kcontrol/kicker/extensionInfo.h index 169322aa4..5b890d324 100644 --- a/kcontrol/kicker/extensionInfo.h +++ b/kcontrol/kicker/extensionInfo.h @@ -47,7 +47,7 @@ class ExtensionInfo // Configuration settings TQString _name; int _position; - int _alignment; + int _tqalignment; int _xineramaScreen; int _size; int _customSize; @@ -67,7 +67,7 @@ class ExtensionInfo // Original settings to ensure that we can figure out // what has changed externally to the panel vs within the panel int _orig_position; - int _orig_alignment; + int _orig_tqalignment; int _orig_size; int _orig_customSize; diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui index 8d7b0b254..eaa5961fe 100644 --- a/kcontrol/kicker/hidingtab.ui +++ b/kcontrol/kicker/hidingtab.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>HidingTabBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>HidingTabBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_panelsGroupBox</cstring> </property> @@ -36,7 +36,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_panelListLabel</cstring> </property> @@ -47,7 +47,7 @@ <cstring>m_panelList</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_panelList</cstring> </property> @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>342</width> <height>20</height> @@ -71,7 +71,7 @@ </spacer> </hbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_modeGroup</cstring> </property> @@ -92,14 +92,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> </size> </property> </spacer> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_manual</cstring> </property> @@ -113,7 +113,7 @@ <string>If this option is selected, the only way to hide the panel will be to click on the hide buttons that appear on either end of it.</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> <cstring>layout5</cstring> </property> @@ -144,7 +144,7 @@ <string>Here you can change the delay after which the panel will disappear if not used.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>DelayLabel_2_3_2</cstring> </property> @@ -179,7 +179,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -188,7 +188,7 @@ </spacer> </hbox> </widget> - <widget class="QRadioButton" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_background</cstring> </property> @@ -202,7 +202,7 @@ <string>If this option is selected, the panel will allow itself to be covered by other windows.</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_automatic</cstring> </property> @@ -216,7 +216,7 @@ <string>If this option is selected, the panel will automatically hide after a period of time and reappear when you move the mouse to the screen edge where the panel is hidden. This is particularly useful for small screen resolutions, such as on laptops.</string> </property> </widget> - <widget class="QLayoutWidget" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout6</cstring> </property> @@ -224,7 +224,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_backgroundRaise</cstring> </property> @@ -238,7 +238,7 @@ <string>When this option is selected, moving the pointer to the specified edge of the screen will cause the panel to appear on top of any windows that may be covering it.</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Top Left Corner</string> @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -308,7 +308,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_autoHideSwitch</cstring> </property> @@ -332,7 +332,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>10</height> @@ -341,7 +341,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_manualGroup</cstring> </property> @@ -363,7 +363,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_lHB</cstring> </property> @@ -377,7 +377,7 @@ <string>When this option is selected, a panel-hiding button appears on the left end of the panel.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>m_rHB</cstring> </property> @@ -401,7 +401,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -410,7 +410,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_manualGroup_2</cstring> </property> @@ -439,14 +439,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_animateHiding</cstring> </property> @@ -467,14 +467,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -482,7 +482,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider" row="0" column="0" rowspan="1" colspan="5"> + <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>m_hideSlider</cstring> </property> @@ -532,14 +532,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="4"> + <widget class="TQLabel" row="1" column="4"> <property name="name"> <cstring>TextLabel4_2_2_2_3</cstring> </property> @@ -557,7 +557,7 @@ <property name="text"> <string>Fast</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -573,14 +573,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>TextLabel5_2_2_2_3</cstring> </property> @@ -598,13 +598,13 @@ <property name="text"> <string>Medium</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel3_2_2_3_3</cstring> </property> @@ -637,7 +637,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui index 87f87cfc7..7eb945008 100644 --- a/kcontrol/kicker/lookandfeeltab.ui +++ b/kcontrol/kicker/lookandfeeltab.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>LookAndFeelTabBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>LookAndFeelTabBase</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>general_group</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowMouseOverEffects</cstring> </property> @@ -44,7 +44,7 @@ <string>When this option is selected a mouseover effect appears when the mouse cursor is moved over panel buttons</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowIconActivationEffect</cstring> </property> @@ -55,7 +55,7 @@ <string>When this option is selected an activation effect appears when panel buttons are left clicked.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowToolTips</cstring> </property> @@ -68,7 +68,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox9</cstring> </property> @@ -79,7 +79,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -93,7 +93,7 @@ <string>Choose a tile image for the K menu.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -227,7 +227,7 @@ <string>When the Custom Color option is selected, use this button to pick a color for window list tile backgrounds</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -281,7 +281,7 @@ <string>When the Custom Color option is selected, use this button to pick a color for the desktop tile background</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -306,7 +306,7 @@ <string>When the Custom Color option is selected, use this button to pick a color for application tile backgrounds</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>66</width> <height>130</height> @@ -368,7 +368,7 @@ </spacer> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -389,14 +389,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>kcfg_ColorizeBackground</cstring> </property> @@ -413,7 +413,7 @@ <string>If this option is selected, the panel background image will be colored to match the default colors. To change the default colors, go to the 'Colors' control module.</string> </property> </widget> - <widget class="QLabel" row="0" column="2" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="2" rowspan="2" colspan="1"> <property name="name"> <cstring>m_backgroundLabel</cstring> </property> @@ -428,13 +428,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>50</width> <height>50</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>50</height> @@ -449,7 +449,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -480,7 +480,7 @@ This option is only active if 'Enable background image' is selected.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_UseBackgroundTheme</cstring> </property> @@ -488,7 +488,7 @@ This option is only active if 'Enable background image' is selected.</string> <string>Enable &background image</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_Transparent</cstring> </property> @@ -498,7 +498,7 @@ This option is only active if 'Enable background image' is selected.</string> </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout3</cstring> </property> @@ -506,7 +506,7 @@ This option is only active if 'Enable background image' is selected.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>advancedOptionsButton</cstring> </property> @@ -527,7 +527,7 @@ This option is only active if 'Enable background image' is selected.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>289</width> <height>20</height> @@ -546,7 +546,7 @@ This option is only active if 'Enable background image' is selected.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp index 24c640a1d..984666d36 100644 --- a/kcontrol/kicker/lookandfeeltab_impl.cpp +++ b/kcontrol/kicker/lookandfeeltab_impl.cpp @@ -190,35 +190,35 @@ void LookAndFeelTab::load(bool useDefaults) if (config.readBoolEntry("EnableKMenuTiles", false)) { tile = config.readEntry("KMenuTile", "solid_blue"); - m_kmenuTile->setCurrentItem(m_tilename.findIndex(tile)); + m_kmenuTile->setCurrentItem(m_tilename.tqfindIndex(tile)); kcfg_KMenuTileColor->setEnabled(tile == "Colorize"); } if (config.readBoolEntry("EnableDesktopButtonTiles", false)) { tile = config.readEntry("DesktopButtonTile", "solid_orange"); - m_desktopTile->setCurrentItem(m_tilename.findIndex(tile)); + m_desktopTile->setCurrentItem(m_tilename.tqfindIndex(tile)); kcfg_DesktopButtonTileColor->setEnabled(tile == "Colorize"); } if (config.readBoolEntry("EnableURLTiles", false)) { tile = config.readEntry("URLTile", "solid_gray"); - m_urlTile->setCurrentItem(m_tilename.findIndex(tile)); + m_urlTile->setCurrentItem(m_tilename.tqfindIndex(tile)); kcfg_URLTileColor->setEnabled(tile == "Colorize"); } if (config.readBoolEntry("EnableBrowserTiles", false)) { tile = config.readEntry("BrowserTile", "solid_green"); - m_browserTile->setCurrentItem(m_tilename.findIndex(tile)); + m_browserTile->setCurrentItem(m_tilename.tqfindIndex(tile)); kcfg_BrowserTileColor->setEnabled(tile == "Colorize"); } if (config.readBoolEntry("EnableWindowListTiles", false)) { tile = config.readEntry("WindowListTile", "solid_green"); - m_windowListTile->setCurrentItem(m_tilename.findIndex(tile)); + m_windowListTile->setCurrentItem(m_tilename.tqfindIndex(tile)); kcfg_WindowListTileColor->setEnabled(tile == "Colorize"); } } @@ -328,7 +328,7 @@ void LookAndFeelTab::fillTileCombos() TQPixmap pix(tile); TQFileInfo fi(tile); tile = fi.fileName(); - tile.truncate(tile.find("_tiny_up.png")); + tile.truncate(tile.tqfind("_tiny_up.png")); m_tilename << tile; // Transform tile to words with title case diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index e60746db8..31cd34c11 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -141,7 +141,7 @@ void KickerConfig::restartKicker() } TQCString appname; appname = "kicker"; - kapp->dcopClient()->send(appname, appname, "restart", ""); + kapp->dcopClient()->send(appname, appname, "restart", TQString("")); } void KickerConfig::notifyKicker() @@ -187,7 +187,7 @@ void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool re TQString group(*it); // is there a config group for this extension? - if (!config.hasGroup(group) || group.contains("Extension") < 1) + if (!config.hasGroup(group) || group.tqcontains("Extension") < 1) { continue; } diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui index 7d3a3d460..b24573f67 100644 --- a/kcontrol/kicker/menutab.ui +++ b/kcontrol/kicker/menutab.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MenuTabBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MenuTabBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout5</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -38,7 +38,7 @@ <cstring>comboMenuStyle</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Kickoff</string> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -72,7 +72,7 @@ </spacer> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_kmenuGroup</cstring> </property> @@ -83,7 +83,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout7</cstring> </property> @@ -91,7 +91,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_openOnHover</cstring> </property> @@ -99,7 +99,7 @@ <string>Open menu on mouse hover</string> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>kcfg_MenuEntryFormat</cstring> </property> @@ -119,7 +119,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="1" column="1"> + <widget class="TQRadioButton" row="1" column="1"> <property name="name"> <cstring>m_formatSimple</cstring> </property> @@ -130,7 +130,7 @@ <string>When this option is selected, items in the K Menu will appear with the application's name next to the icon.</string> </property> </widget> - <widget class="QRadioButton" row="2" column="1"> + <widget class="TQRadioButton" row="2" column="1"> <property name="name"> <cstring>m_formatNameDesc</cstring> </property> @@ -144,7 +144,7 @@ <string>When this option is selected, items in the K Menu will appear with the application's name and a brief description next to the icon.</string> </property> </widget> - <widget class="QRadioButton" row="3" column="1"> + <widget class="TQRadioButton" row="3" column="1"> <property name="name"> <cstring>m_formatDescOnly</cstring> </property> @@ -155,7 +155,7 @@ <string>When this option is selected, items in the K Menu will appear with the application's brief description next to the icon.</string> </property> </widget> - <widget class="QRadioButton" row="4" column="1"> + <widget class="TQRadioButton" row="4" column="1"> <property name="name"> <cstring>m_formDescName</cstring> </property> @@ -171,7 +171,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_UseSidePixmap</cstring> </property> @@ -197,14 +197,14 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" colspan="2"> <property name="name"> <cstring>kcfg_ShowKMenuText</cstring> </property> @@ -225,7 +225,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLineEdit" row="0" column="1" colspan="3"> + <widget class="TQLineEdit" row="0" column="1" colspan="3"> <property name="name"> <cstring>kcfg_KMenuText</cstring> </property> @@ -233,7 +233,7 @@ <number>35</number> </property> </widget> - <widget class="QLabel" row="3" column="0" colspan="2"> + <widget class="TQLabel" row="3" column="0" colspan="2"> <property name="name"> <cstring>TextLabel1_3_3_2</cstring> </property> @@ -261,13 +261,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>26</width> <height>26</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>26</width> <height>26</height> @@ -280,7 +280,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_3_3_2</cstring> </property> @@ -296,7 +296,7 @@ <string>Text:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel1_3_3_2</cstring> </property> @@ -327,7 +327,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -345,7 +345,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -353,7 +353,7 @@ </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_editKMenuButton</cstring> </property> @@ -389,7 +389,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -411,7 +411,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>m_browserGroup</cstring> </property> @@ -422,7 +422,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -430,7 +430,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_maxQuickBrowserItemsLabel</cstring> </property> @@ -463,7 +463,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_ShowHiddenFiles</cstring> </property> @@ -487,7 +487,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -496,7 +496,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>m_recentGroup</cstring> </property> @@ -507,7 +507,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -515,7 +515,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_maxRecentDocumentsItemsLabel</cstring> </property> @@ -558,7 +558,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -567,7 +567,7 @@ </spacer> </grid> </widget> - <widget class="QButtonGroup" row="0" column="1" rowspan="1"> + <widget class="TQButtonGroup" row="0" column="1" rowspan="1"> <property name="name"> <cstring>m_pRecentOrderGroup</cstring> </property> @@ -578,7 +578,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -586,7 +586,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -619,7 +619,7 @@ </widget> </hbox> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>kcfg_RecentVsOften</cstring> </property> @@ -633,7 +633,7 @@ <string>When this option is selected the QuickStart menu area will be filled with the applications you have used most recently.</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>m_showFrequent</cstring> </property> @@ -654,7 +654,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -663,7 +663,7 @@ </spacer> </grid> </widget> - <widget class="QButtonGroup" row="1" column="1" rowspan="1"> + <widget class="TQButtonGroup" row="1" column="1" rowspan="1"> <property name="name"> <cstring>m_pSearchGroup</cstring> </property> @@ -674,7 +674,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_UseSearchBar</cstring> </property> @@ -698,7 +698,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index 970aa10a1..cd1d27fa9 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -93,9 +93,9 @@ MenuTab::MenuTab( TQWidget *parent, const char* name ) btnCustomKMenuIcon->setPixmap(kmenu_icon); KConfig *config; - config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); - config->setGroup(TQString::fromLatin1("RecentDocuments")); - maxrecentdocs->setValue(config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10)); + config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false); + config->setGroup(TQString::tqfromLatin1("RecentDocuments")); + maxrecentdocs->setValue(config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10)); m_browserGroupLayout->setColStretch( 1, 1 ); m_pRecentOrderGroupLayout->setColStretch( 1, 1 ); @@ -148,7 +148,7 @@ void MenuTab::load( bool useDefaults ) df.readName(), *it, SmallIcon(df.readIcon()), - qFind(ext.begin(), ext.end(), *it) != ext.end()); + tqFind(ext.begin(), ext.end(), *it) != ext.end()); connect(menuItem, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); } } @@ -247,8 +247,8 @@ void MenuTab::save() // Save recent documents KConfig *config; - config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); - config->setGroup(TQString::fromLatin1("RecentDocuments")); + config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false); + config->setGroup(TQString::tqfromLatin1("RecentDocuments")); config->writeEntry("MaxEntries", maxrecentdocs->value()); config->sync(); diff --git a/kcontrol/kicker/menutab_impl.h b/kcontrol/kicker/menutab_impl.h index 3ef197f09..b143b0072 100644 --- a/kcontrol/kicker/menutab_impl.h +++ b/kcontrol/kicker/menutab_impl.h @@ -25,7 +25,7 @@ #include "menutab.h" -class kSubMenuItem : public TQObject, public QCheckListItem +class kSubMenuItem : public TQObject, public TQCheckListItem { Q_OBJECT diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui index b0566f5dc..7af261fde 100644 --- a/kcontrol/kicker/positiontab.ui +++ b/kcontrol/kicker/positiontab.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>PositionTabBase</class> <author>Aaron J. Seigo</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PositionTabBase</cstring> </property> @@ -23,7 +23,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_panelsGroupBox</cstring> </property> @@ -40,7 +40,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_panelListLabel</cstring> </property> @@ -51,7 +51,7 @@ <cstring>m_panelList</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_panelList</cstring> </property> @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>342</width> <height>20</height> @@ -75,7 +75,7 @@ </spacer> </hbox> </widget> - <widget class="QGroupBox" row="1" column="1" rowspan="3" colspan="1"> + <widget class="TQGroupBox" row="1" column="1" rowspan="3" colspan="1"> <property name="name"> <cstring>XineramaGroup</cstring> </property> @@ -86,7 +86,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout13</cstring> </property> @@ -104,14 +104,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_monitorImage</cstring> </property> @@ -123,7 +123,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>151</width> <height>115</height> @@ -132,7 +132,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="whatsThis" stdset="0"> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -158,7 +158,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout12</cstring> </property> @@ -176,14 +176,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_identifyButton</cstring> </property> @@ -196,7 +196,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -204,7 +204,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_xineramaScreenLabel</cstring> </property> @@ -215,7 +215,7 @@ <cstring>m_xineramaScreenComboBox</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_xineramaScreenComboBox</cstring> </property> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>101</height> @@ -244,7 +244,7 @@ </spacer> </grid> </widget> - <widget class="QButtonGroup" row="2" column="0"> + <widget class="TQButtonGroup" row="2" column="0"> <property name="name"> <cstring>m_rsizeGroup</cstring> </property> @@ -267,7 +267,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout8</cstring> </property> @@ -275,7 +275,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>m_percentSlider</cstring> </property> @@ -334,7 +334,7 @@ how it is positioned on the screen and how much of the screen it should use.</st </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_expandCheckBox</cstring> </property> @@ -357,14 +357,14 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> </size> </property> </spacer> - <widget class="QButtonGroup" row="3" column="0"> + <widget class="TQButtonGroup" row="3" column="0"> <property name="name"> <cstring>m_sizeGroup</cstring> </property> @@ -386,7 +386,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="0" column="0" rowspan="1" colspan="2"> <item> <property name="text"> <string>Tiny</string> @@ -426,14 +426,14 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>40</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -441,7 +441,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>m_customSlider</cstring> </property> @@ -511,7 +511,7 @@ how it is positioned on the screen and how much of the screen it should use.</st </widget> </grid> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>m_locationGroup</cstring> </property> @@ -538,7 +538,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -555,14 +555,14 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>0</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -570,7 +570,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout8</cstring> </property> @@ -578,7 +578,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>locationTopLeft</cstring> </property> @@ -590,13 +590,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>16</height> @@ -612,7 +612,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>locationTop</cstring> </property> @@ -624,13 +624,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>16</height> @@ -646,7 +646,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>locationTopRight</cstring> </property> @@ -658,13 +658,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>16</height> @@ -682,7 +682,7 @@ how it is positioned on the screen and how much of the screen it should use.</st </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -690,7 +690,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>locationLeftTop</cstring> </property> @@ -702,13 +702,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>16</width> <height>24</height> @@ -724,7 +724,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>locationLeft</cstring> </property> @@ -736,13 +736,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>16</width> <height>24</height> @@ -758,7 +758,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>locationLeftBottom</cstring> </property> @@ -770,13 +770,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>16</width> <height>24</height> @@ -794,7 +794,7 @@ how it is positioned on the screen and how much of the screen it should use.</st </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -802,7 +802,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>locationBottomLeft</cstring> </property> @@ -814,13 +814,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>16</height> @@ -836,7 +836,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>locationBottom</cstring> </property> @@ -848,13 +848,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>16</height> @@ -870,7 +870,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>locationBottomRight</cstring> </property> @@ -882,13 +882,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>16</height> @@ -906,7 +906,7 @@ how it is positioned on the screen and how much of the screen it should use.</st </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="2"> + <widget class="TQLayoutWidget" row="1" column="2"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -914,7 +914,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>locationRightTop</cstring> </property> @@ -926,13 +926,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>16</width> <height>24</height> @@ -948,7 +948,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>locationRight</cstring> </property> @@ -960,13 +960,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>16</width> <height>24</height> @@ -982,7 +982,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>locationRightBottom</cstring> </property> @@ -994,13 +994,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>16</width> <height>24</height> diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index d65498430..5f89cd5a6 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/kcontrol/kicker/positiontab_impl.cpp @@ -60,7 +60,7 @@ PositionTab::PositionTab(TQWidget *parent, const char* name) { TQPixmap monitor(locate("data", "kcontrol/pics/monitor.png")); m_monitorImage->setPixmap(monitor); - m_monitorImage->setFixedSize(m_monitorImage->sizeHint()); + m_monitorImage->setFixedSize(m_monitorImage->tqsizeHint()); m_pretendDesktop = new TQWidget(m_monitorImage, "pretendBG"); m_pretendDesktop->setGeometry(offsetX, offsetY, maxX, maxY); @@ -220,7 +220,7 @@ void PositionTab::sizeChanged(int which) void PositionTab::movePanel(int whichButton) { - TQPushButton* pushed = reinterpret_cast<TQPushButton*>(m_locationGroup->find(whichButton)); + TQPushButton* pushed = reinterpret_cast<TQPushButton*>(m_locationGroup->tqfind(whichButton)); if (pushed == locationTopLeft) { @@ -558,7 +558,7 @@ void PositionTab::switchPanel(int panelItem) m_customSpinbox->setValue(m_panelInfo->_customSize); m_sizeGroup->setEnabled(m_panelInfo->_resizeable); m_panelPos = m_panelInfo->_position; - m_panelAlign = m_panelInfo->_alignment; + m_panelAlign = m_panelInfo->_tqalignment; if(m_panelInfo->_xineramaScreen >= 0 && m_panelInfo->_xineramaScreen < TQApplication::desktop()->numScreens()) m_xineramaScreenComboBox->setCurrentItem(m_panelInfo->_xineramaScreen); else if(m_panelInfo->_xineramaScreen == -2) /* the All Screens option: qt uses -1 for default, so -2 for all */ @@ -672,7 +672,7 @@ void PositionTab::storeInfo() } m_panelInfo->_position = m_panelPos; - m_panelInfo->_alignment = m_panelAlign; + m_panelInfo->_tqalignment = m_panelAlign; if(m_xineramaScreenComboBox->currentItem() == m_xineramaScreenComboBox->count()-1) m_panelInfo->_xineramaScreen = -2; /* all screens */ else @@ -687,7 +687,7 @@ void PositionTab::showIdentify() for(int s=0; s < TQApplication::desktop()->numScreens();s++) { - TQLabel *screenLabel = new TQLabel(0,"Screen Identify", WDestructiveClose | WStyle_Customize | WX11BypassWM ); + TQLabel *screenLabel = new TQLabel(0,"Screen Identify", (WFlags)(WDestructiveClose | WStyle_Customize | WX11BypassWM) ); TQFont identifyFont(KGlobalSettings::generalFont()); identifyFont.setPixelSize(100); @@ -696,14 +696,14 @@ void PositionTab::showIdentify() screenLabel->setFrameStyle(TQFrame::Panel); screenLabel->setFrameShadow(TQFrame::Plain); - screenLabel->setAlignment(Qt::AlignCenter); + screenLabel->tqsetAlignment(Qt::AlignCenter); screenLabel->setNum(s + 1); // BUGLET: we should not allow the identification to be entered again // until the timer fires. TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); - TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint()); + TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint()); targetGeometry.moveCenter(screenCenter); screenLabel->setGeometry(targetGeometry); diff --git a/kcontrol/kio/cache_ui.ui b/kcontrol/kio/cache_ui.ui index c0e504057..532173407 100644 --- a/kcontrol/kio/cache_ui.ui +++ b/kcontrol/kio/cache_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>CacheDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CacheDlgUI</cstring> </property> @@ -29,14 +29,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>21</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>lbMaxCacheSize</cstring> </property> @@ -67,7 +67,7 @@ <string> KB</string> </property> </widget> - <widget class="QPushButton" row="2" column="3"> + <widget class="TQPushButton" row="2" column="3"> <property name="name"> <cstring>pbClearCache</cstring> </property> @@ -88,14 +88,14 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>21</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>cbUseCache</cstring> </property> @@ -106,7 +106,7 @@ <string>Check this box if you want the web pages you visit to be stored on your hard disk for quicker access. The stored pages will only be updated as needed instead of on every visit to that site. This is especially useful if you have a slow connection to the Internet.</string> </property> </widget> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="5"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>bgCachePolicy</cstring> </property> @@ -120,7 +120,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbVerifyCache</cstring> </property> @@ -131,7 +131,7 @@ <string>Verify whether the cached web page is valid before attempting to fetch the web page again.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbCacheIfPossible</cstring> </property> @@ -142,7 +142,7 @@ <string>Always use documents from the cache when available. You can still use the reload button to synchronize the cache with the remote host.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbOfflineMode</cstring> </property> diff --git a/kcontrol/kio/envvarproxy_ui.ui b/kcontrol/kio/envvarproxy_ui.ui index 471b9f868..3e1babf90 100644 --- a/kcontrol/kio/envvarproxy_ui.ui +++ b/kcontrol/kio/envvarproxy_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EnvVarProxyDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EnvVarProxyDlgUI</cstring> </property> @@ -41,7 +41,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a </qt></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lbFtp</cstring> </property> @@ -58,7 +58,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a </qt></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lbHttps</cstring> </property> @@ -75,7 +75,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a </qt></string> </property> </widget> - <widget class="QCheckBox" row="4" column="1"> + <widget class="TQCheckBox" row="4" column="1"> <property name="name"> <cstring>cbShowValue</cstring> </property> @@ -83,7 +83,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a <string>Show the &value of the environment variables</string> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>pbVerify</cstring> </property> @@ -94,7 +94,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a <string><qt>Verify whether or not the environment variable names you supplied are valid. If an environment variable is not found, the associated labels will be <b>highlighted</b> to indicate that they are invalid.</qt></string> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>pbDetect</cstring> </property> @@ -105,7 +105,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a <string><qt>Attempt automatic discovery of the environment variables used for setting system wide proxy information.<p> This feature works by searching for commonly used variable names such as HTTP_PROXY, FTP_PROXY and NO_PROXY.</qt></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lbHttp</cstring> </property> @@ -144,7 +144,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a </qt></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lbNoProxy</cstring> </property> diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/kio/fakeuaprovider.cpp index 00a87567e..2fe6d27f1 100644 --- a/kcontrol/kio/fakeuaprovider.cpp +++ b/kcontrol/kio/fakeuaprovider.cpp @@ -27,7 +27,7 @@ #include "fakeuaprovider.h" #define UA_PTOS(x) (*it)->property(x).toString() -#define QFL(x) TQString::fromLatin1(x) +#define QFL(x) TQString::tqfromLatin1(x) FakeUASProvider::FakeUASProvider() { @@ -37,11 +37,11 @@ FakeUASProvider::FakeUASProvider() FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString& uaStr ) { TQStringList split; - int pos = (uaStr).find("::"); + int pos = (uaStr).tqfind("::"); if ( pos == -1 ) { - pos = (uaStr).find(':'); + pos = (uaStr).tqfind(':'); if ( pos != -1 ) { split.append(uaStr.left(pos)); @@ -53,7 +53,7 @@ FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString split = TQStringList::split("::", uaStr); } - if ( m_lstIdentity.contains(split[1]) ) + if ( m_lstIdentity.tqcontains(split[1]) ) return DUPLICATE_ENTRY; else { @@ -90,29 +90,29 @@ void FakeUASProvider::parseDescription() struct utsname utsn; uname( &utsn ); - tmp.replace( QFL("appSysName"), TQString(utsn.sysname) ); - tmp.replace( QFL("appSysRelease"), TQString(utsn.release) ); - tmp.replace( QFL("appMachineType"), TQString(utsn.machine) ); + tmp.tqreplace( QFL("appSysName"), TQString(utsn.sysname) ); + tmp.tqreplace( QFL("appSysRelease"), TQString(utsn.release) ); + tmp.tqreplace( QFL("appMachineType"), TQString(utsn.machine) ); TQStringList languageList = KGlobal::locale()->languageList(); if ( languageList.count() ) { - TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); + TQStringList::Iterator it = languageList.tqfind( TQString::tqfromLatin1("C") ); if( it != languageList.end() ) { - if( languageList.contains( TQString::fromLatin1("en") ) > 0 ) + if( languageList.tqcontains( TQString::tqfromLatin1("en") ) > 0 ) languageList.remove( it ); else - (*it) = TQString::fromLatin1("en"); + (*it) = TQString::tqfromLatin1("en"); } } - tmp.replace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) ); - tmp.replace( QFL("appPlatform"), QFL("X11") ); + tmp.tqreplace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) ); + tmp.tqreplace( QFL("appPlatform"), QFL("X11") ); } // Ignore dups... - if ( m_lstIdentity.contains(tmp) ) + if ( m_lstIdentity.tqcontains(tmp) ) continue; m_lstIdentity << tmp; @@ -133,7 +133,7 @@ void FakeUASProvider::parseDescription() TQString FakeUASProvider::aliasStr( const TQString& name ) { - int id = userAgentStringList().findIndex(name); + int id = userAgentStringList().tqfindIndex(name); if ( id == -1 ) return TQString::null; else @@ -142,7 +142,7 @@ TQString FakeUASProvider::aliasStr( const TQString& name ) TQString FakeUASProvider::agentStr( const TQString& name ) { - int id = userAgentAliasList().findIndex(name); + int id = userAgentAliasList().tqfindIndex(name); if ( id == -1 ) return TQString::null; else diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp index f2cd45c42..da899be1f 100644 --- a/kcontrol/kio/kcookiesmanagement.cpp +++ b/kcontrol/kio/kcookiesmanagement.cpp @@ -94,9 +94,9 @@ CookieProp* CookieListViewItem::leaveCookie() TQString CookieListViewItem::text(int f) const { if (mCookie) - return f == 0 ? TQString::null : KIDNA::toUnicode(mCookie->host); + return f == 0 ? TQString() : KIDNA::toUnicode(mCookie->host); else - return f == 0 ? KIDNA::toUnicode(mDomain) : TQString::null; + return f == 0 ? KIDNA::toUnicode(mDomain) : TQString(); } KCookiesManagement::KCookiesManagement(TQWidget *parent) @@ -285,9 +285,9 @@ void KCookiesManagement::getCookies(TQListViewItem *cookieDom) DCOPReply reply = DCOPRef ("kded", "kcookiejar").call ("findCookies", DCOPArg(fields, "TQValueList<int>"), ckd->domain(), - TQString::null, - TQString::null, - TQString::null); + TQString(), + TQString(), + TQString()); if(reply.isValid()) { TQStringList fieldVal = reply; @@ -383,7 +383,7 @@ void KCookiesManagement::doPolicy() if( domain.isEmpty() ) { - CookieListViewItem *parent = static_cast<CookieListViewItem*>( item->parent() ); + CookieListViewItem *parent = static_cast<CookieListViewItem*>( item->tqparent() ); if ( parent ) domain = parent->domain (); @@ -407,8 +407,8 @@ void KCookiesManagement::deleteCookie(TQListViewItem* deleteItem) CookieListViewItem *item = static_cast<CookieListViewItem*>( deleteItem ); if( item->cookie() ) { - CookieListViewItem *parent = static_cast<CookieListViewItem*>(item->parent()); - CookiePropList *list = deletedCookies.find(parent->domain()); + CookieListViewItem *parent = static_cast<CookieListViewItem*>(item->tqparent()); + CookiePropList *list = deletedCookies.tqfind(parent->domain()); if(!list) { list = new CookiePropList; diff --git a/kcontrol/kio/kcookiesmanagement.h b/kcontrol/kio/kcookiesmanagement.h index cd7f4c62a..3e7588282 100644 --- a/kcontrol/kio/kcookiesmanagement.h +++ b/kcontrol/kio/kcookiesmanagement.h @@ -36,7 +36,7 @@ class KCookiesManagementDlgUI; struct CookieProp; -class CookieListViewItem : public QListViewItem +class CookieListViewItem : public TQListViewItem { public: CookieListViewItem(TQListView *parent, TQString dom); diff --git a/kcontrol/kio/kcookiesmanagementdlg_ui.ui b/kcontrol/kio/kcookiesmanagementdlg_ui.ui index f36c0a707..00a032a79 100644 --- a/kcontrol/kio/kcookiesmanagementdlg_ui.ui +++ b/kcontrol/kio/kcookiesmanagementdlg_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KCookiesManagementDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KCookiesManagementDlgUI</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout6</cstring> </property> @@ -69,7 +69,7 @@ <number>15</number> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>layout4</cstring> </property> @@ -77,7 +77,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbDelete</cstring> </property> @@ -85,7 +85,7 @@ <string>D&elete</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbDeleteAll</cstring> </property> @@ -93,7 +93,7 @@ <string>Delete A&ll</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbPolicy</cstring> </property> @@ -101,7 +101,7 @@ <string>Change &Policy...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbReload</cstring> </property> @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>62</height> @@ -128,7 +128,7 @@ </spacer> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout3</cstring> </property> @@ -136,7 +136,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>tbClearSearchLine</cstring> </property> @@ -147,7 +147,7 @@ <string>Clear Search</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -173,7 +173,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>gbDetails</cstring> </property> @@ -208,7 +208,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lbName</cstring> </property> @@ -219,7 +219,7 @@ <cstring>leName</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lbValue</cstring> </property> @@ -230,7 +230,7 @@ <cstring>leValue</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lbDomain</cstring> </property> @@ -241,7 +241,7 @@ <cstring>leDomain</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lbPath</cstring> </property> @@ -252,7 +252,7 @@ <cstring>lePath</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lbExpires</cstring> </property> @@ -263,7 +263,7 @@ <cstring>leExpires</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>lbSecure</cstring> </property> diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp index 63f4dd21a..163b9b14a 100644 --- a/kcontrol/kio/kcookiespolicies.cpp +++ b/kcontrol/kio/kcookiespolicies.cpp @@ -392,7 +392,7 @@ void KCookiesPolicies::save() while( at ) { - domainConfig.append(TQString::fromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at])); + domainConfig.append(TQString::tqfromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at])); at = at->nextSibling(); } @@ -434,7 +434,7 @@ void KCookiesPolicies::defaults() void KCookiesPolicies::splitDomainAdvice (const TQString& cfg, TQString &domain, KCookieAdvice::Value &advice) { - int sepPos = cfg.findRev(':'); + int sepPos = cfg.tqfindRev(':'); // Ignore any policy that does not contain a domain... if ( sepPos <= 0 ) diff --git a/kcontrol/kio/kcookiespoliciesdlg_ui.ui b/kcontrol/kio/kcookiespoliciesdlg_ui.ui index 435ca8640..230ef9b5f 100644 --- a/kcontrol/kio/kcookiespoliciesdlg_ui.ui +++ b/kcontrol/kio/kcookiespoliciesdlg_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KCookiesPolicyDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KCookiesPolicyDlgUI</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>cbEnableCookies</cstring> </property> @@ -30,7 +30,7 @@ Please note that disabling cookie support might make many web sites unbrowsable. </qt></string> </property> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>bgPreferences</cstring> </property> @@ -41,7 +41,7 @@ Please note that disabling cookie support might make many web sites unbrowsable. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbRejectCrossDomainCookies</cstring> </property> @@ -54,7 +54,7 @@ Reject the so called third-party cookies. These are cookies that originate from </qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbAutoAcceptSessionCookies</cstring> </property> @@ -68,7 +68,7 @@ Automatically accept temporary cookies meant to expire at the end of the current </qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbIgnoreCookieExpirationDate</cstring> </property> @@ -84,7 +84,7 @@ Treat all cookies as session cookies. Session cookies are small pieces of data t </widget> </vbox> </widget> - <widget class="QButtonGroup" row="2" column="0"> + <widget class="TQButtonGroup" row="2" column="0"> <property name="name"> <cstring>bgDefault</cstring> </property> @@ -109,7 +109,7 @@ Determines how cookies received from a remote machine will be handled: <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbPolicyAsk</cstring> </property> @@ -117,7 +117,7 @@ Determines how cookies received from a remote machine will be handled: <string>Ask &for confirmation</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbPolicyAccept</cstring> </property> @@ -125,7 +125,7 @@ Determines how cookies received from a remote machine will be handled: <string>Accep&t all cookies</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbPolicyReject</cstring> </property> @@ -135,7 +135,7 @@ Determines how cookies received from a remote machine will be handled: </widget> </vbox> </widget> - <widget class="QGroupBox" row="3" column="0"> + <widget class="TQGroupBox" row="3" column="0"> <property name="name"> <cstring>gbDomainSpecific</cstring> </property> @@ -161,14 +161,14 @@ To add a new policy, simply click on the <b>Add...</b> button and su <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>layout3</cstring> </property> @@ -176,7 +176,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbNew</cstring> </property> @@ -184,7 +184,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su <string>&New...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbChange</cstring> </property> @@ -192,7 +192,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su <string>Chan&ge...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbDelete</cstring> </property> @@ -200,7 +200,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su <string>D&elete</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbDeleteAll</cstring> </property> @@ -254,7 +254,7 @@ List of sites for which you have set a specific cookie policy. Specific policies </qt></string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout2</cstring> </property> @@ -262,7 +262,7 @@ List of sites for which you have set a specific cookie policy. Specific policies <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>tbClearSearchLine</cstring> </property> @@ -273,7 +273,7 @@ List of sites for which you have set a specific cookie policy. Specific policies <string>Clear Search</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> diff --git a/kcontrol/kio/kenvvarproxydlg.cpp b/kcontrol/kio/kenvvarproxydlg.cpp index 22accb4e9..8d21c7a5b 100644 --- a/kcontrol/kio/kenvvarproxydlg.cpp +++ b/kcontrol/kio/kenvvarproxydlg.cpp @@ -163,16 +163,16 @@ void KEnvVarProxyDlg::autoDetectPressed() setHighLight (mDlg->lbNoProxy, false); // Detect HTTP proxy settings... - found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]); + found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]); // Detect HTTPS proxy settings... - found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]); + found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]); // Detect FTP proxy settings... - found |= autoDetectProxySetting (TQString::fromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]); + found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]); // Detect the NO_PROXY settings... - found |= autoDetectProxySetting (TQString::fromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]); + found |= autoDetectProxySetting (TQString::tqfromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]); if ( !found ) { diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/kio/kmanualproxydlg.cpp index 92e8a98e6..a9c8e6eca 100644 --- a/kcontrol/kio/kmanualproxydlg.cpp +++ b/kcontrol/kio/kmanualproxydlg.cpp @@ -52,7 +52,7 @@ KManualProxyDlg::KManualProxyDlg( TQWidget* parent, const char* name ) mDlg->pbCopyDown->setPixmap( BarIcon("down", KIcon::SizeSmall) ); TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() ); - mDlg->pbCopyDown->setSizePolicy( sizePolicy ); + mDlg->pbCopyDown->tqsetSizePolicy( sizePolicy ); init(); } @@ -337,7 +337,7 @@ bool KManualProxyDlg::handleDuplicate( const TQString& site ) TQListBoxItem* item = mDlg->lbExceptions->firstItem(); while ( item != 0 ) { - if ( item->text().findRev( site ) != -1 && + if ( item->text().tqfindRev( site ) != -1 && item != mDlg->lbExceptions->selectedItem() ) { TQString msg = i18n("You entered a duplicate address. " diff --git a/kcontrol/kio/kproxydlg_ui.ui b/kcontrol/kio/kproxydlg_ui.ui index 1a6b5d6e2..d053707db 100644 --- a/kcontrol/kio/kproxydlg_ui.ui +++ b/kcontrol/kio/kproxydlg_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KProxyDialogUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProxyDlgUI</cstring> </property> @@ -28,7 +28,7 @@ If you are uncertain whether or not you need to use a proxy server to connect to <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>gbConfigure</cstring> </property> @@ -51,7 +51,7 @@ If you are uncertain whether or not you need to use a proxy server to connect to <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbNoProxy</cstring> </property> @@ -65,7 +65,7 @@ If you are uncertain whether or not you need to use a proxy server to connect to <string>Connect to the Internet directly.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbAutoDiscover</cstring> </property> @@ -83,7 +83,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro </qt></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbAutoScript</cstring> </property> @@ -97,7 +97,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro <string>Use the specified proxy script URL to configure the proxy settings.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout5</cstring> </property> @@ -115,7 +115,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -143,7 +143,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout7</cstring> </property> @@ -151,7 +151,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbEnvVar</cstring> </property> @@ -176,7 +176,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX </qt></string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbEnvSetup</cstring> </property> @@ -192,7 +192,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout6</cstring> </property> @@ -200,7 +200,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbManual</cstring> </property> @@ -222,7 +222,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <string>Manually enter proxy server configuration information.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbManSetup</cstring> </property> @@ -240,7 +240,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>gbAuth</cstring> </property> @@ -254,7 +254,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbPrompt</cstring> </property> @@ -268,7 +268,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <string>Prompt for login information whenever it is required.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbPresetLogin</cstring> </property> @@ -282,7 +282,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <string>Use the information below to login into proxy servers as needed.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout5</cstring> </property> @@ -300,7 +300,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -332,7 +332,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <string>Login name.</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lbPassword</cstring> </property> @@ -346,7 +346,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <string>Login password.</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lbUsername</cstring> </property> @@ -364,7 +364,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>gbOptions</cstring> </property> @@ -378,7 +378,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbPersConn</cstring> </property> diff --git a/kcontrol/kio/ksaveioconfig.cpp b/kcontrol/kio/ksaveioconfig.cpp index 50d56d86e..c5c471a9f 100644 --- a/kcontrol/kio/ksaveioconfig.cpp +++ b/kcontrol/kio/ksaveioconfig.cpp @@ -82,7 +82,7 @@ void KSaveIOConfig::reparseConfiguration () void KSaveIOConfig::setReadTimeout( int _timeout ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry("ReadTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } @@ -90,7 +90,7 @@ void KSaveIOConfig::setReadTimeout( int _timeout ) void KSaveIOConfig::setConnectTimeout( int _timeout ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry("ConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } @@ -98,7 +98,7 @@ void KSaveIOConfig::setConnectTimeout( int _timeout ) void KSaveIOConfig::setProxyConnectTimeout( int _timeout ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry("ProxyConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } @@ -106,7 +106,7 @@ void KSaveIOConfig::setProxyConnectTimeout( int _timeout ) void KSaveIOConfig::setResponseTimeout( int _timeout ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry("ResponseTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } @@ -115,7 +115,7 @@ void KSaveIOConfig::setResponseTimeout( int _timeout ) void KSaveIOConfig::setMarkPartial( bool _mode ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry( "MarkPartial", _mode ); cfg->sync(); } @@ -123,7 +123,7 @@ void KSaveIOConfig::setMarkPartial( bool _mode ) void KSaveIOConfig::setMinimumKeepSize( int _size ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry( "MinimumKeepSize", _size ); cfg->sync(); } @@ -131,7 +131,7 @@ void KSaveIOConfig::setMinimumKeepSize( int _size ) void KSaveIOConfig::setAutoResume( bool _mode ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry( "AutoResume", _mode ); cfg->sync(); } @@ -217,7 +217,7 @@ void KSaveIOConfig::setProxyConfigScript( const TQString& _url ) void KSaveIOConfig::setPersistentProxyConnection( bool enable ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry( "PersistentProxyConnection", enable ); cfg->sync(); } @@ -225,7 +225,7 @@ void KSaveIOConfig::setPersistentProxyConnection( bool enable ) void KSaveIOConfig::setPersistentConnections( bool enable ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry( "PersistentConnections", enable ); cfg->sync(); } @@ -234,7 +234,7 @@ void KSaveIOConfig::updateRunningIOSlaves (TQWidget *parent) { // Inform all running io-slaves about the changes... // if we cannot update, ioslaves inform the end user... - if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString::null)) + if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString())) { TQString caption = i18n("Update Failed"); TQString message = i18n("You have to restart the running applications " diff --git a/kcontrol/kio/manualproxy_ui.ui b/kcontrol/kio/manualproxy_ui.ui index 1c8ef8634..ecc061a64 100644 --- a/kcontrol/kio/manualproxy_ui.ui +++ b/kcontrol/kio/manualproxy_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ManualProxyDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ManualProxyDlgUI</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbServers</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lbFtp</cstring> </property> @@ -49,7 +49,7 @@ <cstring>leFtp</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lbHttps</cstring> </property> @@ -68,7 +68,7 @@ <cstring>leHttps</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lbHttp</cstring> </property> @@ -137,7 +137,7 @@ <property name="name"> <cstring>sbHttp</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -160,14 +160,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="3" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>cbSameProxy</cstring> </property> @@ -175,7 +175,7 @@ <string>&Use the same proxy server for all protocols</string> </property> </widget> - <widget class="QPushButton" row="0" column="3"> + <widget class="TQPushButton" row="0" column="3"> <property name="name"> <cstring>pbCopyDown</cstring> </property> @@ -185,7 +185,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbExceptions</cstring> </property> @@ -196,7 +196,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbReverseProxy</cstring> </property> @@ -209,7 +209,7 @@ Reverse the use of the exception list. Checking this box will result in the prox </qt></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -217,7 +217,7 @@ Reverse the use of the exception list. Checking this box will result in the prox <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>pbDeleteAll</cstring> </property> @@ -231,7 +231,7 @@ Reverse the use of the exception list. Checking this box will result in the prox <string>Remove all proxy exception addresses from the list.</string> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>pbDelete</cstring> </property> @@ -245,7 +245,7 @@ Reverse the use of the exception list. Checking this box will result in the prox <string>Remove the selected proxy exception address from the list.</string> </property> </widget> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>pbNew</cstring> </property> @@ -256,7 +256,7 @@ Reverse the use of the exception list. Checking this box will result in the prox <string>Add new proxy exception address to the list.</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>pbChange</cstring> </property> @@ -280,7 +280,7 @@ Reverse the use of the exception list. Checking this box will result in the prox <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>114</height> diff --git a/kcontrol/kio/policydlg.cpp b/kcontrol/kio/policydlg.cpp index 463806266..316fd7e80 100644 --- a/kcontrol/kio/policydlg.cpp +++ b/kcontrol/kio/policydlg.cpp @@ -30,7 +30,7 @@ #include "policydlg_ui.h" -class DomainLineValidator : public QValidator +class DomainLineValidator : public TQValidator { public: DomainLineValidator(TQObject *parent) @@ -63,14 +63,14 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent, m_dlgUI = new PolicyDlgUI (this); setMainWidget(m_dlgUI); - m_dlgUI->leDomain->setValidator(new DomainLineValidator(m_dlgUI->leDomain)); + m_dlgUI->leDomain->setValidator(new DomainLineValidator(TQT_TQOBJECT(m_dlgUI->leDomain))); m_dlgUI->cbPolicy->setMinimumWidth( m_dlgUI->cbPolicy->fontMetrics().maxWidth() * 25 ); enableButtonOK( false ); connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged(const TQString&))); - setFixedSize (sizeHint()); + setFixedSize (tqsizeHint()); m_dlgUI->leDomain->setFocus (); } diff --git a/kcontrol/kio/policydlg.h b/kcontrol/kio/policydlg.h index 2bf7a4c99..17616860f 100644 --- a/kcontrol/kio/policydlg.h +++ b/kcontrol/kio/policydlg.h @@ -52,11 +52,11 @@ public: if (advice.isEmpty()) return KCookieAdvice::Dunno; - if (advice.find (TQString::fromLatin1("accept"), 0, false) == 0) + if (advice.tqfind (TQString::tqfromLatin1("accept"), 0, false) == 0) return KCookieAdvice::Accept; - else if (advice.find (TQString::fromLatin1("reject"), 0, false) == 0) + else if (advice.tqfind (TQString::tqfromLatin1("reject"), 0, false) == 0) return KCookieAdvice::Reject; - else if (advice.find (TQString::fromLatin1("ask"), 0, false) == 0) + else if (advice.tqfind (TQString::tqfromLatin1("ask"), 0, false) == 0) return KCookieAdvice::Ask; return KCookieAdvice::Dunno; diff --git a/kcontrol/kio/policydlg_ui.ui b/kcontrol/kio/policydlg_ui.ui index 1bae63208..015359829 100644 --- a/kcontrol/kio/policydlg_ui.ui +++ b/kcontrol/kio/policydlg_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>PolicyDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PolicyDlgUI</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lbDomain</cstring> </property> @@ -45,7 +45,7 @@ Enter the host or domain to which this policy applies, e.g. <b>www.kde.org </qt></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lbPolicy</cstring> </property> diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp index 90dfd9170..e5337cbf2 100644 --- a/kcontrol/kio/smbrodlg.cpp +++ b/kcontrol/kio/smbrodlg.cpp @@ -101,7 +101,7 @@ void SMBRoOptions::load() // TQStringList _strList = KGlobal::charsets()->availableEncodingNames(); // TQString m_encoding = TQTextCodec::codecForLocale()->name(); -// m_encodingList->setCurrentItem( _strList.findIndex( cfg->readEntry( "Encoding", m_encoding.lower() ) ) ); +// m_encodingList->setCurrentItem( _strList.tqfindIndex( cfg->readEntry( "Encoding", m_encoding.lower() ) ) ); // unscramble TQString scrambled = cfg->readEntry( "Password" ); @@ -140,7 +140,7 @@ void SMBRoOptions::save() for (uint i=0; i<password.length(); i++) { TQChar c = password[i]; - unsigned int num = (c.unicode() ^ 173) + 17; + unsigned int num = (c.tqunicode() ^ 173) + 17; unsigned int a1 = (num & 0xFC00) >> 10; unsigned int a2 = (num & 0x3E0) >> 5; unsigned int a3 = (num & 0x1F); diff --git a/kcontrol/kio/socksbase.ui b/kcontrol/kio/socksbase.ui index 5def84076..3065ab229 100644 --- a/kcontrol/kio/socksbase.ui +++ b/kcontrol/kio/socksbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SocksBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SocksBase</cstring> </property> @@ -26,7 +26,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_c_enableSocks</cstring> </property> @@ -37,7 +37,7 @@ <string>Check this to enable SOCKS4 and SOCKS5 support in KDE applications and I/O subsystems.</string> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>bg</cstring> </property> @@ -51,7 +51,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>_c_detect</cstring> </property> @@ -65,7 +65,7 @@ <string>If you select Autodetect, then KDE will automatically search for an implementation of SOCKS on your computer.</string> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>_c_NEC</cstring> </property> @@ -79,7 +79,7 @@ <string>This will force KDE to use NEC SOCKS if it can be found.</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>_c_custom</cstring> </property> @@ -93,7 +93,7 @@ <string>Select custom if you wish to use an unlisted SOCKS library. Please note that this may not always work as it depends on the API of the library which you specify (below).</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -101,7 +101,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>_c_customLabel</cstring> </property> @@ -127,7 +127,7 @@ <property name="name"> <cstring>_c_customPath</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -139,7 +139,7 @@ </widget> </hbox> </widget> - <widget class="QRadioButton" row="0" column="2"> + <widget class="TQRadioButton" row="0" column="2"> <property name="name"> <cstring>_c_Dante</cstring> </property> @@ -155,7 +155,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>_c_addPaths</cstring> </property> @@ -180,7 +180,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Path</string> @@ -211,14 +211,14 @@ <property name="name"> <cstring>_c_newPath</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>25</height> </size> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -236,14 +236,14 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_c_add</cstring> </property> @@ -251,7 +251,7 @@ <string>&Add</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_c_remove</cstring> </property> @@ -263,7 +263,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -281,14 +281,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_c_test</cstring> </property> diff --git a/kcontrol/kio/uagentproviderdlg.cpp b/kcontrol/kio/uagentproviderdlg.cpp index 9e945948d..adab4b611 100644 --- a/kcontrol/kio/uagentproviderdlg.cpp +++ b/kcontrol/kio/uagentproviderdlg.cpp @@ -47,7 +47,7 @@ void UALineEdit::keyPressEvent( TQKeyEvent* e ) TQString keycode = e->text(); if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period || (cursorPosition() > 0 && key == Qt::Key_Minus) || - (!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) ) + (!keycode.isEmpty() && keycode.tqunicode()->isLetterOrNumber()) ) { KLineEdit::keyPressEvent(e); return; @@ -121,7 +121,7 @@ void UAProviderDlg::setSiteName( const TQString& text ) void UAProviderDlg::setIdentity( const TQString& text ) { - int id = dlg->cbAlias->listBox()->index( dlg->cbAlias->listBox()->findItem(text) ); + int id = dlg->cbAlias->listBox()->index( dlg->cbAlias->listBox()->tqfindItem(text) ); dlg->cbAlias->setCurrentItem( id ); slotActivated( dlg->cbAlias->currentText() ); if ( !dlg->leSite->isEnabled() ) diff --git a/kcontrol/kio/uagentproviderdlg_ui.ui b/kcontrol/kio/uagentproviderdlg_ui.ui index 6f2a006ec..7bf590208 100644 --- a/kcontrol/kio/uagentproviderdlg_ui.ui +++ b/kcontrol/kio/uagentproviderdlg_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>UAProviderDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>UAProviderDlgUI</cstring> </property> @@ -24,7 +24,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lbSite</cstring> </property> @@ -52,7 +52,7 @@ Enter the site or domain name where a fake browser identification should be used </qt></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lbAlias</cstring> </property> @@ -78,7 +78,7 @@ Select the browser identification to use whenever contacting the site you specif </qt></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lbIdentity</cstring> </property> @@ -117,14 +117,14 @@ The actual browser identification text that will be sent to the remote machine. <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="8" column="0"> + <widget class="TQLayoutWidget" row="8" column="0"> <property name="name"> <cstring>layout3</cstring> </property> @@ -142,14 +142,14 @@ The actual browser identification text that will be sent to the remote machine. <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>29</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbOk</cstring> </property> @@ -160,7 +160,7 @@ The actual browser identification text that will be sent to the remote machine. <string>&OK</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbCancel</cstring> </property> diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp index c34d5cadc..26476d9a8 100644 --- a/kcontrol/kio/useragentdlg.cpp +++ b/kcontrol/kio/useragentdlg.cpp @@ -111,12 +111,12 @@ void UserAgentDlg::load() dlg->cbSendUAString->setChecked( b ); m_ua_keys = m_config->readEntry("UserAgentKeys", DEFAULT_USER_AGENT_KEYS).lower(); dlg->leDefaultId->setSqueezedText( KProtocolManager::defaultUserAgent( m_ua_keys ) ); - dlg->cbOS->setChecked( m_ua_keys.contains('o') ); - dlg->cbOSVersion->setChecked( m_ua_keys.contains('v') ); - dlg->cbOSVersion->setEnabled( m_ua_keys.contains('o') ); - dlg->cbPlatform->setChecked( m_ua_keys.contains('p') ); - dlg->cbProcessorType->setChecked( m_ua_keys.contains('m') ); - dlg->cbLanguage->setChecked( m_ua_keys.contains('l') ); + dlg->cbOS->setChecked( m_ua_keys.tqcontains('o') ); + dlg->cbOSVersion->setChecked( m_ua_keys.tqcontains('v') ); + dlg->cbOSVersion->setEnabled( m_ua_keys.tqcontains('o') ); + dlg->cbPlatform->setChecked( m_ua_keys.tqcontains('p') ); + dlg->cbProcessorType->setChecked( m_ua_keys.tqcontains('m') ); + dlg->cbLanguage->setChecked( m_ua_keys.tqcontains('l') ); updateButtons(); emit changed( false ); } @@ -135,12 +135,12 @@ void UserAgentDlg::defaults() dlg->lvDomainPolicyList->clear(); m_ua_keys = DEFAULT_USER_AGENT_KEYS; dlg->leDefaultId->setSqueezedText( KProtocolManager::defaultUserAgent(m_ua_keys) ); - dlg->cbOS->setChecked( m_ua_keys.contains('o') ); - dlg->cbOSVersion->setChecked( m_ua_keys.contains('v') ); - dlg->cbOSVersion->setEnabled( m_ua_keys.contains('o') ); - dlg->cbPlatform->setChecked( m_ua_keys.contains('p') ); - dlg->cbProcessorType->setChecked( m_ua_keys.contains('m') ); - dlg->cbLanguage->setChecked( m_ua_keys.contains('l') ); + dlg->cbOS->setChecked( m_ua_keys.tqcontains('o') ); + dlg->cbOSVersion->setChecked( m_ua_keys.tqcontains('v') ); + dlg->cbOSVersion->setEnabled( m_ua_keys.tqcontains('o') ); + dlg->cbPlatform->setChecked( m_ua_keys.tqcontains('p') ); + dlg->cbProcessorType->setChecked( m_ua_keys.tqcontains('m') ); + dlg->cbLanguage->setChecked( m_ua_keys.tqcontains('l') ); dlg->cbSendUAString->setChecked( true ); updateButtons(); configChanged(); @@ -351,7 +351,7 @@ void UserAgentDlg::changeDefaultUAModifiers( int ) if ( dlg->cbLanguage->isChecked() ) m_ua_keys += 'l'; - dlg->cbOSVersion->setEnabled(m_ua_keys.contains('o')); + dlg->cbOSVersion->setEnabled(m_ua_keys.tqcontains('o')); TQString modVal = KProtocolManager::defaultUserAgent( m_ua_keys ); if ( dlg->leDefaultId->text() != modVal ) diff --git a/kcontrol/kio/useragentdlg_ui.ui b/kcontrol/kio/useragentdlg_ui.ui index 0db2a2440..73b9dfd2e 100644 --- a/kcontrol/kio/useragentdlg_ui.ui +++ b/kcontrol/kio/useragentdlg_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>UserAgentDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>UserAgentDlgUI</cstring> </property> @@ -25,7 +25,7 @@ To add a new site specific identification text, click the <code>New</co <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbSendUAString</cstring> </property> @@ -43,7 +43,7 @@ By default, only minimal identification information is sent to remote sites. The </qt></string> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>gbDefaultId</cstring> </property> @@ -88,7 +88,7 @@ By default, only minimal identification information is sent to remote sites. The <string>The browser identification text sent to the sites you visit. You can customize it using the options provided below.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbOS</cstring> </property> @@ -99,7 +99,7 @@ By default, only minimal identification information is sent to remote sites. The <string>Includes your operating system's name in the browser identification text.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -117,14 +117,14 @@ By default, only minimal identification information is sent to remote sites. The <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbOSVersion</cstring> </property> @@ -140,7 +140,7 @@ By default, only minimal identification information is sent to remote sites. The </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbPlatform</cstring> </property> @@ -151,7 +151,7 @@ By default, only minimal identification information is sent to remote sites. The <string>Includes your platform type in the browser identification text</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbProcessorType</cstring> </property> @@ -162,7 +162,7 @@ By default, only minimal identification information is sent to remote sites. The <string>Includes your machine's CPU type in the browser identification text.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbLanguage</cstring> </property> @@ -175,7 +175,7 @@ By default, only minimal identification information is sent to remote sites. The </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbDomainPolicy</cstring> </property> @@ -248,7 +248,7 @@ By default, only minimal identification information is sent to remote sites. The <string>List of sites for which the specified identification text will be used instead of the default one.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout1</cstring> </property> @@ -256,7 +256,7 @@ By default, only minimal identification information is sent to remote sites. The <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbNew</cstring> </property> @@ -267,7 +267,7 @@ By default, only minimal identification information is sent to remote sites. The <string>Add new identification text for a site.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbChange</cstring> </property> @@ -278,7 +278,7 @@ By default, only minimal identification information is sent to remote sites. The <string>Change the selected identifier text.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbDelete</cstring> </property> @@ -289,7 +289,7 @@ By default, only minimal identification information is sent to remote sites. The <string>Delete the selected identifier text.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbDeleteAll</cstring> </property> @@ -310,7 +310,7 @@ By default, only minimal identification information is sent to remote sites. The <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>16</height> diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index edfa28e48..f229e7f24 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -298,7 +298,7 @@ void PlayerSettingsDialog::slotApply() save(); dataChanged = false; enableButton(Apply, false); - kapp->dcopClient()->send("knotify", "", "reconfigure()", ""); + kapp->dcopClient()->send("knotify", "", "reconfigure()", TQString("")); KDialogBase::slotApply(); } diff --git a/kcontrol/knotify/playersettings.ui b/kcontrol/knotify/playersettings.ui index f990fc995..9eaad64af 100644 --- a/kcontrol/knotify/playersettings.ui +++ b/kcontrol/knotify/playersettings.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>PlayerSettingsUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PlayerSettingsUI</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -41,7 +41,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>grpPlayers</cstring> </property> @@ -58,7 +58,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQRadioButton" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>cbNone</cstring> </property> @@ -66,7 +66,7 @@ <string>&No audio output</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>cbExternal</cstring> </property> @@ -84,14 +84,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>layout5</cstring> </property> @@ -109,14 +109,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>layout4</cstring> </property> @@ -140,14 +140,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>233</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -155,7 +155,7 @@ <string>100%</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -163,7 +163,7 @@ <string>0%</string> </property> </widget> - <widget class="QSlider" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>volumeSlider</cstring> </property> @@ -182,7 +182,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -205,14 +205,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>cbArts</cstring> </property> @@ -223,7 +223,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -265,7 +265,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index af6c12cc4..c68ac6681 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -58,7 +58,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget * winPixmap->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); winPixmap->setPixmap(TQPixmap(locate("data", "kcontrol/pics/onlyone.png"))); - winPixmap->setFixedSize( winPixmap->sizeHint() ); + winPixmap->setFixedSize( winPixmap->tqsizeHint() ); // ---- @@ -103,7 +103,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget * TQHBox *hboxpreview = new TQHBox(vbox); TQWidget* spacer = new TQWidget( hboxpreview ); spacer->setMinimumSize( 20, 0 ); - spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); + spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview ); connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index 98275995c..e7d333537 100644 --- a/kcontrol/konq/desktop.cpp +++ b/kcontrol/konq/desktop.cpp @@ -87,7 +87,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) // name group TQGroupBox *name_group = new TQGroupBox(i18n("Desktop &Names"), this); - name_group->setColumnLayout(4, Horizontal); + name_group->setColumnLayout(4, Qt::Horizontal); for(int i = 0; i < (maxDesktops/2); i++) { diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui index 6e614b022..12537d56a 100644 --- a/kcontrol/konq/desktopbehavior.ui +++ b/kcontrol/konq/desktopbehavior.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>DesktopBehaviorBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DesktopBehaviorBase</cstring> </property> @@ -22,11 +22,11 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>behaviorTab</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -37,7 +37,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>iconsEnabledBox</cstring> </property> @@ -56,7 +56,7 @@ <string>Uncheck this option if you do not want to have icons on the desktop. Without icons the desktop will be somewhat faster but you will no longer be able to drag files to the desktop.</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>layout1</cstring> </property> @@ -74,14 +74,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>vrootBox</cstring> </property> @@ -97,7 +97,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>toolTipBox</cstring> </property> @@ -105,7 +105,7 @@ <string>Show &tooltips</string> </property> </widget> - <widget class="QButtonGroup" row="3" column="0"> + <widget class="TQButtonGroup" row="3" column="0"> <property name="name"> <cstring>desktopMenuGroup</cstring> </property> @@ -116,7 +116,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton1</cstring> </property> @@ -127,7 +127,7 @@ <string>If this option is selected, there is no menu bar at the top of the screen.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton1_2</cstring> </property> @@ -138,7 +138,7 @@ <string>If this option is selected, there is one menu bar at the top of the screen which shows the desktop menus.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton1_3</cstring> </property> @@ -151,7 +151,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="4" column="0"> + <widget class="TQGroupBox" row="4" column="0"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -162,7 +162,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>middleLabel</cstring> </property> @@ -170,7 +170,7 @@ <string>Middle button:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>leftLabel</cstring> </property> @@ -178,7 +178,7 @@ <string>Left button:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>rightLabel</cstring> </property> @@ -186,7 +186,7 @@ <string>Right button:</string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <property name="name"> <cstring>rightComboBox</cstring> </property> @@ -199,7 +199,7 @@ </sizepolicy> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>leftComboBox</cstring> </property> @@ -212,7 +212,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>leftEditButton</cstring> </property> @@ -223,7 +223,7 @@ <string>Edit...</string> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>middleComboBox</cstring> </property> @@ -236,7 +236,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>middleEditButton</cstring> </property> @@ -247,7 +247,7 @@ <string>Edit...</string> </property> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>rightEditButton</cstring> </property> @@ -268,7 +268,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>191</width> <height>80</height> @@ -287,7 +287,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -296,7 +296,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -307,7 +307,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>autoLineupIconsBox</cstring> </property> @@ -318,7 +318,7 @@ <string>Check this option if you want to see your icons automatically aligned to the grid when you move them.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>showHiddenBox</cstring> </property> @@ -354,7 +354,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -365,7 +365,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>enableMediaBox</cstring> </property> diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 6b4aaadb0..ab84300d4 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -60,7 +60,7 @@ void DesktopBehaviorModule::changed() emit KCModule::changed( true ); } -class DesktopBehaviorPreviewItem : public QCheckListItem +class DesktopBehaviorPreviewItem : public TQCheckListItem { public: DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, TQListView *parent, @@ -90,7 +90,7 @@ private: }; -class DesktopBehaviorMediaItem : public QCheckListItem +class DesktopBehaviorMediaItem : public TQCheckListItem { public: DesktopBehaviorMediaItem(DesktopBehavior *rootOpts, TQListView *parent, @@ -124,7 +124,7 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * */ bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); - m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media")); + m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media")); connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed())); connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); @@ -144,8 +144,8 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * if ( leftHandedMouse ) { - qSwap(strMouseButton1, strMouseButton3); - qSwap(strButtonTxt1, strButtonTxt3); + tqSwap(strMouseButton1, strMouseButton3); + tqSwap(strButtonTxt1, strButtonTxt3); } leftLabel->setText( strMouseButton1 ); @@ -259,7 +259,7 @@ void DesktopBehavior::fillMediaListView() for (; it2 != mimetypes.end(); ++it2) { if ( ((*it2)->name().startsWith("media/")) ) { - bool ok=excludedMedia.contains((*it2)->name())==0; + bool ok=excludedMedia.tqcontains((*it2)->name())==0; new DesktopBehaviorMediaItem (this, mediaListView, (*it2)->comment(), (*it2)->name(),ok); } } @@ -309,8 +309,8 @@ void DesktopBehavior::load( bool useDefaults ) previewListView->clear(); TQStringList previews = g_pConfig->readListEntry("Preview"); for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) - new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName())); - new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/")); + new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.tqcontains((*it)->desktopEntryName())); + new DesktopBehaviorPreviewItem(this, previewListView, previews.tqcontains("audio/")); // g_pConfig->setGroup( "FMSettings" ); toolTipBox->setChecked(g_pConfig->readBoolEntry( "ShowFileTips", true ) ); diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index 98c804adc..07ee4663e 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -94,7 +94,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop, m_pNormalText = new KColorButton( normalTextColor, this ); label = new TQLabel( m_pNormalText, i18n("Normal te&xt color:"), this ); lay->addWidget(label,row,0); - lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,hAlign); + lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,(TQ_Alignment)hAlign); wtstr = i18n("This is the color used to display text in Konqueror windows."); TQWhatsThis::add( label, wtstr ); @@ -129,7 +129,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop, TQT_SLOT( slotTextBackgroundClicked() ) ); m_pTextBackground = new KColorButton( textBackgroundColor, this ); - lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,hAlign); + lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(TQ_Alignment)hAlign); wtstr = i18n("This is the color used behind the text for the icons on the desktop."); TQWhatsThis::add( label, wtstr ); @@ -179,7 +179,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop, } cbUnderline = new TQCheckBox(i18n("&Underline filenames"), this); - lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,hAlign); + lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign); connect(cbUnderline, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); TQWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames" @@ -192,7 +192,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop, row++; m_pSizeInBytes = new TQCheckBox(i18n("Display file sizes in b&ytes"), this); - lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,hAlign ); + lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign ); connect( m_pSizeInBytes, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()) ); TQWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes" diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index 0e3ea0861..cbe4d40a7 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -39,7 +39,7 @@ //----------------------------------------------------------------------------- -class PreviewCheckListItem : public QCheckListItem +class PreviewCheckListItem : public TQCheckListItem { public: PreviewCheckListItem( TQListView *parent, const TQString &text ) @@ -198,7 +198,7 @@ void KPreviewOptions::save() group.writeEntry( protocol, it.current()->isOn(), true, true ); } // config key is in bytes, numinput is in MB - group.writeEntry( "MaximumSize", qRound( m_maxSize->value() *1024*1024 ), true, true ); + group.writeEntry( "MaximumSize", tqRound( m_maxSize->value() *1024*1024 ), true, true ); group.writeEntry( "BoostSize", m_boostSize->isChecked(), true, true ); group.writeEntry( "UseFileThumbnails", m_useFileThumbnails->isChecked(), true, true ); group.sync(); diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index f4111cfda..4576433a9 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -286,7 +286,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt KIO::ListJob* job = KIO::listDir( src ); connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ), this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) ); - qApp->enter_loop(); + tqApp->enter_loop(); if (m_ok) { @@ -298,7 +298,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt KIO::Job * job = KIO::move( src, dest ); connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); // wait for job - qApp->enter_loop(); + tqApp->enter_loop(); } } kdDebug() << "DesktopPathConfig::slotResult returning " << m_ok << endl; @@ -325,9 +325,9 @@ void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& li KIO::Job * moveJob = KIO::move( file.url(), m_copyToDest ); connect( moveJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); - qApp->enter_loop(); + tqApp->enter_loop(); } - qApp->exit_loop(); + tqApp->exit_loop(); } void DesktopPathConfig::slotResult( KIO::Job * job ) @@ -341,7 +341,7 @@ void DesktopPathConfig::slotResult( KIO::Job * job ) job->showErrorDialog(this); } - qApp->exit_loop(); + tqApp->exit_loop(); } #include "rootopts.moc" diff --git a/kcontrol/konqhtml/advancedTabOptions.ui b/kcontrol/konqhtml/advancedTabOptions.ui index 7116bc1ee..5df531f10 100644 --- a/kcontrol/konqhtml/advancedTabOptions.ui +++ b/kcontrol/konqhtml/advancedTabOptions.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>advancedTabOptions</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>advancedTabOptions</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -41,7 +41,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout</cstring> </property> @@ -49,7 +49,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_pNewTabsInBackground</cstring> </property> @@ -60,7 +60,7 @@ <string>This will open a new tab in the background, instead of in the foreground.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_pOpenAfterCurrentPage</cstring> </property> @@ -71,7 +71,7 @@ <string>This will open a new tab opened from a page after the current tab, instead of after the last tab.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_pTabConfirm</cstring> </property> @@ -82,7 +82,7 @@ <string>This will ask you whether you are sure you want to close a window when it has multiple tabs opened in it.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_pPermanentCloseButton</cstring> </property> @@ -93,7 +93,7 @@ <string>This will display close buttons inside each tab instead of websites' icons.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_pPopupsWithinTabs</cstring> </property> @@ -104,7 +104,7 @@ <string>Whether or not JavaScript popups if allowed shall open in a new tab or in a new window.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_pTabCloseActivatePrevious</cstring> </property> @@ -115,7 +115,7 @@ <string>When checking this the previous used or opened tab will be activated when you close the current active tab instead of the one right to the current tab.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_pKonquerorTabforExternalURL</cstring> </property> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index 0c15acebe..8c832e770 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -40,7 +40,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget int r = 0; int E = 0, M = 1, W = 3; //CT 3 (instead 2) allows smaller color buttons - TQGroupBox* gb = new TQGroupBox( 1, TQGroupBox::Horizontal, i18n("Font Si&ze"), this ); + TQGroupBox* gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Font Si&ze"), this ); lay->addMultiCellWidget(gb, r, r, E, W); TQWhatsThis::add( gb, i18n("This is the relative font size Konqueror uses to display web sites.") ); @@ -231,7 +231,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget TQFontDatabase db; - m_families = db.families(); + m_families = db.tqfamilies(); m_pFonts[0]->setFonts( m_families ); m_pFonts[1]->setFonts( m_families ); diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index 29dccb14b..a2c7ceb53 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -39,7 +39,7 @@ DomainListView::DomainListView(KConfig *config,const TQString &title, layout()->setSpacing(0); layout()->setMargin(0); TQGridLayout* thisLayout = new TQGridLayout(layout()); - thisLayout->setAlignment(Qt::AlignTop); + thisLayout->tqsetAlignment(Qt::AlignTop); thisLayout->setSpacing(KDialog::spacingHint()); thisLayout->setMargin(KDialog::marginHint()); @@ -163,7 +163,7 @@ void DomainListView::deletePressed() return; } - DomainPolicyMap::Iterator it = domainPolicies.find(index); + DomainPolicyMap::Iterator it = domainPolicies.tqfind(index); if (it != domainPolicies.end()) { delete it.data(); domainPolicies.remove(it); diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp index 79ab4d45a..c7bb2bdbd 100644 --- a/kcontrol/konqhtml/filteropts.cpp +++ b/kcontrol/konqhtml/filteropts.cpp @@ -55,7 +55,7 @@ KCMFilter::KCMFilter(KConfig *config, TQString group, mKillCheck = new TQCheckBox(i18n("Hide filtered images"), this); topLayout->addWidget( mKillCheck ); - TQGroupBox *topBox = new TQGroupBox( 1, Horizontal, i18n("URL Expressions to Filter"), this ); + TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("URL Expressions to Filter"), this ); topLayout->addWidget( topBox ); mListBox = new TQListBox( topBox ); @@ -189,7 +189,7 @@ void KCMFilter::importFilters() } } - if (!line.isEmpty() && mListBox->findItem(line, Qt::CaseSensitive|Qt::ExactMatch) == 0) + if (!line.isEmpty() && mListBox->tqfindItem(line, TQt::CaseSensitive|TQt::ExactMatch) == 0) paths.append(line); } f.close(); @@ -267,7 +267,7 @@ void KCMFilter::load( bool useDefaults ) for (int i=0; i<num; ++i) { TQString key = "Filter-" + TQString::number(i); - it = entryMap.find(key); + it = entryMap.tqfind(key); if (it != entryMap.end()) paths.append(it.data()); } diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp index 3cca58732..e6a6c59bb 100644 --- a/kcontrol/konqhtml/htmlopts.cpp +++ b/kcontrol/konqhtml/htmlopts.cpp @@ -81,7 +81,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa // Tabbed Browsing TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this ); - TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint() ); + TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->tqlayout(), KDialog::spacingHint() ); m_pShowMMBInTabs = new TQCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing ); TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, " @@ -108,7 +108,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa TQVGroupBox *bgMouse = new TQVGroupBox( i18n("Mouse Beha&vior"), this ); m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse ); - TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change " + TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the tqshape of the cursor will change " "(usually to a hand) if it is moved over a hyperlink.") ); connect(m_cbCursor, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp index ae73fc686..e50224f53 100644 --- a/kcontrol/konqhtml/jsopts.cpp +++ b/kcontrol/konqhtml/jsopts.cpp @@ -45,7 +45,7 @@ KJavaScriptOptions::KJavaScriptOptions( KConfig* config, TQString group, TQWidge TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10, 5 ); // the global checkbox - TQGroupBox* globalGB = new TQGroupBox( 2, Vertical, i18n( "Global Settings" ), this ); + TQGroupBox* globalGB = new TQGroupBox( 2, Qt::Vertical, i18n( "Global Settings" ), this ); toplevel->addWidget( globalGB ); enableJavaScriptGloballyCB = new TQCheckBox( i18n( "Ena&ble JavaScript globally" ), globalGB ); diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp index 5196af8dd..eeedca18a 100644 --- a/kcontrol/konqhtml/jspolicies.cpp +++ b/kcontrol/konqhtml/jspolicies.cpp @@ -136,7 +136,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, layout()->setSpacing(0); layout()->setMargin(0); TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2); - this_layout->setAlignment(Qt::AlignTop); + this_layout->tqsetAlignment(Qt::AlignTop); this_layout->setSpacing(3); this_layout->setMargin(11); @@ -362,19 +362,19 @@ JSPoliciesFrame::~JSPoliciesFrame() { void JSPoliciesFrame::refresh() { TQRadioButton *button; - button = static_cast<TQRadioButton *>(js_popup->find( + button = static_cast<TQRadioButton *>(js_popup->tqfind( policies->window_open)); if (button != 0) button->setChecked(true); - button = static_cast<TQRadioButton *>(js_resize->find( + button = static_cast<TQRadioButton *>(js_resize->tqfind( policies->window_resize)); if (button != 0) button->setChecked(true); - button = static_cast<TQRadioButton *>(js_move->find( + button = static_cast<TQRadioButton *>(js_move->tqfind( policies->window_move)); if (button != 0) button->setChecked(true); - button = static_cast<TQRadioButton *>(js_focus->find( + button = static_cast<TQRadioButton *>(js_focus->tqfind( policies->window_focus)); if (button != 0) button->setChecked(true); - button = static_cast<TQRadioButton *>(js_statusbar->find( + button = static_cast<TQRadioButton *>(js_statusbar->tqfind( policies->window_status)); if (button != 0) button->setChecked(true); } diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui index d772595c2..23e4ac881 100644 --- a/kcontrol/konqhtml/nsconfigwidget.ui +++ b/kcontrol/konqhtml/nsconfigwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>NSConfigWidget</class> <author>Stefan Schimanski <[email protected]></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>NSConfigWidget</cstring> </property> @@ -28,11 +28,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>TabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -43,7 +43,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -51,7 +51,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>scanButton</cstring> </property> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -81,7 +81,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>scanAtStartup</cstring> </property> @@ -92,11 +92,11 @@ <string>If this option is enabled, KDE will look for new Netscape plugins every time it starts up. This makes it easier for you if you often install new plugins, but it may also slow down KDE startup. You might want to disable this option, especially if you seldom install plugins.</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>0</height> @@ -109,7 +109,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>dirRemove</cstring> </property> @@ -120,7 +120,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>dirNew</cstring> </property> @@ -139,7 +139,7 @@ <number>18</number> </property> </widget> - <widget class="QPushButton" row="3" column="2"> + <widget class="TQPushButton" row="3" column="2"> <property name="name"> <cstring>dirDown</cstring> </property> @@ -150,7 +150,7 @@ <string>Do&wn</string> </property> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>dirUp</cstring> </property> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -195,7 +195,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -206,7 +206,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="1" column="0"> + <widget class="TQListView" row="1" column="0"> <column> <property name="text"> <string>Information</string> @@ -239,7 +239,7 @@ <string>Here you can see a list of the Netscape plugins KDE has found.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>useArtsdsp</cstring> </property> @@ -264,7 +264,7 @@ <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> - <includehint>qwidget.h</includehint> + <includehint>tqwidget.h</includehint> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index d5cd4cc2b..8640a9991 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -61,8 +61,8 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren enablePluginsGloballyCB = new TQCheckBox( i18n( "&Enable plugins globally" ), globalGB ); enableHTTPOnly = new TQCheckBox( i18n( "Only allow &HTTP and HTTPS URLs for plugins" ), globalGB ); enableUserDemand = new TQCheckBox( i18n( "&Load plugins on demand only" ), globalGB ); - priorityLabel = new TQLabel(i18n("CPU priority for plugins: %1").arg(TQString::null), globalGB); - priority = new TQSlider(5, 100, 5, 100, Horizontal, globalGB); + priorityLabel = new TQLabel(i18n("CPU priority for plugins: %1").arg(TQString()), globalGB); + priority = new TQSlider(5, 100, 5, 100, Qt::Horizontal, globalGB); connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTogglePluginsEnabled() ) ); connect( enableHTTPOnly, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); @@ -72,14 +72,14 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren TQFrame *hrule = new TQFrame(globalGB); hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - hrule->setSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed); + hrule->tqsetSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed); /************************************************************************** ********************* Domain-specific Settings *************************** *************************************************************************/ TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"), globalGB); - domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + domainSpecPB->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg())); domainSpecificDlg = new KDialogBase(KDialogBase::Swallow, @@ -282,7 +282,7 @@ void KPluginOptions::scan() int ret = KMessageBox::warningYesNoCancel( this, i18n("Do you want to apply your changes " "before the scan? Otherwise the " - "changes will be lost."), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() ); + "changes will be lost."), TQString(), KStdGuiItem::save(), KStdGuiItem::discard() ); if ( ret==KMessageBox::Cancel ) { m_widget->scanButton->setEnabled(true); return; @@ -430,16 +430,16 @@ void KPluginOptions::dirSelect( TQListBoxItem *item ) unsigned cur = m_widget->dirList->index(m_widget->dirList->selectedItem()); m_widget->dirDown->setEnabled( item!=0 && cur<m_widget->dirList->count()-1 ); m_widget->dirUp->setEnabled( item!=0 && cur>0 ); - m_widget->dirEdit->setURL( item!=0 ? item->text() : TQString::null ); + m_widget->dirEdit->setURL( item!=0 ? item->text() : TQString() ); } void KPluginOptions::dirNew() { - m_widget->dirList->insertItem( TQString::null, 0 ); + m_widget->dirList->insertItem( TQString(), 0 ); m_widget->dirList->setCurrentItem( 0 ); dirSelect( m_widget->dirList->selectedItem() ); - m_widget->dirEdit->setURL(TQString::null); + m_widget->dirEdit->setURL(TQString()); m_widget->dirEdit->setFocus(); change(); } @@ -447,7 +447,7 @@ void KPluginOptions::dirNew() void KPluginOptions::dirRemove() { - m_widget->dirEdit->setURL(TQString::null); + m_widget->dirEdit->setURL(TQString()); delete m_widget->dirList->selectedItem(); m_widget->dirRemove->setEnabled( false ); m_widget->dirUp->setEnabled( false ); diff --git a/kcontrol/konsole/kcmkonsoledialog.ui b/kcontrol/konsole/kcmkonsoledialog.ui index bb805ed4b..c6b5c04cb 100644 --- a/kcontrol/konsole/kcmkonsoledialog.ui +++ b/kcontrol/konsole/kcmkonsoledialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KCMKonsoleDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KCMKonsoleDialog</cstring> </property> @@ -23,7 +23,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>TabWidget2</cstring> </property> @@ -34,7 +34,7 @@ </property> <property name="layoutSpacing" stdset="0"> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -55,14 +55,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -73,7 +73,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -84,7 +84,7 @@ <cstring>word_connectorLE</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="0"> + <widget class="TQLineEdit" row="1" column="0"> <property name="name"> <cstring>word_connectorLE</cstring> </property> @@ -99,7 +99,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -110,7 +110,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>terminalSizeHintCB</cstring> </property> @@ -118,7 +118,7 @@ <string>Show terminal si&ze after resizing</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>frameCB</cstring> </property> @@ -126,7 +126,7 @@ <string>Show &frame</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>warnCB</cstring> </property> @@ -134,7 +134,7 @@ <string>&Confirm quit when closing more than one session</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>blinkingCB</cstring> </property> @@ -142,7 +142,7 @@ <string>&Blinking cursor</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>ctrldragCB</cstring> </property> @@ -150,7 +150,7 @@ <string>&Require Ctrl key for drag and drop</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>cutToBeginningOfLineCB</cstring> </property> @@ -158,7 +158,7 @@ <string>Triple click selects &only from the current word forward</string> </property> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>allowResizeCB</cstring> </property> @@ -166,7 +166,7 @@ <string>Allow progr&ams to resize terminal window</string> </property> </widget> - <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>xonXoffCB</cstring> </property> @@ -184,14 +184,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="8" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>bidiCB</cstring> </property> @@ -199,7 +199,7 @@ <string>Enable bidirectional text rendering</string> </property> </widget> - <widget class="QLabel" row="11" column="0"> + <widget class="TQLabel" row="11" column="0"> <property name="name"> <cstring>SilenceLabel</cstring> </property> @@ -253,7 +253,7 @@ <number>8</number> </property> </widget> - <widget class="QLabel" row="10" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="10" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1_4</cstring> </property> @@ -282,14 +282,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="9" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="9" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>matchTabWinTitleCB</cstring> </property> @@ -301,7 +301,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -319,7 +319,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> diff --git a/kcontrol/konsole/schemadialog.ui b/kcontrol/konsole/schemadialog.ui index 64fda6a49..d99678904 100644 --- a/kcontrol/konsole/schemadialog.ui +++ b/kcontrol/konsole/schemadialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>SchemaDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SchemaDialog</cstring> </property> @@ -26,7 +26,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -45,7 +45,7 @@ <cstring>titleLine</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>titleLine</cstring> </property> @@ -60,7 +60,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -79,7 +79,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel8</cstring> </property> @@ -90,7 +90,7 @@ <cstring>colorCombo</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>boldCheck</cstring> </property> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -123,7 +123,7 @@ <string></string> </property> </widget> - <widget class="QComboBox" row="1" column="2"> + <widget class="TQComboBox" row="1" column="2"> <item> <property name="text"> <string>Custom</string> @@ -158,14 +158,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="2" column="2" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="2" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>transparentCheck</cstring> </property> @@ -173,7 +173,7 @@ <string>Trans&parent</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -184,7 +184,7 @@ <cstring>typeCombo</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="0"> + <widget class="TQComboBox" row="1" column="0"> <item> <property name="text"> <string>0 - Foreground Color</string> @@ -299,7 +299,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -310,12 +310,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>schemaList</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>defaultSchemaCB</cstring> </property> @@ -323,7 +323,7 @@ <string>S&et as default schema</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -331,7 +331,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>saveButton</cstring> </property> @@ -339,7 +339,7 @@ <string>Sa&ve Schema...</string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>removeButton</cstring> </property> @@ -357,7 +357,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -368,7 +368,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="2" column="1"> + <widget class="TQGroupBox" row="2" column="1"> <property name="name"> <cstring>GroupBox13</cstring> </property> @@ -389,19 +389,19 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLineEdit" row="1" column="0" rowspan="1" colspan="5"> + <widget class="TQLineEdit" row="1" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>backgndLine</cstring> </property> </widget> - <widget class="QToolButton" row="1" column="5"> + <widget class="TQToolButton" row="1" column="5"> <property name="name"> <cstring>imageBrowse</cstring> </property> @@ -409,7 +409,7 @@ <string>...</string> </property> </widget> - <widget class="QComboBox" row="0" column="3" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="0" column="3" rowspan="1" colspan="2"> <item> <property name="text"> <string>Tiled</string> @@ -429,7 +429,7 @@ <cstring>modeCombo</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel11</cstring> </property> @@ -440,7 +440,7 @@ <cstring>modeCombo</cstring> </property> </widget> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -448,7 +448,7 @@ <string>Min</string> </property> </widget> - <widget class="QSlider" row="5" column="2" rowspan="1" colspan="2"> + <widget class="TQSlider" row="5" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>shadeSlide</cstring> </property> @@ -459,7 +459,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="5" column="4"> + <widget class="TQLabel" row="5" column="4"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -467,7 +467,7 @@ <string>Max</string> </property> </widget> - <widget class="QLabel" row="4" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="4" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -486,7 +486,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>previewPixmap</cstring> </property> @@ -498,13 +498,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>180</width> <height>120</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>180</width> <height>120</height> @@ -520,7 +520,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="6"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>transparencyCheck</cstring> </property> @@ -540,7 +540,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp index 17eaadc3c..fc9ddee3d 100644 --- a/kcontrol/konsole/schemaeditor.cpp +++ b/kcontrol/konsole/schemaeditor.cpp @@ -44,7 +44,7 @@ #include <tqimage.h> // SchemaListBoxText is a list box text item with schema filename -class SchemaListBoxText : public QListBoxText +class SchemaListBoxText : public TQListBoxText { public: SchemaListBoxText(const TQString &title, const TQString &filename): TQListBoxText(title) @@ -241,7 +241,7 @@ void SchemaEditor::loadAllSchema(TQString currentFile) TQString title = readSchemaTitle(name); // Only insert new items so that local items override global - if (schemaList->findItem(title, ExactMatch) == 0) { + if (schemaList->tqfindItem(title, ExactMatch) == 0) { if (title.isNull() || title.isEmpty()) title=i18n("untitled"); @@ -594,7 +594,7 @@ void SchemaEditor::readSchema(int num) continue; TQString qline(line); - backgndLine->setText(locate("wallpaper", qline.mid( qline.find(" ",7)+1 ) )); + backgndLine->setText(locate("wallpaper", qline.mid( qline.tqfind(" ",7)+1 ) )); modeCombo->setCurrentItem(attr - 2); } @@ -666,7 +666,7 @@ void SchemaEditor::readSchema(int num) continue; if (!(0 <= bo && bo <= 1)) continue; - color[fi] = kapp->palette().active().text(); + color[fi] = kapp->tqpalette().active().text(); transparent[fi] = tr; bold[fi] = bo; type[fi] = 1; @@ -681,7 +681,7 @@ void SchemaEditor::readSchema(int num) continue; if (!(0 <= bo && bo <= 1)) continue; - color[fi] = kapp->palette().active().base(); + color[fi] = kapp->tqpalette().active().base(); transparent[fi] = tr; bold[fi] = bo; type[fi] = 2; diff --git a/kcontrol/konsole/sessiondialog.ui b/kcontrol/konsole/sessiondialog.ui index a86a74077..066c9c69a 100644 --- a/kcontrol/konsole/sessiondialog.ui +++ b/kcontrol/konsole/sessiondialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SessionDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SessionDialog</cstring> </property> @@ -26,7 +26,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout8</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="1"> + <widget class="TQGroupBox" row="1" column="1"> <property name="name"> <cstring>propertiesGroup</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout29</cstring> </property> @@ -53,7 +53,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string><Default></string> @@ -111,7 +111,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>termLine</cstring> </property> @@ -124,12 +124,12 @@ </sizepolicy> </property> </widget> - <widget class="QComboBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>keytabCombo</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -140,12 +140,12 @@ <cstring>fontCombo</cstring> </property> </widget> - <widget class="QComboBox" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>schemaCombo</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -156,7 +156,7 @@ <cstring>schemaCombo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel8</cstring> </property> @@ -167,7 +167,7 @@ <cstring>termLine</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -184,13 +184,13 @@ <property name="name"> <cstring>previewIcon</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>100</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>100</width> <height>100</height> @@ -200,7 +200,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -212,7 +212,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>100</height> @@ -221,7 +221,7 @@ <property name="text"> <string>&Icon:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignLeft</set> </property> <property name="buddy" stdset="0"> @@ -230,7 +230,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>sessionGroup</cstring> </property> @@ -241,12 +241,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>sessionList</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -254,7 +254,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>saveButton</cstring> </property> @@ -262,7 +262,7 @@ <string>Sa&ve Session...</string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>removeButton</cstring> </property> @@ -280,7 +280,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -291,7 +291,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>generalGroup</cstring> </property> @@ -310,7 +310,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout6</cstring> </property> @@ -318,7 +318,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout5</cstring> </property> @@ -326,7 +326,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -345,7 +345,7 @@ <cstring>nameLine</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -356,7 +356,7 @@ <cstring>executeLine</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -369,7 +369,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout4</cstring> </property> @@ -377,7 +377,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>nameLine</cstring> </property> @@ -390,7 +390,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>executeLine</cstring> </property> diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp index 5cb1c9746..e93084af1 100644 --- a/kcontrol/konsole/sessioneditor.cpp +++ b/kcontrol/konsole/sessioneditor.cpp @@ -35,7 +35,7 @@ #include <kshell.h> // SessionListBoxText is a list box text item with session filename -class SessionListBoxText : public QListBoxText +class SessionListBoxText : public TQListBoxText { public: SessionListBoxText(const TQString &title, const TQString &filename): TQListBoxText(title) diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index ccb906301..582937b8c 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -80,7 +80,7 @@ static void applyGtkStyles(bool active, int version) TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc)); if (list.count() == 0) { - list.append(TQString::fromLatin1(sysGtkrc(version))); + list.append(TQString::tqfromLatin1(sysGtkrc(version))); list.append(TQDir::homeDirPath()+userGtkrc(version)); } list.remove(gtkkde); @@ -174,10 +174,10 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings ) // end it with.. So keep a TQMap to bool, specifying whether the path is KDE-specified.. TQString qversion = qVersion(); - if ( qversion.contains( '.' ) > 1 ) - qversion.truncate( qversion.findRev( '.' ) ); - if ( qversion.contains( '-' ) ) - qversion.truncate( qversion.findRev( '-' ) ); + if ( qversion.tqcontains( '.' ) > 1 ) + qversion.truncate( qversion.tqfindRev( '.' ) ); + if ( qversion.tqcontains( '-' ) ) + qversion.truncate( qversion.tqfindRev( '-' ) ); TQStringList kdeAdded = settings.readListEntry("/qt/KDE/kdeAddedLibraryPaths"); @@ -220,8 +220,8 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings ) pathDb[path]=true; - if(path.contains("/lib64/")) - path.replace("/lib64/","/lib/"); + if(path.tqcontains("/lib64/")) + path.tqreplace("/lib64/","/lib/"); pathDb[path]=true; } @@ -347,7 +347,7 @@ static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version "# Appearance & Themes -> Colors in the Control Center and disable the checkbox\n" "# \"Apply colors to non-KDE applications\"\n" "#\n" - "#\n").arg(TQDateTime::currentDateTime().toString()); + "#\n").arg(TQDateTime::tqcurrentDateTime().toString()); t << "style \"default\"" << endl; t << "{" << endl; @@ -590,7 +590,7 @@ void runRdb( uint flags ) // Qt-only apps without adversely affecting ourselves. // Cheat and use the current timestamp, since we just saved to qtrc. - TQDateTime settingsstamp = TQDateTime::currentDateTime(); + TQDateTime settingsstamp = TQDateTime::tqcurrentDateTime(); static Atom qt_settings_timestamp = 0; if (!qt_settings_timestamp) { diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index b78a354be..92859de6c 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -48,7 +48,7 @@ KTheme::KTheme( TQWidget *parent, const TQString & xmlFile ) { TQFile file( xmlFile ); file.open( IO_ReadOnly ); - m_dom.setContent( file.readAll() ); + m_dom.setContent( TQByteArray(file.readAll()) ); file.close(); //kdDebug() << m_dom.toString( 2 ) << endl; @@ -107,7 +107,7 @@ bool KTheme::load( const KURL & url ) // create the DOM TQFile file( location + m_name + ".xml" ); file.open( IO_ReadOnly ); - m_dom.setContent( file.readAll() ); + m_dom.setContent( TQByteArray(file.readAll()) ); file.close(); // remove the temp file @@ -441,7 +441,7 @@ void KTheme::apply() DCOPClient *client = kapp->dcopClient(); if ( !client->isAttached() ) client->attach(); - client->send("kdesktop", "KBackgroundIface", "configure()", ""); + client->send("kdesktop", "KBackgroundIface", "configure()", TQString("")); // FIXME Xinerama // 3. Icons @@ -469,14 +469,14 @@ void KTheme::apply() iconConf->setGroup( "ToolbarIcons" ); TQString iconName = iconSubElem.tagName(); - if ( iconName.contains( "Color" ) ) + if ( iconName.tqcontains( "Color" ) ) { TQColor iconColor = TQColor( iconSubElem.attribute( "rgb" ) ); iconConf->writeEntry( iconName, iconColor, true, true ); } - else if ( iconName.contains( "Value" ) || iconName == "Size" ) + else if ( iconName.tqcontains( "Value" ) || iconName == "Size" ) iconConf->writeEntry( iconName, iconSubElem.attribute( "value" ).toUInt(), true, true ); - else if ( iconName.contains( "Effect" ) ) + else if ( iconName.tqcontains( "Effect" ) ) iconConf->writeEntry( iconName, iconSubElem.attribute( "name" ), true, true ); else iconConf->writeEntry( iconName, static_cast<bool>( iconSubElem.attribute( "value" ).toUInt() ), true, true ); @@ -516,7 +516,7 @@ void KTheme::apply() soundConf.sync(); kwinSoundConf.sync(); - client->send("knotify", "", "reconfigure()", ""); + client->send("knotify", "", "reconfigure()", TQString("")); // TODO signal kwin sounds change? } @@ -593,7 +593,7 @@ void KTheme::apply() kwinConf.writeEntry( "BorderSize", getProperty( wmElem, "border", "size" ) ); kwinConf.sync(); - client->send( "kwin", "", "reconfigure()", "" ); + client->send( "kwin", "", "reconfigure()", TQString("") ); } // 8. Konqueror @@ -607,7 +607,7 @@ void KTheme::apply() konqConf.writeEntry( "BgColor", TQColor( getProperty( konqElem, "bgcolor", "rgb" ) ) ); konqConf.sync(); - client->send("konqueror*", "KonquerorIface", "reparseConfiguration()", ""); // FIXME seems not to work :( + client->send("konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("")); // FIXME seems not to work :( } // 9. Kicker @@ -635,7 +635,7 @@ void KTheme::apply() kickerConf.writeEntry( "ShowRightHideButton", static_cast<bool>( getProperty( panelElem, "showrighthidebutton", "value").toInt())); kickerConf.sync(); - client->send("kicker", "Panel", "configure()", ""); + client->send("kicker", "Panel", "configure()", TQString("")); } // 10. Widget style @@ -720,7 +720,7 @@ TQString KTheme::getProperty( TQDomElement parent, const TQString & tag, else { kdWarning() << TQString( "No such property found: %1->%2->%3" ) - .arg( parent.tagName() ).arg( tag ).arg( attr ) << endl; + .tqarg( parent.tagName() ).tqarg( tag ).tqarg( attr ) << endl; return TQString::null; } } @@ -738,18 +738,18 @@ void KTheme::createIconElems( const TQString & group, const TQString & object, << "DisabledColor" << "DisabledColor2" << "DisabledEffect" << "DisabledSemiTransparent" << "DisabledValue"; for ( TQStringList::ConstIterator it = elemNames.begin(); it != elemNames.end(); ++it ) { - if ( (*it).contains( "Color" ) ) + if ( (*it).tqcontains( "Color" ) ) createColorElem( *it, object, parent, cfg ); else { TQDomElement tmpCol = m_dom.createElement( *it ); tmpCol.setAttribute( "object", object ); - if ( (*it).contains( "Value" ) || *it == "Size" ) + if ( (*it).tqcontains( "Value" ) || *it == "Size" ) tmpCol.setAttribute( "value", cfg->readNumEntry( *it, 1 ) ); - else if ( (*it).contains( "DisabledEffect" ) ) + else if ( (*it).tqcontains( "DisabledEffect" ) ) tmpCol.setAttribute( "name", cfg->readEntry( *it, "togray" ) ); - else if ( (*it).contains( "Effect" ) ) + else if ( (*it).tqcontains( "Effect" ) ) tmpCol.setAttribute( "name", cfg->readEntry( *it, "none" ) ); else tmpCol.setAttribute( "value", cfg->readBoolEntry( *it, false ) ); @@ -832,7 +832,7 @@ TQString KTheme::processFilePath( const TQString & section, const TQString & pat TQString KTheme::unprocessFilePath( const TQString & section, TQString path ) { if ( path.startsWith( "theme:/" ) ) - return path.replace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" ); + return path.tqreplace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" ); if ( TQFile::exists( path ) ) return path; diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui index 4b46fdc26..9fa86c2c0 100644 --- a/kcontrol/kthememanager/kthemedlg.ui +++ b/kcontrol/kthememanager/kthemedlg.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KThemeDlg</class> <author>Lukas Tinkl <[email protected]></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KThemeDlg</cstring> </property> @@ -28,7 +28,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout2</cstring> </property> @@ -36,7 +36,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -60,7 +60,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>170</width> <height>20</height> @@ -86,7 +86,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>layout1</cstring> </property> @@ -94,7 +94,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1" rowspan="4" colspan="1"> + <widget class="TQLabel" row="0" column="1" rowspan="4" colspan="1"> <property name="name"> <cstring>lbPreview</cstring> </property> @@ -109,11 +109,11 @@ <property name="frameShape"> <enum>Box</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>btnRemove</cstring> </property> @@ -121,7 +121,7 @@ <string>&Remove Theme</string> </property> </widget> - <widget class="QPushButton" row="3" column="0"> + <widget class="TQPushButton" row="3" column="0"> <property name="name"> <cstring>btnCreate</cstring> </property> @@ -129,7 +129,7 @@ <string>Create &New Theme...</string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>btnInstall</cstring> </property> @@ -137,7 +137,7 @@ <string>&Install New Theme...</string> </property> </widget> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Theme</string> @@ -183,7 +183,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -191,7 +191,7 @@ <string>Customize your theme:</string> </property> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> <cstring>layout4</cstring> </property> @@ -199,7 +199,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>btnBackground</cstring> </property> @@ -211,13 +211,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>60</height> @@ -239,7 +239,7 @@ <string>Customize the desktop background</string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>btnColors</cstring> </property> @@ -251,13 +251,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>60</height> @@ -279,7 +279,7 @@ <string>Customize colors</string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>btnStyle</cstring> </property> @@ -291,13 +291,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>60</height> @@ -319,7 +319,7 @@ <string>Customize the widget style</string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>btnIcons</cstring> </property> @@ -331,13 +331,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>60</height> @@ -359,7 +359,7 @@ <string>Customize the icon theme</string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>btnFonts</cstring> </property> @@ -371,13 +371,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>60</height> @@ -399,7 +399,7 @@ <string>Customize the font theme</string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>btnSaver</cstring> </property> @@ -411,13 +411,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>60</height> @@ -502,15 +502,15 @@ <includes> <include location="local" impldecl="in implementation">kthemedlg.ui.h</include> </includes> -<slots> - <slot specifier="non virtual">startKonqui( const QString & url )</slot> +<Q_SLOTS> + <slot specifier="non virtual">startKonqui( const TQString & url )</slot> <slot specifier="non virtual">startBackground()</slot> <slot specifier="non virtual">startColors()</slot> <slot specifier="non virtual">startStyle()</slot> <slot specifier="non virtual">startIcons()</slot> <slot specifier="non virtual">startFonts()</slot> <slot specifier="non virtual">startSaver()</slot> -</slots> +</Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurllabel.h</includehint> diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 2668bd87c..111384bd5 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -136,7 +136,7 @@ void kthememanager::load(bool useDefaults) conf.setGroup( "General" ); TQString themeName = conf.readEntry( "CurrentTheme" ); - TQListViewItem * cur = dlg->lvThemes->findItem( themeName, 0 ); + TQListViewItem * cur = dlg->lvThemes->tqfindItem( themeName, 0 ); if ( cur ) { dlg->lvThemes->setSelected( cur, true ); @@ -264,7 +264,7 @@ void kthememanager::slotRemoveTheme() bool kthememanager::themeExist(const TQString &_themeName) { - return ( dlg->lvThemes->findItem( _themeName, 0 )!=0 ); + return ( dlg->lvThemes->tqfindItem( _themeName, 0 )!=0 ); } void kthememanager::slotCreateTheme() @@ -298,7 +298,7 @@ void kthememanager::slotCreateTheme() m_theme->setAuthor( dlg.getAuthor() ); m_theme->setEmail( dlg.getEmail() ); m_theme->setHomepage( dlg.getHomepage() ); - m_theme->setComment( dlg.getComment().replace( "\n", "" ) ); + m_theme->setComment( dlg.getComment().tqreplace( "\n", "" ) ); m_theme->setVersion( dlg.getVersion() ); TQString result = m_theme->createYourself( true ); @@ -407,7 +407,7 @@ void kthememanager::updatePreview( const TQString & pixFile ) TQImage preview( pixFile, "PNG" ); if (preview.width()>dlg->lbPreview->contentsRect().width() || preview.height()>dlg->lbPreview->contentsRect().height() ) - preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQImage::ScaleMin ); + preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQ_ScaleMin ); TQPixmap pix; pix.convertFromImage( preview ); dlg->lbPreview->setPixmap( pix ); diff --git a/kcontrol/kthememanager/newthemewidget.ui b/kcontrol/kthememanager/newthemewidget.ui index 905b0749a..1a56915aa 100644 --- a/kcontrol/kthememanager/newthemewidget.ui +++ b/kcontrol/kthememanager/newthemewidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>NewThemeWidget</class> <author>Lukas Tinkl <[email protected]></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>NewThemeWidget</cstring> </property> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -28,7 +28,7 @@ <cstring>leName</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -39,7 +39,7 @@ <cstring>leAuthor</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -50,7 +50,7 @@ <cstring>leEmail</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -61,51 +61,51 @@ <cstring>leHomepage</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>leEmail</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>leName</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>leHomepage</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>leAuthor</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> <property name="text"> <string>Co&mment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> <cstring>teComment</cstring> </property> </widget> - <widget class="QTextEdit" row="5" column="1"> + <widget class="TQTextEdit" row="5" column="1"> <property name="name"> <cstring>teComment</cstring> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>leVersion</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index baa127e2f..a192bf608 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -59,7 +59,7 @@ KLocaleConfig::KLocaleConfig(KLocale *locale, this, TQT_SLOT(changedCountry(const TQString &)) ); m_labLang = new TQLabel(this, I18N_NOOP("Languages:")); - m_labLang->setAlignment( AlignTop ); + m_labLang->tqsetAlignment( AlignTop ); m_languages = new TQListBox(this); connect(m_languages, TQT_SIGNAL(selectionChanged()), @@ -172,7 +172,7 @@ void KLocaleConfig::slotAddLanguage(const TQString & code) pos = 0; // If it's already in list, just move it (delete the old, then insert a new) - int oldPos = languageList.findIndex( code ); + int oldPos = languageList.tqfindIndex( code ); if ( oldPos != -1 ) languageList.remove( languageList.at(oldPos) ); @@ -270,7 +270,7 @@ void KLocaleConfig::loadLanguageList() it != first.end(); ++it ) { - TQString str = locate("locale", TQString::fromLatin1("%1/entry.desktop") + TQString str = locate("locale", TQString::tqfromLatin1("%1/entry.desktop") .arg(*it)); if (!str.isNull()) prilang << str; @@ -278,7 +278,7 @@ void KLocaleConfig::loadLanguageList() // add all languages to the list TQStringList alllang = KGlobal::dirs()->findAllResources("locale", - TQString::fromLatin1("*/entry.desktop"), + TQString::tqfromLatin1("*/entry.desktop"), false, true); TQStringList langlist = prilang; if (langlist.count() > 0) @@ -293,7 +293,7 @@ void KLocaleConfig::loadLanguageList() if ((*it).isNull()) { m_addLanguage->insertSeparator(); - submenu = TQString::fromLatin1("other"); + submenu = TQString::tqfromLatin1("other"); m_addLanguage->insertSubmenu(m_locale->translate("Other"), submenu, TQString::null, -1); menu_index = -2; // first entries should _not_ be sorted @@ -305,9 +305,9 @@ void KLocaleConfig::loadLanguageList() m_locale->translate("without name")); TQString tag = *it; - int index = tag.findRev('/'); + int index = tag.tqfindRev('/'); tag = tag.left(index); - index = tag.findRev('/'); + index = tag.tqfindRev('/'); tag = tag.mid(index + 1); m_addLanguage->insertItem(name, tag, submenu, menu_index); } @@ -322,13 +322,13 @@ void KLocaleConfig::loadCountryList() KLocale *lsave = KGlobal::_locale; KGlobal::_locale = m_locale; - TQString sub = TQString::fromLatin1("l10n/"); + TQString sub = TQString::tqfromLatin1("l10n/"); // clear the list m_comboCountry->clear(); TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", - sub + TQString::fromLatin1("*.desktop"), + sub + TQString::tqfromLatin1("*.desktop"), false, true ); for ( TQStringList::ConstIterator it = regionlist.begin(); @@ -338,11 +338,11 @@ void KLocaleConfig::loadCountryList() TQString tag = *it; int index; - index = tag.findRev('/'); + index = tag.tqfindRev('/'); if (index != -1) tag = tag.mid(index + 1); - index = tag.findRev('.'); + index = tag.tqfindRev('.'); if (index != -1) tag.truncate(index); @@ -352,7 +352,7 @@ void KLocaleConfig::loadCountryList() m_locale->translate("without name")); TQString map( locate( "locale", - TQString::fromLatin1( "l10n/%1.png" ) + TQString::tqfromLatin1( "l10n/%1.png" ) .arg(tag) ) ); TQIconSet icon; if ( !map.isNull() ) @@ -362,7 +362,7 @@ void KLocaleConfig::loadCountryList() // add all languages to the list TQStringList countrylist = KGlobal::dirs()->findAllResources - ("locale", sub + TQString::fromLatin1("*/entry.desktop"), false, true); + ("locale", sub + TQString::tqfromLatin1("*/entry.desktop"), false, true); for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) @@ -374,14 +374,14 @@ void KLocaleConfig::loadCountryList() TQString submenu = entry.readEntry("Region"); TQString tag = *it; - int index = tag.findRev('/'); + int index = tag.tqfindRev('/'); tag.truncate(index); - index = tag.findRev('/'); + index = tag.tqfindRev('/'); tag = tag.mid(index + 1); int menu_index = submenu.isEmpty() ? -1 : -2; TQString flag( locate( "locale", - TQString::fromLatin1( "l10n/%1/flag.png" ) + TQString::tqfromLatin1( "l10n/%1/flag.png" ) .arg(tag) ) ); TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) ); m_comboCountry->insertItem( icon, name, tag, submenu, menu_index ); @@ -399,7 +399,7 @@ void KLocaleConfig::readLocale(const TQString &path, TQString &name, KGlobal::_locale = m_locale; // read the name - TQString filepath = TQString::fromLatin1("%1%2/entry.desktop") + TQString filepath = TQString::tqfromLatin1("%1%2/entry.desktop") .arg(sub) .arg(path); @@ -419,7 +419,7 @@ void KLocaleConfig::save() config->writeEntry("Country", m_locale->country(), true, true); if ( m_locale->languageList().isEmpty() ) - config->writeEntry("Language", TQString::fromLatin1(""), true, true); + config->writeEntry("Language", TQString::tqfromLatin1(""), true, true); else config->writeEntry("Language", m_locale->languageList(), ':', true, true); @@ -502,7 +502,7 @@ void KLocaleConfig::slotTranslate() TQStringList KLocaleConfig::languageList() const { TQString fileName = locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())); KSimpleConfig entry(fileName); diff --git a/kcontrol/locale/kcmlocale.h b/kcontrol/locale/kcmlocale.h index c0d8e5f68..00691bfa4 100644 --- a/kcontrol/locale/kcmlocale.h +++ b/kcontrol/locale/kcmlocale.h @@ -37,7 +37,7 @@ class TQLabel; class TQListBox; class TQPushButton; -class KLocaleConfig : public QWidget +class KLocaleConfig : public TQWidget { Q_OBJECT diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp index bf4cc8b32..69c92abc7 100644 --- a/kcontrol/locale/klocalesample.cpp +++ b/kcontrol/locale/klocalesample.cpp @@ -45,7 +45,7 @@ KLocaleSample::KLocaleSample(KLocale *locale, lay->setAutoAdd(TRUE); // Whatever the color scheme is, we want black text - TQColorGroup a = palette().active(); + TQColorGroup a = tqpalette().active(); a.setColor(TQColorGroup::Foreground, Qt::black); TQPalette pal(a, a, a); @@ -88,21 +88,21 @@ KLocaleSample::~KLocaleSample() void KLocaleSample::slotUpdateTime() { - TQDateTime dt = TQDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); - m_dateSample->setText(m_locale->formatDate(dt.date(), false)); - m_dateShortSample->setText(m_locale->formatDate(dt.date(), true)); - m_timeSample->setText(m_locale->formatTime(dt.time(), true)); + m_dateSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), false)); + m_dateShortSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), true)); + m_timeSample->setText(m_locale->formatTime(TQT_TQTIME_OBJECT(dt.time()), true)); } void KLocaleSample::slotLocaleChanged() { m_numberSample->setText(m_locale->formatNumber(1234567.89) + - TQString::fromLatin1(" / ") + + TQString::tqfromLatin1(" / ") + m_locale->formatNumber(-1234567.89)); m_moneySample->setText(m_locale->formatMoney(123456789.00) + - TQString::fromLatin1(" / ") + + TQString::tqfromLatin1(" / ") + m_locale->formatMoney(-123456789.00)); slotUpdateTime(); diff --git a/kcontrol/locale/klocalesample.h b/kcontrol/locale/klocalesample.h index 2838a2cc3..1b8fb94e0 100644 --- a/kcontrol/locale/klocalesample.h +++ b/kcontrol/locale/klocalesample.h @@ -32,7 +32,7 @@ class TQResizeEvent; class KLocale; -class KLocaleSample : public QWidget +class KLocaleSample : public TQWidget { Q_OBJECT public: diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp index 9fa1ad708..2c2fa37c5 100644 --- a/kcontrol/locale/localemon.cpp +++ b/kcontrol/locale/localemon.cpp @@ -111,8 +111,8 @@ KLocaleConfigMoney::KLocaleConfigMoney(KLocale *locale, int i = 5; while (i--) { - m_cmbMonPosMonSignPos->insertItem(TQString::null); - m_cmbMonNegMonSignPos->insertItem(TQString::null); + m_cmbMonPosMonSignPos->insertItem(TQString()); + m_cmbMonNegMonSignPos->insertItem(TQString()); } lay->setColStretch(1, 1); @@ -131,7 +131,7 @@ void KLocaleConfigMoney::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); @@ -139,25 +139,25 @@ void KLocaleConfigMoney::save() int i; bool b; - str = ent.readEntry("CurrencySymbol", TQString::fromLatin1("$")); + str = ent.readEntry("CurrencySymbol", TQString::tqfromLatin1("$")); config->deleteEntry("CurrencySymbol", false, true); if (str != m_locale->currencySymbol()) config->writeEntry("CurrencySymbol", m_locale->currencySymbol(), true, true); - str = ent.readEntry("MonetaryDecimalSymbol", TQString::fromLatin1(".")); + str = ent.readEntry("MonetaryDecimalSymbol", TQString::tqfromLatin1(".")); config->deleteEntry("MonetaryDecimalSymbol", false, true); if (str != m_locale->monetaryDecimalSymbol()) config->writeEntry("MonetaryDecimalSymbol", m_locale->monetaryDecimalSymbol(), true, true); - str = ent.readEntry("MonetaryThousandsSeparator", TQString::fromLatin1(",")); - str.replace(TQString::fromLatin1("$0"), TQString::null); + str = ent.readEntry("MonetaryThousandsSeparator", TQString::tqfromLatin1(",")); + str.tqreplace(TQString::tqfromLatin1("$0"), TQString()); config->deleteEntry("MonetaryThousandsSeparator", false, true); if (str != m_locale->monetaryThousandsSeparator()) config->writeEntry("MonetaryThousandsSeparator", - TQString::fromLatin1("$0%1$0") - .arg(m_locale->monetaryThousandsSeparator()), + TQString::tqfromLatin1("$0%1$0") + .tqarg(m_locale->monetaryThousandsSeparator()), true, true); i = ent.readNumEntry("FracDigits", 2); @@ -260,8 +260,8 @@ void KLocaleConfigMoney::slotMonNegMonSignPosChanged(int i) void KLocaleConfigMoney::slotTranslate() { TQObjectList list; - list.append(m_cmbMonPosMonSignPos); - list.append(m_cmbMonNegMonSignPos); + list.append(TQT_TQOBJECT(m_cmbMonPosMonSignPos)); + list.append(TQT_TQOBJECT(m_cmbMonNegMonSignPos)); TQComboBox *wc; for (TQObjectListIt li(list) ; (wc = (TQComboBox *)li.current()) != 0; ++li) diff --git a/kcontrol/locale/localemon.h b/kcontrol/locale/localemon.h index e78032641..412236efe 100644 --- a/kcontrol/locale/localemon.h +++ b/kcontrol/locale/localemon.h @@ -35,7 +35,7 @@ class KIntNumInput; class KLocale; class KLanguageCombo; -class KLocaleConfigMoney : public QWidget +class KLocaleConfigMoney : public TQWidget { Q_OBJECT diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp index 537cc99ab..2095e1e9a 100644 --- a/kcontrol/locale/localenum.cpp +++ b/kcontrol/locale/localenum.cpp @@ -89,34 +89,34 @@ void KLocaleConfigNumber::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); TQString str; str = ent.readEntry("DecimalSymbol", - TQString::fromLatin1(".")); + TQString::tqfromLatin1(".")); config->deleteEntry("DecimalSymbol", false, true); if (str != m_locale->decimalSymbol()) config->writeEntry("DecimalSymbol", m_locale->decimalSymbol(), true, true); str = ent.readEntry("ThousandsSeparator", - TQString::fromLatin1(",")); + TQString::tqfromLatin1(",")); config->deleteEntry("ThousandsSeparator", false, true); - str.replace(TQString::fromLatin1("$0"), TQString::null); + str.tqreplace(TQString::tqfromLatin1("$0"), TQString()); if (str != m_locale->thousandsSeparator()) config->writeEntry("ThousandsSeparator", - TQString::fromLatin1("$0%1$0") - .arg(m_locale->thousandsSeparator()), true, true); + TQString::tqfromLatin1("$0%1$0") + .tqarg(m_locale->thousandsSeparator()), true, true); str = ent.readEntry("PositiveSign"); config->deleteEntry("PositiveSign", false, true); if (str != m_locale->positiveSign()) config->writeEntry("PositiveSign", m_locale->positiveSign(), true, true); - str = ent.readEntry("NegativeSign", TQString::fromLatin1("-")); + str = ent.readEntry("NegativeSign", TQString::tqfromLatin1("-")); config->deleteEntry("NegativeSign", false, true); if (str != m_locale->negativeSign()) config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true); diff --git a/kcontrol/locale/localenum.h b/kcontrol/locale/localenum.h index 1bca325a5..5c2702e7d 100644 --- a/kcontrol/locale/localenum.h +++ b/kcontrol/locale/localenum.h @@ -34,7 +34,7 @@ class TQLineEdit; class KLocale; class KLanguageCombo; -class KLocaleConfigNumber : public QWidget +class KLocaleConfigNumber : public TQWidget { Q_OBJECT diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp index 1cf6b949b..33b039c6e 100644 --- a/kcontrol/locale/localeother.cpp +++ b/kcontrol/locale/localeother.cpp @@ -80,7 +80,7 @@ void KLocaleConfigOther::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); diff --git a/kcontrol/locale/localeother.h b/kcontrol/locale/localeother.h index 8c0459c9e..4e000bec6 100644 --- a/kcontrol/locale/localeother.h +++ b/kcontrol/locale/localeother.h @@ -31,7 +31,7 @@ class TQComboBox; class KLocale; -class KLocaleConfigOther : public QWidget +class KLocaleConfigOther : public TQWidget { Q_OBJECT diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp index 2519ea794..4650e6a23 100644 --- a/kcontrol/locale/localetime.cpp +++ b/kcontrol/locale/localetime.cpp @@ -253,28 +253,28 @@ void KLocaleConfigTime::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); TQString str; - str = ent.readEntry("CalendarSystem", TQString::fromLatin1("gregorian")); + str = ent.readEntry("CalendarSystem", TQString::tqfromLatin1("gregorian")); config->deleteEntry("CalendarSystem", false, true); if (str != m_locale->calendarType()) config->writeEntry("CalendarSystem", m_locale->calendarType(), true, true); - str = ent.readEntry("TimeFormat", TQString::fromLatin1("%H:%M:%S")); + str = ent.readEntry("TimeFormat", TQString::tqfromLatin1("%H:%M:%S")); config->deleteEntry("TimeFormat", false, true); if (str != m_locale->timeFormat()) config->writeEntry("TimeFormat", m_locale->timeFormat(), true, true); - str = ent.readEntry("DateFormat", TQString::fromLatin1("%A %d %B %Y")); + str = ent.readEntry("DateFormat", TQString::tqfromLatin1("%A %d %B %Y")); config->deleteEntry("DateFormat", false, true); if (str != m_locale->dateFormat()) config->writeEntry("DateFormat", m_locale->dateFormat(), true, true); - str = ent.readEntry("DateFormatShort", TQString::fromLatin1("%Y-%m-%d")); + str = ent.readEntry("DateFormatShort", TQString::tqfromLatin1("%Y-%m-%d")); config->deleteEntry("DateFormatShort", false, true); if (str != m_locale->dateFormatShort()) config->writeEntry("DateFormatShort", @@ -345,7 +345,7 @@ void KLocaleConfigTime::slotLocaleChanged() TQString calendarType = m_locale->calendarType(); int calendarSystem = 0; - CalendarVector::iterator it = qFind(calendars.begin(), calendars.end(), + CalendarVector::iterator it = tqFind(calendars.begin(), calendars.end(), calendarType); if ( it != calendars.end() ) calendarSystem = it - calendars.begin(); @@ -371,7 +371,7 @@ calendarType); kdDebug(173) << storeToUser(timeMap(), m_locale->timeFormat()) << endl; kdDebug(173) << userToStore(timeMap(), - TQString::fromLatin1("HH:MM:SS AMPM test")) << endl; + TQString::tqfromLatin1("HH:MM:SS AMPM test")) << endl; } @@ -416,7 +416,7 @@ void KLocaleConfigTime::slotTranslate() { TQString str; - TQString sep = TQString::fromLatin1("\n"); + TQString sep = TQString::tqfromLatin1("\n"); TQString old; diff --git a/kcontrol/locale/localetime.h b/kcontrol/locale/localetime.h index 9563ea91a..b77de2af9 100644 --- a/kcontrol/locale/localetime.h +++ b/kcontrol/locale/localetime.h @@ -36,7 +36,7 @@ class KLanguageCombo; class StringPair; -class KLocaleConfigTime : public QWidget +class KLocaleConfigTime : public TQWidget { Q_OBJECT diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index de47ce661..523fa50ea 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -62,7 +62,7 @@ KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/, m_nullConfig = new KConfig(TQString::null, false, false); m_globalConfig = new KConfig(TQString::null, false, true); - m_locale = new KLocale(TQString::fromLatin1("kcmlocale"), m_nullConfig); + m_locale = new KLocale(TQString::tqfromLatin1("kcmlocale"), m_nullConfig); TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l->setAutoAdd(TRUE); @@ -162,7 +162,7 @@ void KLocaleApplication::load( bool useDefaults ) { m_globalConfig->setReadDefaults( useDefaults ); m_globalConfig->reparseConfiguration(); - *m_locale = KLocale(TQString::fromLatin1("kcmlocale"), m_globalConfig); + *m_locale = KLocale(TQString::tqfromLatin1("kcmlocale"), m_globalConfig); emit localeChanged(); emit languageChanged(); @@ -180,7 +180,7 @@ void KLocaleApplication::save() "language of all programs, you will have to " "logout first."), m_locale->translate("Applying Language Settings"), - TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); + TQString::tqfromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); // restore the old global locale KGlobal::_locale = lsave; diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp index 5bc340f7b..fb97278c7 100644 --- a/kcontrol/nics/nic.cpp +++ b/kcontrol/nics/nic.cpp @@ -298,21 +298,21 @@ TQString flags_tos (unsigned int flags) if (flags & IFF_BROADCAST) { if (tmp.length()) { - tmp += TQString::fromLatin1(", "); + tmp += TQString::tqfromLatin1(", "); } tmp += i18n("Broadcast"); } if (flags & IFF_MULTICAST) { if (tmp.length()) { - tmp += TQString::fromLatin1(", "); + tmp += TQString::tqfromLatin1(", "); } tmp += i18n("Multicast"); } if (flags & IFF_LOOPBACK) { if (tmp.length()) { - tmp += TQString::fromLatin1(", "); + tmp += TQString::tqfromLatin1(", "); } tmp += i18n("Loopback"); } diff --git a/kcontrol/performance/konqueror_ui.ui b/kcontrol/performance/konqueror_ui.ui index 3ace0b5db..d93cfec71 100644 --- a/kcontrol/performance/konqueror_ui.ui +++ b/kcontrol/performance/konqueror_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KCMPerformance::Konqueror_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Konqueror_ui</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>reuse_group</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rb_never_reuse</cstring> </property> @@ -38,7 +38,7 @@ <string>&Never</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rb_file_browsing_reuse</cstring> </property> @@ -46,7 +46,7 @@ <string>For &file browsing only (recommended)</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rb_always_reuse</cstring> </property> @@ -56,7 +56,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -67,7 +67,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -75,7 +75,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lb_preload_count</cstring> </property> @@ -86,7 +86,7 @@ <cstring>sb_preload_count</cstring> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>sb_preload_count</cstring> </property> @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -110,7 +110,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cb_preload_on_startup</cstring> </property> @@ -118,7 +118,7 @@ <string>Preload an instance after KDE startup</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cb_always_have_preloaded</cstring> </property> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>160</height> diff --git a/kcontrol/performance/system_ui.ui b/kcontrol/performance/system_ui.ui index a8d0e7956..c0cbe7701 100644 --- a/kcontrol/performance/system_ui.ui +++ b/kcontrol/performance/system_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>System_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>System_ui</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gb_</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cb_disable_kbuildsycoca</cstring> </property> @@ -35,7 +35,7 @@ <string>Disable &system configuration startup check</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>label_kbuildsycoca</cstring> </property> @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kcontrol/privacy/kcmprivacydialog.ui b/kcontrol/privacy/kcmprivacydialog.ui index df79e2ec1..003cf235f 100644 --- a/kcontrol/privacy/kcmprivacydialog.ui +++ b/kcontrol/privacy/kcmprivacydialog.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KCMPrivacyDialog</class> <author>Ralf Hoelzer</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KCMPrivacyDialog</cstring> </property> @@ -43,7 +43,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter1</cstring> </property> @@ -79,13 +79,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>50</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>200</height> @@ -102,7 +102,7 @@ </property> </widget> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout1</cstring> </property> @@ -110,17 +110,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>selectAllButton</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -130,17 +130,17 @@ <string>Select All</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>selectNoneButton</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -160,14 +160,14 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cleanupButton</cstring> </property> @@ -179,7 +179,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index bbf5e088a..6df0d04f9 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -75,12 +75,12 @@ bool KPrivacyManager::clearThumbnails() bool KPrivacyManager::clearRunCommandHistory() const { - return kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", "" ); + return kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") ); } bool KPrivacyManager::clearAllCookies() const { - return kapp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", "" ); + return kapp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") ); } bool KPrivacyManager::clearSavedClipboardContents() @@ -98,7 +98,7 @@ bool KPrivacyManager::clearSavedClipboardContents() return true; } - return kapp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", "" ); + return kapp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") ); } bool KPrivacyManager::clearFormCompletion() const @@ -123,7 +123,7 @@ bool KPrivacyManager::clearRecentDocuments() const bool KPrivacyManager::clearQuickStartMenu() const { - return kapp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", "" ); + return kapp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") ); } bool KPrivacyManager::clearWebHistory() @@ -138,7 +138,7 @@ bool KPrivacyManager::clearWebHistory() } return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", - "notifyClear(TQCString)", "" ); + "notifyClear(TQCString)", TQString("") ); } bool KPrivacyManager::clearFavIcons() @@ -161,7 +161,7 @@ bool KPrivacyManager::isApplicationRegistered(const TQString &appName) QCStringList regApps = kapp->dcopClient()->registeredApplications(); for ( QCStringList::Iterator it = regApps.begin(); it != regApps.end(); ++it ) - if((*it).find(appName.latin1()) != -1) return true; + if((*it).tqfind(appName.latin1()) != -1) return true; return false; } diff --git a/kcontrol/privacy/kprivacymanager.h b/kcontrol/privacy/kprivacymanager.h index 6d950c903..11d4941fe 100644 --- a/kcontrol/privacy/kprivacymanager.h +++ b/kcontrol/privacy/kprivacymanager.h @@ -27,7 +27,7 @@ @author Ralf Hoelzer */ -class KPrivacyManager : public QObject +class KPrivacyManager : public TQObject { Q_OBJECT public: diff --git a/kcontrol/privacy/kprivacysettings.ui b/kcontrol/privacy/kprivacysettings.ui index 93afe5dff..ddcc93ec9 100644 --- a/kcontrol/privacy/kprivacysettings.ui +++ b/kcontrol/privacy/kprivacysettings.ui @@ -5,7 +5,7 @@ Licensed under the terms of the LGPL. Derived from AT&T's Privacy Bird settings panel screenshot originally. </comment> <author>George Staikos <[email protected]></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KPrivacySettings</cstring> </property> @@ -38,7 +38,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -49,7 +49,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <cstring>_privacyLevel</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Low</string> @@ -82,7 +82,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. </sizepolicy> </property> </widget> - <widget class="QButtonGroup" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonGroup1_2</cstring> </property> @@ -93,7 +93,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -101,7 +101,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <string>Warn me when I visit a site that uses my financial or purchase information:</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_warnFinancialMarketeer</cstring> </property> @@ -109,7 +109,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <string>For marketing or advertising purposes</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_warnFinancialSpammer</cstring> </property> @@ -119,7 +119,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. </widget> </vbox> </widget> - <widget class="QButtonGroup" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -130,7 +130,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -138,7 +138,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <string>Warn me when I visit a site that uses my health or medical information: </string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_warnHealthMarketeer</cstring> </property> @@ -146,7 +146,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <string>For marketing or advertising purposes</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_warnHealthSpammer</cstring> </property> @@ -156,7 +156,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. </widget> </vbox> </widget> - <widget class="QButtonGroup" row="7" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="7" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonGroup1_2_2</cstring> </property> @@ -167,7 +167,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -175,7 +175,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <string>Warn me when I visit a site that uses my non-personally identifiable information:</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_warnDemographicsBigBrother</cstring> </property> @@ -183,7 +183,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <string>To determine my interests, habits or general behavior</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_warnDemographicsSpammer</cstring> </property> @@ -193,7 +193,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. </widget> </vbox> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>_warnSpammers</cstring> </property> @@ -201,7 +201,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <string>Warn me when I visit a site that shares my personal information with other companies</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>_warnShady</cstring> </property> @@ -209,7 +209,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <string>Warn me when I visit a site that does not let me know what information they have about me</string> </property> </widget> - <widget class="QButtonGroup" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonGroup4</cstring> </property> @@ -220,7 +220,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel2_2_2</cstring> </property> @@ -228,7 +228,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <string>Warn me when I visit a site that may contact me about other products or services:</string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel2_2_2_2</cstring> </property> @@ -236,7 +236,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <string>Warn me when I visit a site that may use my personal information to:</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>_warnPersonalHabits</cstring> </property> @@ -244,7 +244,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <string>Determine my habits, interests or general behavior</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>layout1</cstring> </property> @@ -252,7 +252,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_warnPersonalTelephone</cstring> </property> @@ -260,7 +260,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <string>Via telephone</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_warnPersonalMail</cstring> </property> @@ -270,7 +270,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>layout3</cstring> </property> @@ -278,7 +278,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_warnPersonalEmail</cstring> </property> @@ -286,7 +286,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <string>Via email</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_warnPersonalBigBrother</cstring> </property> diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index e97cf4836..f48d621cf 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -60,7 +60,7 @@ void ConfigDialog::show() { if ( !isVisible() ) { KWinModule module(0, KWinModule::INFO_DESKTOP); - TQSize s1 = sizeHint(); + TQSize s1 = tqsizeHint(); TQSize s2 = module.workArea().size(); int w = s1.width(); int h = s1.height(); diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h index 584237975..615d9a2f5 100644 --- a/kcontrol/randr/configdialog.h +++ b/kcontrol/randr/configdialog.h @@ -62,11 +62,11 @@ public: ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name ) : KListView( parent, name ), _configWidget( configWidget ), _regExpEditor(0L) {} - // TQListView has a weird idea of a sizeHint... - virtual TQSize sizeHint () const { - int w = minimumSizeHint().width(); + // TQListView has a weird idea of a tqsizeHint... + virtual TQSize tqsizeHint () const { + int w = tqminimumSizeHint().width(); int h = header()->height(); - h += viewport()->sizeHint().height(); + h += viewport()->tqsizeHint().height(); h += horizontalScrollBar()->height(); TQListViewItem *item = firstChild(); diff --git a/kcontrol/randr/krandrbindings.cpp b/kcontrol/randr/krandrbindings.cpp index 4857651a1..29b2b73c2 100644 --- a/kcontrol/randr/krandrbindings.cpp +++ b/kcontrol/randr/krandrbindings.cpp @@ -19,10 +19,10 @@ */ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString(), key3, key4 ) #endif #define WIN KKey::QtWIN diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp index 087585d3f..668b36ddb 100644 --- a/kcontrol/randr/krandrmodule.cpp +++ b/kcontrol/randr/krandrmodule.cpp @@ -92,7 +92,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis m_screenSelector = new KComboBox(screenBox); for (int s = 0; s < numScreens(); s++) { - m_screenSelector->insertItem(i18n("Screen %1").arg(s+1)); + m_screenSelector->insertItem(i18n("Screen %1").tqarg(s+1)); } m_screenSelector->setCurrentItem(currentScreenIndex()); @@ -171,7 +171,7 @@ void KRandRModule::slotScreenChanged(int screen) // Add new resolutions for (int i = 0; i < currentScreen()->numSizes(); i++) { - m_sizeCombo->insertItem(i18n("%1 x %2").arg(currentScreen()->pixelSize(i).width()).arg(currentScreen()->pixelSize(i).height())); + m_sizeCombo->insertItem(i18n("%1 x %2").tqarg(currentScreen()->pixelSize(i).width()).tqarg(currentScreen()->pixelSize(i).height())); // Aspect ratio /* , aspect ratio %5)*/ @@ -180,7 +180,7 @@ void KRandRModule::slotScreenChanged(int screen) // Clear rotations for (int i = m_rotationGroup->count() - 1; i >= 0; i--) - m_rotationGroup->remove(m_rotationGroup->find(i)); + m_rotationGroup->remove(m_rotationGroup->tqfind(i)); // Create rotations for (int i = 0; i < RandRScreen::OrientationCount; i++) @@ -195,21 +195,21 @@ void KRandRModule::slotScreenChanged(int screen) void KRandRModule::slotRotationChanged() { - if (m_rotationGroup->find(0)->isOn()) + if (m_rotationGroup->tqfind(0)->isOn()) currentScreen()->proposeRotation(RandRScreen::Rotate0); - else if (m_rotationGroup->find(1)->isOn()) + else if (m_rotationGroup->tqfind(1)->isOn()) currentScreen()->proposeRotation(RandRScreen::Rotate90); - else if (m_rotationGroup->find(2)->isOn()) + else if (m_rotationGroup->tqfind(2)->isOn()) currentScreen()->proposeRotation(RandRScreen::Rotate180); else { - Q_ASSERT(m_rotationGroup->find(3)->isOn()); + Q_ASSERT(m_rotationGroup->tqfind(3)->isOn()); currentScreen()->proposeRotation(RandRScreen::Rotate270); } - if (m_rotationGroup->find(4)->isOn()) + if (m_rotationGroup->tqfind(4)->isOn()) currentScreen()->proposeRotation(currentScreen()->proposedRotation() ^ RandRScreen::ReflectX); - if (m_rotationGroup->find(5)->isOn()) + if (m_rotationGroup->tqfind(5)->isOn()) currentScreen()->proposeRotation(currentScreen()->proposedRotation() ^ RandRScreen::ReflectY); setChanged(); @@ -353,8 +353,8 @@ void KRandRModule::update() Q_ASSERT(currentScreen()->proposedRotation() & RandRScreen::RotateMask); break; } - m_rotationGroup->find(4)->setDown(currentScreen()->proposedRotation() & RandRScreen::ReflectX); - m_rotationGroup->find(5)->setDown(currentScreen()->proposedRotation() & RandRScreen::ReflectY); + m_rotationGroup->tqfind(4)->setDown(currentScreen()->proposedRotation() & RandRScreen::ReflectX); + m_rotationGroup->tqfind(5)->setDown(currentScreen()->proposedRotation() & RandRScreen::ReflectY); m_rotationGroup->blockSignals(false); m_refreshRates->blockSignals(true); diff --git a/kcontrol/randr/krandrpassivepopup.cpp b/kcontrol/randr/krandrpassivepopup.cpp index 5cf6fa6b2..207dfac2e 100644 --- a/kcontrol/randr/krandrpassivepopup.cpp +++ b/kcontrol/randr/krandrpassivepopup.cpp @@ -60,7 +60,7 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P ) break; win = parent; - TQWidget* widget = TQWidget::find( win ); + TQWidget* widget = TQWidget::tqfind( win ); if( widget != NULL ) { widget->installEventFilter( this ); @@ -94,14 +94,14 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P ) bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e ) { if( e->type() == TQEvent::Move && o->isWidgetType() - && watched_widgets.contains( static_cast< TQWidget* >( o ))) + && watched_widgets.tqcontains( TQT_TQWIDGET( o ))) TQTimer::singleShot( 0, this, TQT_SLOT( slotPositionSelf())); return false; } bool KRandrPassivePopup::x11Event( XEvent* e ) { - if( e->type == ConfigureNotify && watched_windows.contains( e->xconfigure.window )) + if( e->type == ConfigureNotify && watched_windows.tqcontains( e->xconfigure.window )) { if( !update_timer.isActive()) update_timer.start( 10, true ); diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp index e35fba9d2..49e0c17af 100644 --- a/kcontrol/randr/krandrtray.cpp +++ b/kcontrol/randr/krandrtray.cpp @@ -54,13 +54,13 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) , m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection())) { setPixmap(KSystemTray::loadSizedIcon("randr", width())); - setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); + tqsetAlignment(Qt::AlignHCenter | Qt::AlignVCenter); connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit())); TQToolTip::add(this, i18n("Screen resize & rotate")); my_parent = parent; //printf("Reading configuration...\n\r"); - globalKeys = new KGlobalAccel(this); + globalKeys = new KGlobalAccel(TQT_TQOBJECT(this)); KGlobalAccel* keys = globalKeys; #include "krandrbindings.cpp" // the keys need to be read from kdeglobals, not kickerrc @@ -123,7 +123,7 @@ void KRandRSystemTray::resizeEvent ( TQResizeEvent * ) void KRandRSystemTray::mousePressEvent(TQMouseEvent* e) { // Popup the context menu with left-click - if (e->button() == LeftButton) { + if (e->button() == Qt::LeftButton) { contextMenuAboutToShow(contextMenu()); contextMenu()->popup(e->globalPos()); e->accept(); @@ -205,7 +205,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu) /*lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1)); menu->setItemEnabled(lastIndex, false);*/ } else { - KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").arg(s+1).latin1()); + KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").tqarg(s+1).latin1()); m_screenPopups.append(subMenu); populateMenu(subMenu); lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu); @@ -237,7 +237,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu) menu->insertTitle(SmallIcon("randr"), i18n("Global Configuation")); KAction *actColors = new KAction( i18n( "Configure Color Profiles..." ), - SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotColorConfig() ), + SmallIconSet( "configure" ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotColorConfig() ), actionCollection() ); actColors->plug( menu ); @@ -247,7 +247,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu) // actPrefs->plug( menu ); KAction *actSKeys = new KAction( i18n( "Configure Shortcut Keys..." ), - SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotSKeys() ), + SmallIconSet( "configure" ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ), actionCollection() ); actSKeys->plug( menu ); @@ -260,7 +260,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu) void KRandRSystemTray::slotScreenActivated() { - setCurrentScreen(m_screenPopups.find(static_cast<const KPopupMenu*>(sender()))); + setCurrentScreen(m_screenPopups.tqfind(static_cast<const KPopupMenu*>(sender()))); } void KRandRSystemTray::configChanged() diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp index 071088e9b..cd72859db 100644 --- a/kcontrol/randr/ktimerdialog.cpp +++ b/kcontrol/randr/ktimerdialog.cpp @@ -56,8 +56,8 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent, if ( buttonMask & Cancel ) buttonOnTimeout = Cancel; - connect( totalTimer, SIGNAL( timeout() ), SLOT( slotInternalTimeout() ) ); - connect( updateTimer, SIGNAL( timeout() ), SLOT( slotUpdateTime() ) ); + connect( totalTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotInternalTimeout() ) ); + connect( updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateTime() ) ); // create the widgets mainWidget = new QVBox( this, "mainWidget" ); @@ -95,7 +95,7 @@ void KTimerDialog::setMainWidget( QWidget *widget ) // yuck, here goes. QVBox *newWidget = new QVBox( this ); - if ( widget->parentWidget() != mainWidget ) { + if ( widget->tqparentWidget() != mainWidget ) { widget->reparent( newWidget, 0, QPoint(0,0) ); } else { newWidget->insertChild( widget ); diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp index fd31f7800..0c9a5d3fd 100644 --- a/kcontrol/samba/kcmsambaimports.cpp +++ b/kcontrol/samba/kcmsambaimports.cpp @@ -74,16 +74,16 @@ void ImportsView::updateList() if (e!=0) { s=buf; - if ((s.contains(" nfs ")) || (s.contains(" smbfs "))) + if ((s.tqcontains(" nfs ")) || (s.tqcontains(" smbfs "))) { - strSource=s.left(s.find(" on /")); - strMount=s.mid(s.find(" on /")+4,s.length()); - if ((s.contains(" nfs ")) || (s.contains("/remote on "))) + strSource=s.left(s.tqfind(" on /")); + strMount=s.mid(s.tqfind(" on /")+4,s.length()); + if ((s.tqcontains(" nfs ")) || (s.tqcontains("/remote on "))) strType="NFS"; - else if (s.contains(" smbfs ")) + else if (s.tqcontains(" smbfs ")) strType="SMB"; - int pos(strMount.find(" type ")); - if (pos==-1) pos=strMount.find(" read/"); + int pos(strMount.tqfind(" type ")); + if (pos==-1) pos=strMount.tqfind(" read/"); strMount=strMount.left(pos); new TQListViewItem(&list,strType,strSource,strMount); }; diff --git a/kcontrol/samba/kcmsambaimports.h b/kcontrol/samba/kcmsambaimports.h index 56ddb5f36..51b83bd3c 100644 --- a/kcontrol/samba/kcmsambaimports.h +++ b/kcontrol/samba/kcmsambaimports.h @@ -28,7 +28,7 @@ #include <tqlistview.h> #include <kconfig.h> -class ImportsView: public QWidget +class ImportsView: public TQWidget { Q_OBJECT public: diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp index 224bc6fa2..8b56a9fe0 100644 --- a/kcontrol/samba/kcmsambalog.cpp +++ b/kcontrol/samba/kcmsambalog.cpp @@ -91,7 +91,7 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name) logFileName.setURL("/var/log/samba.log"); viewHistory.setAllColumnsShowFocus(TRUE); - viewHistory.setFocusPolicy(TQWidget::ClickFocus); + viewHistory.setFocusPolicy(TQ_ClickFocus); viewHistory.setShowSortIndicator(true); viewHistory.addColumn(i18n("Date & Time"),130); @@ -116,14 +116,14 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name) connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList())); emit contentsChanged(&viewHistory,0,0); - label.setMinimumSize(label.sizeHint()); - logFileName.setMinimumSize(250,logFileName.sizeHint().height()); + label.setMinimumSize(label.tqsizeHint()); + logFileName.setMinimumSize(250,logFileName.tqsizeHint().height()); viewHistory.setMinimumSize(425,200); - showConnOpen.setMinimumSize(showConnOpen.sizeHint()); - showConnClose.setMinimumSize(showConnClose.sizeHint()); - showFileOpen.setMinimumSize(showFileOpen.sizeHint()); - showFileClose.setMinimumSize(showFileClose.sizeHint()); - updateButton.setFixedSize(updateButton.sizeHint()); + showConnOpen.setMinimumSize(showConnOpen.tqsizeHint()); + showConnClose.setMinimumSize(showConnClose.tqsizeHint()); + showFileOpen.setMinimumSize(showFileOpen.tqsizeHint()); + showFileClose.setMinimumSize(showFileClose.tqsizeHint()); + updateButton.setFixedSize(updateButton.tqsizeHint()); } void LogView::loadSettings() @@ -161,7 +161,7 @@ void LogView::updateList() TQFile logFile(logFileName.url()); if (logFile.open(IO_ReadOnly)) { - TQApplication::setOverrideCursor(waitCursor); + TQApplication::setOverrideCursor(tqwaitCursor); viewHistory.clear(); filesCount=0; connectionsCount=0; diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h index d0b427d48..b7d236325 100644 --- a/kcontrol/samba/kcmsambalog.h +++ b/kcontrol/samba/kcmsambalog.h @@ -35,7 +35,7 @@ #define LOGGROUPNAME "SambaLogFileSettings" -class LogView: public QWidget +class LogView: public TQWidget { Q_OBJECT public: @@ -57,7 +57,7 @@ class LogView: public QWidget void contentsChanged(TQListView* list, int nrOfFiles, int nrOfConnections); }; -class QListViewItemX:public QListViewItem +class QListViewItemX:public TQListViewItem { public: //a faster constructor saves a lot time diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index f75fd72e5..0070e4723 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -60,7 +60,7 @@ StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *nam expandedUserCb = new TQCheckBox( i18n( "Show expanded host info" ), this ); viewStatistics->setAllColumnsShowFocus(TRUE); - viewStatistics->setFocusPolicy(TQWidget::ClickFocus); + viewStatistics->setFocusPolicy(TQ_ClickFocus); viewStatistics->setShowSortIndicator(true); viewStatistics->addColumn(i18n("Nr"),30); @@ -80,18 +80,18 @@ StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *nam hostLe->setText("*"); viewStatistics->setMinimumSize(375,200); - connectionsL->setMinimumSize(connectionsL->sizeHint()); - filesL->setMinimumSize(filesL->sizeHint()); - eventL->setMinimumSize(eventL->sizeHint()); - eventCb->setMinimumSize(eventCb->sizeHint()); - hostL->setMinimumSize(hostL->sizeHint()); - hostLe->setMinimumSize(120,hostLe->sizeHint().height()); - serviceL->setMinimumSize(serviceL->sizeHint()); - serviceLe->setMinimumSize(120,serviceLe->sizeHint().height()); - calcButton->setMinimumSize(calcButton->sizeHint()); - clearButton->setMinimumSize(clearButton->sizeHint()); - expandedInfoCb->setMinimumSize(expandedInfoCb->sizeHint()); - expandedUserCb->setMinimumSize(expandedUserCb->sizeHint()); + connectionsL->setMinimumSize(connectionsL->tqsizeHint()); + filesL->setMinimumSize(filesL->tqsizeHint()); + eventL->setMinimumSize(eventL->tqsizeHint()); + eventCb->setMinimumSize(eventCb->tqsizeHint()); + hostL->setMinimumSize(hostL->tqsizeHint()); + hostLe->setMinimumSize(120,hostLe->tqsizeHint().height()); + serviceL->setMinimumSize(serviceL->tqsizeHint()); + serviceLe->setMinimumSize(120,serviceLe->tqsizeHint().height()); + calcButton->setMinimumSize(calcButton->tqsizeHint()); + clearButton->setMinimumSize(clearButton->tqsizeHint()); + expandedInfoCb->setMinimumSize(expandedInfoCb->tqsizeHint()); + expandedUserCb->setMinimumSize(expandedUserCb->tqsizeHint()); TQVBoxLayout *topLayout=new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -134,7 +134,7 @@ void StatisticsView::setListInfo(TQListView *list, int nrOfFiles, int nrOfConnec void StatisticsView::calculate() { if (dataList==0) return; - TQApplication::setOverrideCursor(waitCursor); + TQApplication::setOverrideCursor(tqwaitCursor); int connCount(0); if (eventCb->currentText()==i18n("Connection")) connCount=1; @@ -150,8 +150,8 @@ void StatisticsView::calculate() { if (connCount) { - if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED"))) - && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).tqcontains(i18n("CONNECTION OPENED"))) + && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) { if (expandedInfoCb->isChecked()) item2=item->text(2); else item2=serviceLe->text(); @@ -163,8 +163,8 @@ void StatisticsView::calculate() } else { - if ((TQString(item->text(1)).contains(i18n("FILE OPENED"))) - && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).tqcontains(i18n("FILE OPENED"))) + && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) { if (expandedInfoCb->isChecked()) item2=item->text(2); else item2=serviceLe->text(); @@ -201,14 +201,14 @@ void StatisticsView::calculate() { if (connCount) { - if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED"))) - && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).tqcontains(i18n("CONNECTION OPENED"))) + && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) count++; } else { - if ((TQString(item->text(1)).contains(i18n("FILE OPENED"))) - && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).tqcontains(i18n("FILE OPENED"))) + && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) count++; }; item=item->nextSibling(); diff --git a/kcontrol/samba/kcmsambastatistics.h b/kcontrol/samba/kcmsambastatistics.h index 81af9131c..64c6026ad 100644 --- a/kcontrol/samba/kcmsambastatistics.h +++ b/kcontrol/samba/kcmsambastatistics.h @@ -75,7 +75,7 @@ class SambaLog LogItem* itemInList(TQString name); }; -class StatisticsView: public QWidget +class StatisticsView: public TQWidget { Q_OBJECT public: diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp index c94bc5129..b36d5325b 100644 --- a/kcontrol/samba/ksmbstatus.cpp +++ b/kcontrol/samba/ksmbstatus.cpp @@ -31,8 +31,8 @@ #include "ksmbstatus.moc" -#define Before(ttf,in) in.left(in.find(ttf)) -#define After(ttf,in) (in.contains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString("")) +#define Before(ttf,in) in.left(in.tqfind(ttf)) +#define After(ttf,in) (in.tqcontains(ttf)?TQString(in.mid(in.tqfind(ttf)+TQString(ttf).length())):TQString("")) NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name ) : TQWidget(parent, name) @@ -77,7 +77,7 @@ NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name ) void NetMon::processNFSLine(char *bufline, int) { TQCString line(bufline); - if (line.contains(":/")) + if (line.tqcontains(":/")) new TQListViewItem(list,"NFS",After(":",line),Before(":/",line)); } @@ -87,14 +87,14 @@ void NetMon::processSambaLine(char *bufline, int) rownumber++; if (rownumber == 2) version->setText(bufline); // second line = samba version - if ((readingpart==header) && line.contains("Service")) + if ((readingpart==header) && line.tqcontains("Service")) { - iUser=line.find("uid"); - iGroup=line.find("gid"); - iPid=line.find("pid"); - iMachine=line.find("machine"); + iUser=line.tqfind("uid"); + iGroup=line.tqfind("gid"); + iPid=line.tqfind("pid"); + iMachine=line.tqfind("machine"); } - else if ((readingpart==header) && (line.contains("---"))) + else if ((readingpart==header) && (line.tqcontains("---"))) { readingpart=connexions; } @@ -111,7 +111,7 @@ void NetMon::processSambaLine(char *bufline, int) } else if (readingpart==connexions) readingpart=locked_files; - else if ((readingpart==locked_files) && (line.find("No ")==0)) + else if ((readingpart==locked_files) && (line.tqfind("No ")==0)) readingpart=finished; else if (readingpart==locked_files) { diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h index 50caf64de..a38eca897 100644 --- a/kcontrol/samba/ksmbstatus.h +++ b/kcontrol/samba/ksmbstatus.h @@ -32,7 +32,7 @@ class TQListView; class TQListViewItem; class KProcess; -class NetMon : public QWidget +class NetMon : public TQWidget { Q_OBJECT public: diff --git a/kcontrol/screensaver/advanceddialogimpl.ui b/kcontrol/screensaver/advanceddialogimpl.ui index 814a3867c..6f03509b9 100644 --- a/kcontrol/screensaver/advanceddialogimpl.ui +++ b/kcontrol/screensaver/advanceddialogimpl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AdvancedDialogImpl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>qgbPriority</cstring> </property> @@ -36,7 +36,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="0"> + <widget class="TQComboBox" row="0" column="0"> <item> <property name="text"> <string>Low</string> @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> @@ -78,7 +78,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -89,7 +89,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="3" column="0" rowspan="2" colspan="2"> + <widget class="TQLabel" row="3" column="0" rowspan="2" colspan="2"> <property name="name"> <cstring>qlMonitorLabel</cstring> </property> @@ -97,7 +97,7 @@ <string></string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout8</cstring> </property> @@ -105,7 +105,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout1</cstring> </property> @@ -113,7 +113,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>qlTopLeft</cstring> </property> @@ -121,7 +121,7 @@ <string>Top left:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>No Action</string> @@ -153,14 +153,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout3</cstring> </property> @@ -168,7 +168,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>qlTopRight</cstring> </property> @@ -176,7 +176,7 @@ <string>Top right:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>No Action</string> @@ -200,7 +200,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout9</cstring> </property> @@ -208,7 +208,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout4</cstring> </property> @@ -216,7 +216,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>qlBottomLeft</cstring> </property> @@ -224,7 +224,7 @@ <string>Bottom left:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>No Action</string> @@ -256,14 +256,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -271,7 +271,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>qlBottomRight</cstring> </property> @@ -279,7 +279,7 @@ <string>Bottom right:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>No Action</string> @@ -303,7 +303,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout10</cstring> </property> @@ -321,14 +321,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>monitorLabel</cstring> </property> @@ -346,7 +346,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> @@ -365,7 +365,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -382,7 +382,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/screensaver/kswidget.cpp b/kcontrol/screensaver/kswidget.cpp index d13d131dc..66ba882d0 100644 --- a/kcontrol/screensaver/kswidget.cpp +++ b/kcontrol/screensaver/kswidget.cpp @@ -8,7 +8,7 @@ #endif KSWidget::KSWidget( TQWidget* parent, const char* name, int f ) - : QXEmbed( parent, name, f ), colormap( None ) + : QXEmbed( parent, name, (WFlags)f ), colormap( None ) { // use visual with support for double-buffering, for opengl // this code is duplicated in kdebase/kdesktop/lock/ @@ -54,7 +54,7 @@ KSWidget::KSWidget( TQWidget* parent, const char* name, int f ) } } } - Window w = XCreateWindow( x11Display(), parentWidget() ? parentWidget()->winId() : RootWindow( x11Display(), x11Screen()), + Window w = XCreateWindow( x11Display(), tqparentWidget() ? tqparentWidget()->winId() : RootWindow( x11Display(), x11Screen()), x(), y(), width(), height(), 0, x11Depth(), InputOutput, visual, flags, &attrs ); create( w ); #endif diff --git a/kcontrol/screensaver/saverconfig.cpp b/kcontrol/screensaver/saverconfig.cpp index bf8cdc54a..a7185135e 100644 --- a/kcontrol/screensaver/saverconfig.cpp +++ b/kcontrol/screensaver/saverconfig.cpp @@ -29,7 +29,7 @@ bool SaverConfig::read(const TQString &file) mSaver = config.readPathEntry("Exec"); } - int indx = file.findRev('/'); + int indx = file.tqfindRev('/'); if (indx >= 0) { mFile = file.mid(indx+1); } diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index f80cc19e9..7582aea53 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -133,12 +133,12 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mSaverGroup->setColumnLayout( 0, Qt::Horizontal ); vLayout->addWidget(mSaverGroup); vLayout->setStretchFactor( mSaverGroup, 10 ); - TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(), + TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->tqlayout(), KDialog::spacingHint() ); mSaverListView = new TQListView( mSaverGroup ); mSaverListView->setMinimumHeight( 120 ); - mSaverListView->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + mSaverListView->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); mSaverListView->addColumn(""); mSaverListView->header()->hide(); mSelected = -1; @@ -162,7 +162,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mSettingsGroup = new TQGroupBox( i18n("Settings"), this ); mSettingsGroup->setColumnLayout( 0, Qt::Vertical ); leftColumnLayout->addWidget( mSettingsGroup ); - groupLayout = new TQVBoxLayout( mSettingsGroup->layout(), + groupLayout = new TQVBoxLayout( mSettingsGroup->tqlayout(), KDialog::spacingHint() ); mEnabledCheckBox = new TQCheckBox(i18n( @@ -221,14 +221,14 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mWaitLockEdit->setSuffix(i18n(" sec")); mWaitLockEdit->setValue(mLockTimeout/1000); mWaitLockEdit->setEnabled(mEnabled && mLock); - if ( mWaitLockEdit->sizeHint().width() < - mWaitEdit->sizeHint().width() ) { - mWaitLockEdit->setFixedWidth( mWaitEdit->sizeHint().width() ); - mWaitEdit->setFixedWidth( mWaitEdit->sizeHint().width() ); + if ( mWaitLockEdit->tqsizeHint().width() < + mWaitEdit->tqsizeHint().width() ) { + mWaitLockEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() ); + mWaitEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() ); } else { - mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); - mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); + mWaitEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() ); + mWaitLockEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() ); } connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLockTimeoutChanged(int))); @@ -246,7 +246,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis new TQVBoxLayout(topLayout, KDialog::spacingHint()); mMonitorLabel = new TQLabel( this ); - mMonitorLabel->setAlignment( AlignCenter ); + mMonitorLabel->tqsetAlignment( AlignCenter ); mMonitorLabel->setPixmap( TQPixmap(locate("data", "kcontrol/pics/monitor.png"))); rightColumnLayout->addWidget(mMonitorLabel, 0); @@ -256,7 +256,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis advancedLayout->addWidget( new TQWidget( this ) ); TQPushButton* advancedBt = new TQPushButton( i18n( "Advanced &Options" ), this, "advancedBtn" ); - advancedBt->setSizePolicy( TQSizePolicy( + advancedBt->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); connect( advancedBt, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdvanced() ) ); @@ -360,7 +360,7 @@ void KScreenSaver::load( bool useDefaults ) for (SaverConfig* saver = mSaverList.first(); saver != 0; saver = mSaverList.next()) { if (saver->file() == mSaver) { - selectedItem = mSaverListView->findItem ( saver->name(), 0 ); + selectedItem = mSaverListView->tqfindItem ( saver->name(), 0 ); if (selectedItem) { mSelected = i; break; @@ -454,7 +454,7 @@ void KScreenSaver::save() // on exit. I don't know why yet. DCOPClient *client = kapp->dcopClient(); - client->send("kdesktop", "KScreensaverIface", "configure()", ""); + client->send("kdesktop", "KScreensaverIface", "configure()", TQString("")); mChanged = false; emit changed(false); @@ -503,7 +503,7 @@ void KScreenSaver::findSavers() item = new TQListViewItem ( mSaverListView, s->name(), "2" + s->name() ); else { - TQListViewItem *categoryItem = mSaverListView->findItem( s->category(), 0 ); + TQListViewItem *categoryItem = mSaverListView->tqfindItem( s->category(), 0 ); if ( !categoryItem ) { categoryItem = new TQListViewItem ( mSaverListView, s->category(), "1" + s->category() ); categoryItem->setPixmap ( 0, SmallIcon ( "kscreensaver" ) ); @@ -639,9 +639,9 @@ void KScreenSaver::slotScreenSaver(TQListViewItem *item) int i = 0, indx = -1; for (SaverConfig* saver = mSaverList.first(); saver != 0; saver = mSaverList.next()) { - if ( item->parent() ) + if ( item->tqparent() ) { - if ( item->parent()->text( 0 ) == saver->category() && saver->name() == item->text (0)) + if ( item->tqparent()->text( 0 ) == saver->category() && saver->name() == item->text (0)) { indx = i; break; @@ -739,7 +739,7 @@ void KScreenSaver::slotSetup() // void KScreenSaver::slotAdvanced() { - KScreenSaverAdvancedDialog dlg( topLevelWidget() ); + KScreenSaverAdvancedDialog dlg( tqtopLevelWidget() ); if ( dlg.exec() ) { mChanged = true; emit changed(true); diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h index b03bd878b..9dcf7f46e 100644 --- a/kcontrol/screensaver/scrnsave.h +++ b/kcontrol/screensaver/scrnsave.h @@ -81,7 +81,7 @@ protected: TQPushButton *mSetupBt; TQPushButton *mTestBt; TQListView *mSaverListView; - QSpinBox *mWaitEdit; + TQSpinBox *mWaitEdit; TQSpinBox *mWaitLockEdit; TQCheckBox *mLockCheckBox; TQCheckBox *mStarsCheckBox; diff --git a/kcontrol/screensaver/testwin.cpp b/kcontrol/screensaver/testwin.cpp index a5d316be5..3676c0db7 100644 --- a/kcontrol/screensaver/testwin.cpp +++ b/kcontrol/screensaver/testwin.cpp @@ -6,7 +6,7 @@ class QXEmbed; TestWin::TestWin() : KSWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM ) { - setFocusPolicy(StrongFocus); + setFocusPolicy(TQ_StrongFocus); KWin::setState( winId(), NET::StaysOnTop ); } diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui index fe8c4fa06..2620af0b5 100644 --- a/kcontrol/smartcard/nosmartcardbase.ui +++ b/kcontrol/smartcard/nosmartcardbase.ui @@ -23,7 +23,7 @@ <property name="text"> <string><b>Unable to contact the KDE smartcard service.</b></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -48,7 +48,7 @@ 2) You don't appear to have smartcard support in the KDE libraries. You will need to recompile the kdelibs package with libpcsclite installed.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui index b5dda006b..df12f9deb 100644 --- a/kcontrol/smartcard/smartcardbase.ui +++ b/kcontrol/smartcard/smartcardbase.ui @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>15</width> <height>20</height> @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -250,7 +250,7 @@ <property name="text"> <string>To add new readers you have to modify /etc/readers.conf file and re-start pcscd</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui index 518052675..5090fca0b 100644 --- a/kcontrol/smserver/smserverconfigdlg.ui +++ b/kcontrol/smserver/smserverconfigdlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SMServerConfigDlg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SMServerConfigDlg</cstring> </property> @@ -24,7 +24,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>topBox</cstring> </property> @@ -43,7 +43,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>confirmLogoutCheck</cstring> </property> @@ -54,7 +54,7 @@ <string>Check this option if you want the session manager to display a logout confirmation dialog box.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>offerShutdownCheck</cstring> </property> @@ -64,7 +64,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>loginGroup</cstring> </property> @@ -82,7 +82,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>previousSessionRadio</cstring> </property> @@ -90,7 +90,7 @@ <string>Restore &previous session</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>savedSessionRadio</cstring> </property> @@ -98,7 +98,7 @@ <string>Restore &manually saved session</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>emptySessionRadio</cstring> </property> @@ -108,7 +108,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>sdGroup</cstring> </property> @@ -122,7 +122,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>logoutRadio</cstring> </property> @@ -130,7 +130,7 @@ <string>&End current session</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>haltRadio</cstring> </property> @@ -138,7 +138,7 @@ <string>&Turn off computer</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rebootRadio</cstring> </property> @@ -148,7 +148,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>advancedGroup</cstring> </property> @@ -159,7 +159,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -190,7 +190,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>130</height> diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index f351d3f2c..41d775ba5 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -160,8 +160,8 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) gbWidgetStyle->layout()->setMargin( KDialog::marginHint() ); gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() ); - gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() ); - gbWidgetStyleLayout->setAlignment( Qt::AlignTop ); + gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->tqlayout() ); + gbWidgetStyleLayout->tqsetAlignment( Qt::AlignTop ); hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" ); cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" ); @@ -169,14 +169,14 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) hbLayout->addWidget( cbStyle ); pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle ); - pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum ); + pbConfigStyle->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum ); pbConfigStyle->setEnabled( FALSE ); hbLayout->addWidget( pbConfigStyle ); gbWidgetStyleLayout->addLayout( hbLayout ); lblStyleDesc = new TQLabel( gbWidgetStyle ); - lblStyleDesc->setTextFormat(Qt::RichText); + lblStyleDesc->setTextFormat(TQt::RichText); gbWidgetStyleLayout->addWidget( lblStyleDesc ); cbIconsOnButtons = new TQCheckBox( i18n("Sho&w icons on buttons"), gbWidgetStyle ); @@ -187,13 +187,13 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) gbWidgetStyleLayout->addWidget( cbTearOffHandles ); cbTearOffHandles->hide(); // reenable when the corresponding Qt method is virtual and properly reimplemented - TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 ); - gbPreview->setColumnLayout( 0, Vertical ); + TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 ); + gbPreview->setColumnLayout( 0, Qt::Vertical ); gbPreview->layout()->setMargin( 0 ); gbPreview->layout()->setSpacing( KDialog::spacingHint() ); gbPreview->setFlat( true ); stylePreview = new StylePreview( gbPreview ); - gbPreview->layout()->add( stylePreview ); + gbPreview->tqlayout()->add( stylePreview ); page1Layout->addWidget( gbWidgetStyle ); page1Layout->addWidget( gbPreview ); @@ -294,16 +294,16 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) box1->setSpacing( KDialog::spacingHint() ); box1->setMargin( 0 ); TQLabel* lbl = new TQLabel( i18n("0%"), box1 ); - lbl->setAlignment( AlignLeft ); + lbl->tqsetAlignment( AlignLeft ); lbl = new TQLabel( i18n("50%"), box1 ); - lbl->setAlignment( AlignHCenter ); + lbl->tqsetAlignment( AlignHCenter ); lbl = new TQLabel( i18n("100%"), box1 ); - lbl->setAlignment( AlignRight ); + lbl->tqsetAlignment( AlignRight ); lblMenuEffectType = new TQLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer ); - lblMenuEffectType->setAlignment( AlignBottom | AlignLeft ); + lblMenuEffectType->tqsetAlignment( AlignBottom | AlignLeft ); lblMenuOpacity = new TQLabel( slOpacity, i18n("Menu &opacity:"), menuContainer ); - lblMenuOpacity->setAlignment( AlignBottom | AlignLeft ); + lblMenuOpacity->tqsetAlignment( AlignBottom | AlignLeft ); menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 ); menuContainerLayout->addWidget( comboMenuEffectType, 1, 0 ); @@ -642,7 +642,7 @@ void KCMStyle::save() if (m_bEffectsDirty) { KIPC::sendMessageAll(KIPC::SettingsChanged); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } //update kicker to re-used tooltips kicker parameter otherwise, it overwritted //by style tooltips parameters. @@ -659,7 +659,7 @@ void KCMStyle::save() bool KCMStyle::findStyle( const TQString& str, int& combobox_item ) { - StyleEntry* se = styleEntries.find(str.lower()); + StyleEntry* se = styleEntries.tqfind(str.lower()); TQString name = se ? se->name : str; @@ -754,7 +754,7 @@ void KCMStyle::loadStyle( KConfig& config ) { TQString id = (*it).lower(); // Find the entry. - if ( (entry = styleEntries.find(id)) != 0 ) + if ( (entry = styleEntries.tqfind(id)) != 0 ) { // Do not add hidden entries if (entry->hidden) @@ -795,9 +795,9 @@ void KCMStyle::loadStyle( KConfig& config ) item = i; if ( id == cfgStyle ) // ExactMatch break; - else if ( id.contains( cfgStyle ) ) + else if ( id.tqcontains( cfgStyle ) ) break; - else if ( id.contains( TQApplication::style().className() ) ) + else if ( id.tqcontains( TQApplication::tqstyle().className() ) ) break; item = 0; } @@ -823,7 +823,7 @@ void KCMStyle::styleChanged() void KCMStyle::switchStyle(const TQString& styleName, bool force) { // Don't flicker the preview if the same style is chosen in the cb - if (!force && appliedStyle && appliedStyle->name() == styleName) + if (!force && appliedStyle && TQT_TQOBJECT(appliedStyle)->name() == styleName) return; // Create an instance of the new style... @@ -837,13 +837,13 @@ void KCMStyle::switchStyle(const TQString& styleName, bool force) setStyleRecursive( stylePreview, style ); // this flickers, but reliably draws the widgets correctly. - stylePreview->resize( stylePreview->sizeHint() ); + stylePreview->resize( stylePreview->tqsizeHint() ); delete appliedStyle; appliedStyle = style; // Set the correct style description - StyleEntry* entry = styleEntries.find( styleName ); + StyleEntry* entry = styleEntries.tqfind( styleName ); TQString desc; desc = i18n("Description: %1").arg( entry ? entry->desc : i18n("No description available.") ); lblStyleDesc->setText( desc ); @@ -863,12 +863,12 @@ void KCMStyle::setStyleRecursive(TQWidget* w, TQStyle* s) w->setStyle(s); // Recursively update all children. - const TQObjectList *children = w->children(); - if (!children) + const TQObjectList children = w->childrenListObject(); + if (children.isEmpty()) return; // Apply the style to each child widget. - TQPtrListIterator<TQObject> childit(*children); + TQPtrListIterator<TQObject> childit(children); TQObject *child; while ((child = childit.current()) != 0) { diff --git a/kcontrol/style/keramik/keramikconf.h b/kcontrol/style/keramik/keramikconf.h index de1c58dfd..6de7edb10 100644 --- a/kcontrol/style/keramik/keramikconf.h +++ b/kcontrol/style/keramik/keramikconf.h @@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE. class TQCheckBox; -class KeramikStyleConfig: public QWidget +class KeramikStyleConfig: public TQWidget { Q_OBJECT public: diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp index 112f2c241..51d5aad5f 100644 --- a/kcontrol/style/menupreview.cpp +++ b/kcontrol/style/menupreview.cpp @@ -30,11 +30,11 @@ MenuPreview::MenuPreview( TQWidget* parent, int opacity, PreviewMode pvm ) - : TQWidget( parent, 0, WStyle_Customize | WRepaintNoErase ), + : TQWidget( parent, 0, (WFlags)(WStyle_Customize | WRepaintNoErase) ), pixBackground(NULL), pixOverlay(NULL), pixBlended(NULL) { setFixedSize(150, 150); - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); mode = pvm; if (opacity < 0) opacity = 0; @@ -68,7 +68,7 @@ void MenuPreview::createPixmaps() if (pixBlended) pixBlended->resize( w, h ); - TQColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); TQColor c1 = cg.background(); TQColor c2 = cg.mid(); @@ -96,7 +96,7 @@ void MenuPreview::createPixmaps() void MenuPreview::blendPixmaps() { - // Rebuild pixmaps, and repaint + // Rebuild pixmaps, and tqrepaint if (pixBlended && pixBackground) { if (mode == Blend && pixOverlay) { @@ -105,7 +105,7 @@ void MenuPreview::blendPixmaps() KImageEffect::blend(src, dst, menuOpacity); pixBlended->convertFromImage( dst ); } else if (mode == Tint) { - TQColor clr = colorGroup().button(); + TQColor clr = tqcolorGroup().button(); TQImage dst = pixBackground->convertToImage(); KImageEffect::blend(clr, dst, menuOpacity); pixBlended->convertFromImage( dst ); @@ -121,7 +121,7 @@ void MenuPreview::setOpacity( int opacity ) if ((int)(menuOpacity*100) != opacity) { menuOpacity = opacity/100.0; blendPixmaps(); - repaint( false ); + tqrepaint( false ); } } @@ -130,14 +130,14 @@ void MenuPreview::setPreviewMode( PreviewMode pvm ) if (mode != pvm) { mode = pvm; blendPixmaps(); - repaint( false ); + tqrepaint( false ); } } void MenuPreview::paintEvent( TQPaintEvent* /* pe */ ) { // Paint the frame and blended pixmap - TQColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); int x2 = width()-1; int y2 = height()-1; diff --git a/kcontrol/style/menupreview.h b/kcontrol/style/menupreview.h index ad22e77af..e82b88f18 100644 --- a/kcontrol/style/menupreview.h +++ b/kcontrol/style/menupreview.h @@ -24,7 +24,7 @@ class KPixmap; -class MenuPreview : public QWidget +class MenuPreview : public TQWidget { Q_OBJECT diff --git a/kcontrol/style/stylepreview.ui b/kcontrol/style/stylepreview.ui index fbb4929f2..d438c0ad8 100644 --- a/kcontrol/style/stylepreview.ui +++ b/kcontrol/style/stylepreview.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>StylePreview</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>StylePreview</cstring> </property> @@ -29,14 +29,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> </size> </property> </spacer> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>TabWidget2</cstring> </property> @@ -51,7 +51,7 @@ <property name="margin"> <number>2</number> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -62,7 +62,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0" rowspan="4" colspan="1"> + <widget class="TQButtonGroup" row="0" column="0" rowspan="4" colspan="1"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -73,7 +73,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton1</cstring> </property> @@ -84,7 +84,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton2</cstring> </property> @@ -106,7 +106,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>CheckBox1</cstring> </property> @@ -122,7 +122,7 @@ </widget> </vbox> </widget> - <widget class="QScrollBar" row="0" column="2" rowspan="4" colspan="1"> + <widget class="TQScrollBar" row="0" column="2" rowspan="4" colspan="1"> <property name="name"> <cstring>ScrollBar1</cstring> </property> @@ -133,7 +133,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <item> <property name="text"> <string>Combobox</string> @@ -143,7 +143,7 @@ <cstring>ComboBox1</cstring> </property> </widget> - <widget class="QProgressBar" row="0" column="1"> + <widget class="TQProgressBar" row="0" column="1"> <property name="name"> <cstring>ProgressBar1</cstring> </property> @@ -151,7 +151,7 @@ <number>70</number> </property> </widget> - <widget class="QSlider" row="1" column="1"> + <widget class="TQSlider" row="1" column="1"> <property name="name"> <cstring>Slider1</cstring> </property> @@ -159,7 +159,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> <cstring>layout3</cstring> </property> @@ -177,14 +177,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>SpinBox1</cstring> </property> @@ -196,13 +196,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>200</width> <height>32767</height> @@ -212,7 +212,7 @@ <number>999999</number> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>PushButton1</cstring> </property> @@ -224,13 +224,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>200</width> <height>32767</height> @@ -250,7 +250,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -261,7 +261,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -276,10 +276,10 @@ <include location="local" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">stylepreview.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>init()</slot> - <slot returnType="bool">eventFilter( QObject *, QEvent * ev )</slot> -</slots> + <slot returnType="bool">eventFilter( TQObject *, TQEvent * ev )</slot> +</Q_SLOTS> <layoutdefaults spacing="6" margin="10"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/style/stylepreview.ui.h b/kcontrol/style/stylepreview.ui.h index 076197955..9f5188afe 100644 --- a/kcontrol/style/stylepreview.ui.h +++ b/kcontrol/style/stylepreview.ui.h @@ -40,7 +40,7 @@ void StylePreview::init() { ++it; obj->installEventFilter(this); - ((TQWidget*)obj)->setFocusPolicy(NoFocus); + ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus); } delete l; } diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui index d234683ca..6802dd226 100644 --- a/kcontrol/taskbar/kcmtaskbarui.ui +++ b/kcontrol/taskbar/kcmtaskbarui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TaskbarConfigUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>TaskbarConfigUI</cstring> </property> @@ -24,7 +24,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>taskbarGroup</cstring> </property> @@ -39,7 +39,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_SortByDesktop</cstring> </property> @@ -55,7 +55,7 @@ By default this option is selected.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_ShowAllWindows</cstring> </property> @@ -71,7 +71,7 @@ By default this option is selected.</string> By default, this option is selected and all windows are shown.</string> </property> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_ShowWindowListBtn</cstring> </property> @@ -85,7 +85,7 @@ By default, this option is selected and all windows are shown.</string> <string>Selecting this option causes the taskbar to display a button that, when clicked, shows a list of all windows in a popup menu.</string> </property> </widget> - <widget class="QComboBox" row="7" column="2"> + <widget class="TQComboBox" row="7" column="2"> <property name="name"> <cstring>kcfg_GroupTasks</cstring> </property> @@ -105,7 +105,7 @@ You can set the taskbar to <strong>Never</strong> group windows, to By default the taskbar groups windows when it is full.</string> </property> </widget> - <widget class="QLabel" row="7" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="7" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupTasksLabel</cstring> </property> @@ -116,7 +116,7 @@ By default the taskbar groups windows when it is full.</string> <cstring>kcfg_GroupTasks</cstring> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_ShowOnlyIconified</cstring> </property> @@ -129,7 +129,7 @@ By default the taskbar groups windows when it is full.</string> By default, this option is not selected and the taskbar will show all windows.</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_ShowIcon</cstring> </property> @@ -145,7 +145,7 @@ By default, this option is not selected and the taskbar will show all windows.</ By default this option is selected.</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>showAllScreens</cstring> </property> @@ -161,12 +161,12 @@ By default this option is selected.</string> By default, this option is selected and all windows are shown.</string> </property> </widget> - <widget class="QComboBox" row="8" column="2"> + <widget class="TQComboBox" row="8" column="2"> <property name="name"> <cstring>appearance</cstring> </property> </widget> - <widget class="QLabel" row="8" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -177,7 +177,7 @@ By default, this option is selected and all windows are shown.</string> <cstring>appearance</cstring> </property> </widget> - <widget class="QCheckBox" row="9" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="9" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_UseCustomColors</cstring> </property> @@ -191,7 +191,7 @@ By default, this option is selected and all windows are shown.</string> <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget" row="10" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="10" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>layout9</cstring> </property> @@ -209,7 +209,7 @@ By default, this option is selected and all windows are shown.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>191</width> <height>20</height> @@ -234,7 +234,7 @@ By default, this option is selected and all windows are shown.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>191</width> <height>20</height> @@ -249,7 +249,7 @@ By default, this option is selected and all windows are shown.</string> <string></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>taskBackgroundColorLabel</cstring> </property> @@ -268,7 +268,7 @@ By default, this option is selected and all windows are shown.</string> <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>inactiveTaskTextColorLabel</cstring> </property> @@ -279,7 +279,7 @@ By default, this option is selected and all windows are shown.</string> <cstring>kcfg_InactiveTaskTextColor</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>activeTaskTextColorLabel</cstring> </property> @@ -300,7 +300,7 @@ By default, this option is selected and all windows are shown.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>191</width> <height>20</height> @@ -319,14 +319,14 @@ By default, this option is selected and all windows are shown.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_SortByApp</cstring> </property> @@ -339,7 +339,7 @@ By default, this option is selected and all windows are shown.</string> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -350,7 +350,7 @@ By default, this option is selected and all windows are shown.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>leftButtonLabel</cstring> </property> @@ -361,7 +361,7 @@ By default, this option is selected and all windows are shown.</string> <cstring>kcfg_LeftButtonAction</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>middleButtonLabel</cstring> </property> @@ -372,7 +372,7 @@ By default, this option is selected and all windows are shown.</string> <cstring>kcfg_MiddleButtonAction</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>rightButtonLabel</cstring> </property> @@ -383,7 +383,7 @@ By default, this option is selected and all windows are shown.</string> <cstring>kcfg_RightButtonAction</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>kcfg_LeftButtonAction</cstring> </property> @@ -396,7 +396,7 @@ By default, this option is selected and all windows are shown.</string> </sizepolicy> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>kcfg_MiddleButtonAction</cstring> </property> @@ -409,7 +409,7 @@ By default, this option is selected and all windows are shown.</string> </sizepolicy> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <property name="name"> <cstring>kcfg_RightButtonAction</cstring> </property> @@ -434,7 +434,7 @@ By default, this option is selected and all windows are shown.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp index f3a5a85df..8d85b2fb5 100644 --- a/kcontrol/usbview/kcmusb.cpp +++ b/kcontrol/usbview/kcmusb.cpp @@ -39,7 +39,7 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &) gbox->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(gbox); - TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint()); + TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->tqlayout(), KDialog::spacingHint()); TQSplitter *splitter = new TQSplitter(gbox); vvbox->addWidget(splitter); @@ -87,12 +87,12 @@ void USBViewer::load() refresh(); } -static Q_UINT32 key( USBDevice &dev ) +static TQ_UINT32 key( USBDevice &dev ) { return dev.bus()*256 + dev.device(); } -static Q_UINT32 key_parent( USBDevice &dev ) +static TQ_UINT32 key_parent( USBDevice &dev ) { return dev.bus()*256 + dev.parent(); } @@ -104,7 +104,7 @@ static void delete_recursive( TQListViewItem *item, const TQIntDict<TQListViewIt TQListViewItemIterator it( item ); while ( it.current() ) { - if (!new_items.find(it.current()->text(1).toUInt())) { + if (!new_items.tqfind(it.current()->text(1).toUInt())) { delete_recursive( it.current()->firstChild(), new_items); delete it.current(); } @@ -130,10 +130,10 @@ void USBViewer::refresh() for ( ; it.current(); ++it) if (it.current()->level() == level) { - Q_UINT32 k = key(*it.current()); + TQ_UINT32 k = key(*it.current()); if (level == 0) { - TQListViewItem *item = _items.find(k); + TQListViewItem *item = _items.tqfind(k); if (!item) { item = new TQListViewItem(_devices, it.current()->product(), @@ -144,10 +144,10 @@ void USBViewer::refresh() } else { - TQListViewItem *parent = new_items.find(key_parent(*it.current())); + TQListViewItem *parent = new_items.tqfind(key_parent(*it.current())); if (parent) { - TQListViewItem *item = _items.find(k); + TQListViewItem *item = _items.tqfind(k); if (!item) { item = new TQListViewItem(parent, @@ -178,7 +178,7 @@ void USBViewer::selectionChanged(TQListViewItem *item) { if (item) { - Q_UINT32 busdev = item->text(1).toUInt(); + TQ_UINT32 busdev = item->text(1).toUInt(); USBDevice *dev = USBDevice::find(busdev>>8, busdev&255); if (dev) { diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp index 466fd9a98..63a049742 100644 --- a/kcontrol/usbview/usbdevices.cpp +++ b/kcontrol/usbview/usbdevices.cpp @@ -103,7 +103,7 @@ void USBDevice::parseSysDir(int bus, int parent, int level, TQString dname) TQStringList list = dir.entryList(); for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - if ((*it).contains(':')) + if ((*it).tqcontains(':')) continue; USBDevice* dev = new USBDevice(); @@ -277,8 +277,8 @@ bool USBDevice::parse(TQString fname) // read in the device infos USBDevice *device = 0; int start=0, end; - result.replace(TQRegExp("^\n"),""); - while ((end = result.find('\n', start)) > 0) + result.tqreplace(TQRegExp("^\n"),""); + while ((end = result.tqfind('\n', start)) > 0) { TQString line = result.mid(start, end-start); @@ -332,10 +332,10 @@ void USBDevice::collectData( int fd, int level, usb_device_info &di, int parent) _bus = di.udi_bus; _device = di.udi_addr; - _product = TQString::fromLatin1(di.udi_product); + _product = TQString::tqfromLatin1(di.udi_product); if ( _device == 1 ) _product += " " + TQString::number( _bus ); - _manufacturer = TQString::fromLatin1(di.udi_vendor); + _manufacturer = TQString::tqfromLatin1(di.udi_vendor); _prodID = di.udi_productNo; _vendorID = di.udi_vendorNo; _class = di.udi_class; diff --git a/kcontrol/view1394/view1394widget.ui b/kcontrol/view1394/view1394widget.ui index 5b6ba13e8..a249fb195 100644 --- a/kcontrol/view1394/view1394widget.ui +++ b/kcontrol/view1394/view1394widget.ui @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index df9cbb6a6..d7219e17e 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -177,7 +177,7 @@ void KCMXinerama::save() { if (!kapp->dcopClient()->isAttached()) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin", "", "reconfigure()", TQString("")); ksplashrc->setGroup("Xinerama"); ksplashrc->writeEntry("KSplashScreen", xw->_enableXinerama->isChecked() ? xw->_ksplashDisplay->currentItem() : -2 /* ignore Xinerama */); @@ -216,17 +216,17 @@ void KCMXinerama::windowIndicator(int dpy) { } TQWidget *KCMXinerama::indicator(int dpy) { - TQLabel *si = new TQLabel(TQString::number(dpy+1), 0, "Screen Indicator", WX11BypassWM ); + TQLabel *si = new TQLabel(TQString::number(dpy+1), 0, "Screen Indicator", (WFlags)WX11BypassWM ); TQFont fnt = KGlobalSettings::generalFont(); fnt.setPixelSize(100); si->setFont(fnt); si->setFrameStyle(TQFrame::Panel); si->setFrameShadow(TQFrame::Plain); - si->setAlignment(Qt::AlignCenter); + si->tqsetAlignment(Qt::AlignCenter); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(dpy).center()); - TQRect targetGeometry(TQPoint(0,0), si->sizeHint()); + TQRect targetGeometry(TQPoint(0,0), si->tqsizeHint()); targetGeometry.moveCenter(screenCenter); si->setGeometry(targetGeometry); si->show(); diff --git a/kcontrol/xinerama/xineramawidget.ui b/kcontrol/xinerama/xineramawidget.ui index cab732afd..d01495fdc 100644 --- a/kcontrol/xinerama/xineramawidget.ui +++ b/kcontrol/xinerama/xineramawidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>XineramaWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>XineramaWidget</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTable" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQTable" row="1" column="0" rowspan="1" colspan="2"> <column> <property name="text"> <string>X Coordinate</string> @@ -73,7 +73,7 @@ <enum>FollowStyle</enum> </property> </widget> - <widget class="QButtonGroup" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -84,7 +84,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_enableXinerama</cstring> </property> @@ -92,7 +92,7 @@ <string>Enable multiple monitor virtual desktop support</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_enableResistance</cstring> </property> @@ -103,7 +103,7 @@ <string>Enable multiple monitor window resistance support</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_enablePlacement</cstring> </property> @@ -114,7 +114,7 @@ <string>Enable multiple monitor window placement support</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_enableMaximize</cstring> </property> @@ -125,7 +125,7 @@ <string>Enable multiple monitor window maximize support</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_enableFullscreen</cstring> </property> @@ -138,7 +138,7 @@ </widget> </vbox> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>_identify</cstring> </property> @@ -156,14 +156,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>431</width> <height>21</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout2</cstring> </property> @@ -171,7 +171,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -185,7 +185,7 @@ <cstring>_unmanagedDisplay</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>_ksplashDisplay</cstring> </property> @@ -193,7 +193,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -207,7 +207,7 @@ <cstring>_unmanagedDisplay</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>_unmanagedDisplay</cstring> </property> @@ -315,12 +315,12 @@ <include location="local" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">xineramawidget.ui.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>configChanged()</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot access="private">emitConfigChanged()</slot> -</slots> +</Q_SLOTS> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> |