summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kcontrol
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-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')
-rw-r--r--kcontrol/access/kaccess.cpp2
-rw-r--r--kcontrol/access/kaccess.h2
-rw-r--r--kcontrol/access/kcmaccess.cpp22
-rw-r--r--kcontrol/accessibility/accessibilityconfigwidget.ui30
-rw-r--r--kcontrol/arts/arts.cpp28
-rw-r--r--kcontrol/arts/generaltab.ui40
-rw-r--r--kcontrol/arts/hardwaretab.ui50
-rw-r--r--kcontrol/arts/krichtextlabel.cpp14
-rw-r--r--kcontrol/arts/krichtextlabel.h4
-rw-r--r--kcontrol/background/bgadvanced.cpp8
-rw-r--r--kcontrol/background/bgadvanced_ui.ui46
-rw-r--r--kcontrol/background/bgdialog.cpp42
-rw-r--r--kcontrol/background/bgdialog_ui.ui78
-rw-r--r--kcontrol/background/bghash.h4
-rw-r--r--kcontrol/background/bgmonitor.cpp8
-rw-r--r--kcontrol/background/bgmonitor.h6
-rw-r--r--kcontrol/background/bgrender.cpp48
-rw-r--r--kcontrol/background/bgsettings.cpp30
-rw-r--r--kcontrol/background/bgwallpaper.h2
-rw-r--r--kcontrol/background/bgwallpaper_ui.ui28
-rw-r--r--kcontrol/background/main.cpp2
-rw-r--r--kcontrol/clock/dtime.cpp22
-rw-r--r--kcontrol/clock/dtime.h26
-rw-r--r--kcontrol/clock/tzone.cpp4
-rw-r--r--kcontrol/clock/tzone.h2
-rw-r--r--kcontrol/colors/colorscm.cpp12
-rw-r--r--kcontrol/colors/widgetcanvas.cpp30
-rw-r--r--kcontrol/colors/widgetcanvas.h2
-rw-r--r--kcontrol/componentchooser/browserconfig_ui.ui20
-rw-r--r--kcontrol/componentchooser/componentchooser.cpp32
-rw-r--r--kcontrol/componentchooser/componentchooser_ui.ui12
-rw-r--r--kcontrol/componentchooser/componentconfig_ui.ui8
-rw-r--r--kcontrol/componentchooser/emailclientconfig_ui.ui24
-rw-r--r--kcontrol/componentchooser/terminalemulatorconfig_ui.ui20
-rw-r--r--kcontrol/crypto/certgen.ui62
-rw-r--r--kcontrol/crypto/crypto.cpp120
-rw-r--r--kcontrol/crypto/crypto.h10
-rw-r--r--kcontrol/crypto/kdatetimedlg.cpp2
-rw-r--r--kcontrol/css/cssconfig.ui24
-rw-r--r--kcontrol/css/csscustom.ui58
-rw-r--r--kcontrol/css/kcmcss.cpp4
-rw-r--r--kcontrol/css/preview.ui8
-rw-r--r--kcontrol/css/template.cpp6
-rw-r--r--kcontrol/display/display.cpp2
-rw-r--r--kcontrol/dnssd/configdialog.ui34
-rw-r--r--kcontrol/dnssd/kcmdnssd.cpp6
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp4
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui18
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp44
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp4
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui10
-rw-r--r--kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp12
-rw-r--r--kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp44
-rw-r--r--kcontrol/filetypes/filegroupdetails.cpp6
-rw-r--r--kcontrol/filetypes/filegroupdetails.h2
-rw-r--r--kcontrol/filetypes/filetypedetails.cpp4
-rw-r--r--kcontrol/filetypes/filetypedetails.h2
-rw-r--r--kcontrol/filetypes/filetypesview.cpp16
-rw-r--r--kcontrol/filetypes/kservicelistwidget.h4
-rw-r--r--kcontrol/filetypes/newtypedlg.cpp2
-rw-r--r--kcontrol/filetypes/typeslistitem.cpp32
-rw-r--r--kcontrol/filetypes/typeslistitem.h2
-rw-r--r--kcontrol/fonts/kxftconfig.cpp36
-rw-r--r--kcontrol/iccconfig/iccconfig.cpp10
-rw-r--r--kcontrol/iccconfig/iccconfigbase.ui24
-rw-r--r--kcontrol/icons/icons.cpp56
-rw-r--r--kcontrol/icons/iconthemes.cpp2
-rw-r--r--kcontrol/info/info.cpp16
-rw-r--r--kcontrol/info/info.h4
-rw-r--r--kcontrol/info/info_fbsd.cpp26
-rw-r--r--kcontrol/info/info_linux.cpp14
-rw-r--r--kcontrol/info/info_netbsd.cpp22
-rw-r--r--kcontrol/info/info_openbsd.cpp12
-rw-r--r--kcontrol/info/info_solaris.cpp4
-rw-r--r--kcontrol/info/info_svr4.cpp4
-rw-r--r--kcontrol/info/memory.cpp12
-rw-r--r--kcontrol/info/opengl.cpp10
-rw-r--r--kcontrol/input/core/themepage.cpp4
-rw-r--r--kcontrol/input/core/themepage.h4
-rw-r--r--kcontrol/input/kapplymousetheme.cpp22
-rw-r--r--kcontrol/input/kmousedlg.ui60
-rw-r--r--kcontrol/input/logitechmouse.cpp6
-rw-r--r--kcontrol/input/logitechmouse.h22
-rw-r--r--kcontrol/input/logitechmouse_base.ui24
-rw-r--r--kcontrol/input/mouse.cpp10
-rw-r--r--kcontrol/input/xcursor/previewwidget.cpp4
-rw-r--r--kcontrol/input/xcursor/themepage.cpp26
-rw-r--r--kcontrol/ioslaveinfo/kcmioslaveinfo.cpp10
-rw-r--r--kcontrol/joystick/caldialog.cpp4
-rw-r--r--kcontrol/joystick/joystick.cpp2
-rw-r--r--kcontrol/joystick/joywidget.cpp10
-rw-r--r--kcontrol/joystick/joywidget.h2
-rw-r--r--kcontrol/joystick/poswidget.h2
-rw-r--r--kcontrol/kcontrol/aboutwidget.cpp2
-rw-r--r--kcontrol/kcontrol/aboutwidget.h2
-rw-r--r--kcontrol/kcontrol/dockcontainer.cpp8
-rw-r--r--kcontrol/kcontrol/dockcontainer.h4
-rw-r--r--kcontrol/kcontrol/global.cpp4
-rw-r--r--kcontrol/kcontrol/helpwidget.cpp4
-rw-r--r--kcontrol/kcontrol/helpwidget.h2
-rw-r--r--kcontrol/kcontrol/indexwidget.cpp2
-rw-r--r--kcontrol/kcontrol/indexwidget.h2
-rw-r--r--kcontrol/kcontrol/kcrootonly.cpp4
-rw-r--r--kcontrol/kcontrol/main.cpp12
-rw-r--r--kcontrol/kcontrol/moduleIface.cpp2
-rw-r--r--kcontrol/kcontrol/moduleiconview.cpp2
-rw-r--r--kcontrol/kcontrol/modulemenu.cpp4
-rw-r--r--kcontrol/kcontrol/modules.cpp22
-rw-r--r--kcontrol/kcontrol/moduletreeview.cpp14
-rw-r--r--kcontrol/kcontrol/moduletreeview.h4
-rw-r--r--kcontrol/kcontrol/proxywidget.cpp24
-rw-r--r--kcontrol/kcontrol/proxywidget.h2
-rw-r--r--kcontrol/kcontrol/searchwidget.cpp2
-rw-r--r--kcontrol/kcontrol/searchwidget.h2
-rw-r--r--kcontrol/kcontrol/toplevel.cpp24
-rw-r--r--kcontrol/kded/kcmkded.cpp18
-rw-r--r--kcontrol/kded/kcmkded.h2
-rw-r--r--kcontrol/kdm/background.h2
-rw-r--r--kcontrol/kdm/kbackedcombobox.cpp2
-rw-r--r--kcontrol/kdm/kdm-appear.cpp32
-rw-r--r--kcontrol/kdm/kdm-appear.h2
-rw-r--r--kcontrol/kdm/kdm-conv.cpp14
-rw-r--r--kcontrol/kdm/kdm-conv.h16
-rw-r--r--kcontrol/kdm/kdm-font.h4
-rw-r--r--kcontrol/kdm/kdm-shut.h6
-rw-r--r--kcontrol/kdm/kdm-users.cpp38
-rw-r--r--kcontrol/kdm/kdm-users.h30
-rw-r--r--kcontrol/kdm/main.cpp18
-rw-r--r--kcontrol/kdm/main.h2
-rw-r--r--kcontrol/keys/commandShortcuts.cpp14
-rw-r--r--kcontrol/keys/commandShortcuts.h2
-rw-r--r--kcontrol/keys/kaccelaction.h2
-rw-r--r--kcontrol/keys/keyconfig.cpp14
-rw-r--r--kcontrol/keys/keyconfig.h2
-rw-r--r--kcontrol/keys/modifiers.h2
-rw-r--r--kcontrol/keys/shortcuts.cpp18
-rw-r--r--kcontrol/keys/shortcuts.h2
-rw-r--r--kcontrol/keys/treeview.cpp14
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp28
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KFileFontView.h2
-rw-r--r--kcontrol/kfontinst/kfile-plugin/KFileFont.cpp68
-rw-r--r--kcontrol/kfontinst/kfontinst/FontEngine.cpp4
-rw-r--r--kcontrol/kfontinst/kfontinst/Fontmap.cpp20
-rw-r--r--kcontrol/kfontinst/kfontinst/Main.cpp4
-rw-r--r--kcontrol/kfontinst/kfontinst/XConfig.cpp4
-rw-r--r--kcontrol/kfontinst/kio/KioFonts.cpp64
-rw-r--r--kcontrol/kfontinst/kio/KioFonts.h4
-rw-r--r--kcontrol/kfontinst/lib/FcEngine.cpp58
-rw-r--r--kcontrol/kfontinst/lib/Misc.cpp14
-rw-r--r--kcontrol/kfontinst/viewpart/FontPreview.cpp6
-rw-r--r--kcontrol/kfontinst/viewpart/FontPreview.h6
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewPart.cpp16
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewerApp.cpp6
-rw-r--r--kcontrol/kicker/advancedDialog.cpp6
-rw-r--r--kcontrol/kicker/advancedOptions.ui40
-rw-r--r--kcontrol/kicker/applettab.ui34
-rw-r--r--kcontrol/kicker/applettab_impl.cpp4
-rw-r--r--kcontrol/kicker/extensionInfo.cpp16
-rw-r--r--kcontrol/kicker/extensionInfo.h4
-rw-r--r--kcontrol/kicker/hidingtab.ui74
-rw-r--r--kcontrol/kicker/lookandfeeltab.ui50
-rw-r--r--kcontrol/kicker/lookandfeeltab_impl.cpp12
-rw-r--r--kcontrol/kicker/main.cpp4
-rw-r--r--kcontrol/kicker/menutab.ui88
-rw-r--r--kcontrol/kicker/menutab_impl.cpp12
-rw-r--r--kcontrol/kicker/menutab_impl.h2
-rw-r--r--kcontrol/kicker/positiontab.ui146
-rw-r--r--kcontrol/kicker/positiontab_impl.cpp14
-rw-r--r--kcontrol/kio/cache_ui.ui20
-rw-r--r--kcontrol/kio/envvarproxy_ui.ui16
-rw-r--r--kcontrol/kio/fakeuaprovider.cpp30
-rw-r--r--kcontrol/kio/kcookiesmanagement.cpp16
-rw-r--r--kcontrol/kio/kcookiesmanagement.h2
-rw-r--r--kcontrol/kio/kcookiesmanagementdlg_ui.ui36
-rw-r--r--kcontrol/kio/kcookiespolicies.cpp4
-rw-r--r--kcontrol/kio/kcookiespoliciesdlg_ui.ui40
-rw-r--r--kcontrol/kio/kenvvarproxydlg.cpp8
-rw-r--r--kcontrol/kio/kmanualproxydlg.cpp4
-rw-r--r--kcontrol/kio/kproxydlg_ui.ui44
-rw-r--r--kcontrol/kio/ksaveioconfig.cpp20
-rw-r--r--kcontrol/kio/manualproxy_ui.ui34
-rw-r--r--kcontrol/kio/policydlg.cpp6
-rw-r--r--kcontrol/kio/policydlg.h6
-rw-r--r--kcontrol/kio/policydlg_ui.ui6
-rw-r--r--kcontrol/kio/smbrodlg.cpp4
-rw-r--r--kcontrol/kio/socksbase.ui40
-rw-r--r--kcontrol/kio/uagentproviderdlg.cpp4
-rw-r--r--kcontrol/kio/uagentproviderdlg_ui.ui18
-rw-r--r--kcontrol/kio/useragentdlg.cpp26
-rw-r--r--kcontrol/kio/useragentdlg_ui.ui34
-rw-r--r--kcontrol/knotify/knotify.cpp2
-rw-r--r--kcontrol/knotify/playersettings.ui36
-rw-r--r--kcontrol/konq/behaviour.cpp4
-rw-r--r--kcontrol/konq/desktop.cpp2
-rw-r--r--kcontrol/konq/desktopbehavior.ui58
-rw-r--r--kcontrol/konq/desktopbehavior_impl.cpp16
-rw-r--r--kcontrol/konq/fontopts.cpp8
-rw-r--r--kcontrol/konq/previews.cpp4
-rw-r--r--kcontrol/konq/rootopts.cpp10
-rw-r--r--kcontrol/konqhtml/advancedTabOptions.ui22
-rw-r--r--kcontrol/konqhtml/appearance.cpp4
-rw-r--r--kcontrol/konqhtml/domainlistview.cpp4
-rw-r--r--kcontrol/konqhtml/filteropts.cpp6
-rw-r--r--kcontrol/konqhtml/htmlopts.cpp4
-rw-r--r--kcontrol/konqhtml/jsopts.cpp2
-rw-r--r--kcontrol/konqhtml/jspolicies.cpp12
-rw-r--r--kcontrol/konqhtml/nsconfigwidget.ui36
-rw-r--r--kcontrol/konqhtml/pluginopts.cpp18
-rw-r--r--kcontrol/konsole/kcmkonsoledialog.ui48
-rw-r--r--kcontrol/konsole/schemadialog.ui70
-rw-r--r--kcontrol/konsole/schemaeditor.cpp10
-rw-r--r--kcontrol/konsole/sessiondialog.ui64
-rw-r--r--kcontrol/konsole/sessioneditor.cpp2
-rw-r--r--kcontrol/krdb/krdb.cpp18
-rw-r--r--kcontrol/kthememanager/ktheme.cpp32
-rw-r--r--kcontrol/kthememanager/kthemedlg.ui68
-rw-r--r--kcontrol/kthememanager/kthememanager.cpp8
-rw-r--r--kcontrol/kthememanager/newthemewidget.ui28
-rw-r--r--kcontrol/locale/kcmlocale.cpp38
-rw-r--r--kcontrol/locale/kcmlocale.h2
-rw-r--r--kcontrol/locale/klocalesample.cpp14
-rw-r--r--kcontrol/locale/klocalesample.h2
-rw-r--r--kcontrol/locale/localemon.cpp22
-rw-r--r--kcontrol/locale/localemon.h2
-rw-r--r--kcontrol/locale/localenum.cpp14
-rw-r--r--kcontrol/locale/localenum.h2
-rw-r--r--kcontrol/locale/localeother.cpp2
-rw-r--r--kcontrol/locale/localeother.h2
-rw-r--r--kcontrol/locale/localetime.cpp16
-rw-r--r--kcontrol/locale/localetime.h2
-rw-r--r--kcontrol/locale/toplevel.cpp6
-rw-r--r--kcontrol/nics/nic.cpp6
-rw-r--r--kcontrol/performance/konqueror_ui.ui26
-rw-r--r--kcontrol/performance/system_ui.ui10
-rw-r--r--kcontrol/privacy/kcmprivacydialog.ui28
-rw-r--r--kcontrol/privacy/kprivacymanager.cpp12
-rw-r--r--kcontrol/privacy/kprivacymanager.h2
-rw-r--r--kcontrol/privacy/kprivacysettings.ui54
-rw-r--r--kcontrol/randr/configdialog.cpp2
-rw-r--r--kcontrol/randr/configdialog.h8
-rw-r--r--kcontrol/randr/krandrbindings.cpp4
-rw-r--r--kcontrol/randr/krandrmodule.cpp22
-rw-r--r--kcontrol/randr/krandrpassivepopup.cpp6
-rw-r--r--kcontrol/randr/krandrtray.cpp14
-rw-r--r--kcontrol/randr/ktimerdialog.cpp6
-rw-r--r--kcontrol/samba/kcmsambaimports.cpp14
-rw-r--r--kcontrol/samba/kcmsambaimports.h2
-rw-r--r--kcontrol/samba/kcmsambalog.cpp18
-rw-r--r--kcontrol/samba/kcmsambalog.h4
-rw-r--r--kcontrol/samba/kcmsambastatistics.cpp44
-rw-r--r--kcontrol/samba/kcmsambastatistics.h2
-rw-r--r--kcontrol/samba/ksmbstatus.cpp20
-rw-r--r--kcontrol/samba/ksmbstatus.h2
-rw-r--r--kcontrol/screensaver/advanceddialogimpl.ui56
-rw-r--r--kcontrol/screensaver/kswidget.cpp4
-rw-r--r--kcontrol/screensaver/saverconfig.cpp2
-rw-r--r--kcontrol/screensaver/scrnsave.cpp34
-rw-r--r--kcontrol/screensaver/scrnsave.h2
-rw-r--r--kcontrol/screensaver/testwin.cpp2
-rw-r--r--kcontrol/smartcard/nosmartcardbase.ui6
-rw-r--r--kcontrol/smartcard/smartcardbase.ui6
-rw-r--r--kcontrol/smserver/smserverconfigdlg.ui30
-rw-r--r--kcontrol/style/kcmstyle.cpp46
-rw-r--r--kcontrol/style/keramik/keramikconf.h2
-rw-r--r--kcontrol/style/menupreview.cpp16
-rw-r--r--kcontrol/style/menupreview.h2
-rw-r--r--kcontrol/style/stylepreview.ui50
-rw-r--r--kcontrol/style/stylepreview.ui.h2
-rw-r--r--kcontrol/taskbar/kcmtaskbarui.ui60
-rw-r--r--kcontrol/usbview/kcmusb.cpp18
-rw-r--r--kcontrol/usbview/usbdevices.cpp10
-rw-r--r--kcontrol/view1394/view1394widget.ui2
-rw-r--r--kcontrol/xinerama/kcmxinerama.cpp8
-rw-r--r--kcontrol/xinerama/xineramawidget.ui38
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&amp;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 &amp;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>&amp;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 &amp;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>&amp;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>&lt;i&gt;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.&lt;/i&gt;</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>&lt;i&gt;If your sound is skipping during playback, enable running with highest possible priority. Increasing your sound buffer might also help.&lt;/i&gt;</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>&lt;i&gt;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.&lt;/i&gt;</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 &amp;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 &amp;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 &amp;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&amp;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 @@
&lt;/qt&gt;</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 &lt;b&gt;Remove&lt;/
&lt;/qt&gt;</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 &lt;b&gt;Remove&lt;/
</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 &lt;b&gt;Remove&lt;/
<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 &lt;b&gt;Remove&lt;/
<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 &lt;b&gt;Remove&lt;/
<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 &lt;b&gt;Remove&lt;/
<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 &lt;b&gt;Remove&lt;/
<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 &lt;b&gt;Remove&lt;/
<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 &lt;b&gt;Remove&lt;/
<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 &lt;b&gt;Remove&lt;/
<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 &lt;b&gt;Remove&lt;/
</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 &lt;b&gt;Remove&lt;/
<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 &lt;b&gt;Remove&lt;/
<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 &lt;b&gt;Remove&lt;/
<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 &lt;b&gt;Remove&lt;/
<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 @@
&lt;/ul&gt;&lt;/qt&gt;</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>&amp;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>&amp;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>&amp;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>&amp;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 &amp;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>&lt;qt&gt;Open &lt;b&gt;http&lt;/b&gt; and &lt;b&gt;https&lt;/b&gt; URLs&lt;/qt&gt;</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.&lt;br&gt; You can also use several placeholders which will be replaced with the actual values when the email client is called:&lt;ul&gt; &lt;li&gt;%t: Recipient's address&lt;/li&gt; &lt;li&gt;%s: Subject&lt;/li&gt; &lt;li&gt;%c: Carbon Copy (CC)&lt;/li&gt; &lt;li&gt;%b: Blind Carbon Copy (BCC)&lt;/li&gt; &lt;li&gt;%B: Template body text&lt;/li&gt; &lt;li&gt;%A: Attachment &lt;/li&gt; &lt;/ul&gt;</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>&amp;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.&lt;br&gt; 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>&lt;b&gt;Use default stylesheet&lt;/b&gt;&lt;p&gt;Select this option to use the default stylesheet.&lt;/p&gt;</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>useUser</cstring>
</property>
@@ -85,7 +85,7 @@
<string>&lt;b&gt;Use user-defined stylesheet&lt;/b&gt;&lt;p&gt;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).&lt;/p&gt;</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>&lt;b&gt;Use accessibility stylesheet&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;</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>&lt;b&gt;Suppress images&lt;/b&gt;&lt;p&gt;Selecting this will prevent Konqueror from loading images.&lt;/p&gt;</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>&lt;b&gt;Black on White&lt;/b&gt;&lt;p&gt;This is what you normally see.&lt;/p&gt;</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>whiteOnBlack</cstring>
</property>
@@ -366,7 +366,7 @@
<string>&lt;b&gt;White on Black&lt;/b&gt;&lt;p&gt;This is your classic inverse color scheme.&lt;/p&gt;</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>customColor</cstring>
</property>
@@ -377,7 +377,7 @@
<string>&lt;b&gt;Custom&lt;/b&gt;&lt;p&gt;Select this option to define a custom color for the default font.&lt;/p&gt;</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>&lt;b&gt;Background&lt;/b&gt;&lt;p&gt;Behind this door lays the ability to choose a custom default background.&lt;/p&gt;</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.&lt;/p&gt;
&lt;/qt&gt;</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
&lt;/qt&gt;</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
&lt;/qt&gt;</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
&lt;/qt&gt;</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
&lt;/qt&gt;</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 <fredrik@kde.org>
+ * Copyright (C) 2003 Fredrik H�glund <fredrik@kde.org>
*
* Based on the large cursor code written by Rik Hemsley,
* Copyright (c) 2000 Rik Hemsley <rik@kde.org>
@@ -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 <fredrik@kde.org>
+ * Copyright (C) 2003 Fredrik H�glund <fredrik@kde.org>
*
* 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&amp;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&amp;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&amp;nge pointer shape over icons</string>
+ <string>Cha&amp;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 @@
&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>fadeOutHandles</cstring>
</property>
@@ -122,7 +122,7 @@
&lt;/qt&gt;</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 &amp;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 &lt;b&gt;"Auto Detect"&lt;/b&gt; button to a
&lt;/qt&gt;</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 &lt;b&gt;"Auto Detect"&lt;/b&gt; button to a
&lt;/qt&gt;</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 &lt;b&gt;"Auto Detect"&lt;/b&gt; button to a
&lt;/qt&gt;</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 &lt;b&gt;"Auto Detect"&lt;/b&gt; button to a
<string>Show the &amp;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 &lt;b&gt;"Auto Detect"&lt;/b&gt; button to a
<string>&lt;qt&gt;Verify whether or not the environment variable names you supplied are valid. If an environment variable is not found, the associated labels will be &lt;b&gt;highlighted&lt;/b&gt; to indicate that they are invalid.&lt;/qt&gt;</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 &lt;b&gt;"Auto Detect"&lt;/b&gt; button to a
<string>&lt;qt&gt;Attempt automatic discovery of the environment variables used for setting system wide proxy information.&lt;p&gt; This feature works by searching for commonly used variable names such as HTTP_PROXY, FTP_PROXY and NO_PROXY.&lt;/qt&gt;</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 &lt;b&gt;"Auto Detect"&lt;/b&gt; button to a
&lt;/qt&gt;</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&amp;elete</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>pbDeleteAll</cstring>
</property>
@@ -93,7 +93,7 @@
<string>Delete A&amp;ll</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>pbPolicy</cstring>
</property>
@@ -101,7 +101,7 @@
<string>Change &amp;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.
&lt;/qt&gt;</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
&lt;/qt&gt;</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
&lt;/qt&gt;</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 &amp;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&amp;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 &lt;b&gt;Add...&lt;/b&gt; 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 &lt;b&gt;Add...&lt;/b&gt; 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 &lt;b&gt;Add...&lt;/b&gt; button and su
<string>&amp;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 &lt;b&gt;Add...&lt;/b&gt; button and su
<string>Chan&amp;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 &lt;b&gt;Add...&lt;/b&gt; button and su
<string>D&amp;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
&lt;/qt&gt;</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 &lt;b&gt;Web Proxy Auto-Discovery Pro
&lt;/qt&gt;</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 &lt;b&gt;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 &lt;b&gt;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 &lt;b&gt;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 &lt;b&gt;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 &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;NO_PROX
&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>pbEnvSetup</cstring>
</property>
@@ -192,7 +192,7 @@ Environment variables such as &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;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 &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;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 &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;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 &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;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 &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;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 &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;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 &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;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 &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;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 &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;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 &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;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 &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;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 &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;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