From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: 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 --- drkonqi/backtrace.cpp | 14 +- drkonqi/backtrace.h | 2 +- drkonqi/debugger.cpp | 16 +- drkonqi/debugger.h | 2 +- drkonqi/krashconf.cpp | 24 +- drkonqi/toplevel.cpp | 12 +- kappfinder/common.cpp | 10 +- kappfinder/toplevel.cpp | 22 +- kate/app/kateapp.cpp | 10 +- kate/app/kateconfigdialog.cpp | 6 +- kate/app/kateconfigplugindialogpage.cpp | 2 +- kate/app/kateconfigplugindialogpage.h | 2 +- kate/app/kateconsole.cpp | 10 +- kate/app/kateconsole.h | 2 +- kate/app/katedocmanager.cpp | 10 +- kate/app/katedocmanager.h | 2 +- kate/app/katedocmanageriface.cpp | 8 +- kate/app/kateexternaltools.cpp | 28 +- kate/app/katefilelist.cpp | 24 +- kate/app/katefilelist.h | 2 +- kate/app/katefileselector.cpp | 22 +- kate/app/katefileselector.h | 4 +- kate/app/kategrepdialog.cpp | 44 +-- kate/app/kategrepdialog.h | 2 +- kate/app/katemailfilesdialog.cpp | 6 +- kate/app/katemainwindow.cpp | 54 +-- kate/app/katemainwindowiface.cpp | 2 +- kate/app/katemdi.cpp | 18 +- kate/app/katemdi.h | 6 +- kate/app/katemwmodonhddialog.cpp | 2 +- kate/app/katepluginmanager.h | 2 +- kate/app/katesession.cpp | 2 +- kate/app/katesession.h | 2 +- kate/app/katetabwidget.cpp | 18 +- kate/app/kateviewmanager.cpp | 22 +- kate/app/kateviewmanager.h | 2 +- kate/app/kateviewspace.cpp | 22 +- kate/app/kateviewspace.h | 2 +- kate/app/kateviewspacecontainer.cpp | 50 +-- kate/app/kateviewspacecontainer.h | 2 +- kate/app/kbookmarkhandler.cpp | 2 +- kate/app/kwritemain.cpp | 34 +- kate/interfaces/application.h | 2 +- kate/interfaces/documentmanager.h | 2 +- kate/interfaces/mainwindow.h | 2 +- kate/interfaces/plugin.cpp | 2 +- kate/interfaces/plugin.h | 2 +- kate/interfaces/pluginconfiginterface.cpp | 2 +- kate/interfaces/pluginconfiginterfaceextension.cpp | 2 +- kate/interfaces/pluginconfiginterfaceextension.h | 2 +- kate/interfaces/pluginmanager.h | 2 +- kate/interfaces/toolviewmanager.cpp | 6 +- kate/interfaces/toolviewmanager.h | 2 +- kate/interfaces/viewmanager.h | 2 +- kate/utils/dockviewbase.cpp | 2 +- kcminit/main.cpp | 12 +- kcontrol/access/kaccess.cpp | 2 +- kcontrol/access/kaccess.h | 2 +- kcontrol/access/kcmaccess.cpp | 22 +- .../accessibility/accessibilityconfigwidget.ui | 30 +- kcontrol/arts/arts.cpp | 28 +- kcontrol/arts/generaltab.ui | 40 +- kcontrol/arts/hardwaretab.ui | 50 +-- kcontrol/arts/krichtextlabel.cpp | 14 +- kcontrol/arts/krichtextlabel.h | 4 +- kcontrol/background/bgadvanced.cpp | 8 +- kcontrol/background/bgadvanced_ui.ui | 46 +-- kcontrol/background/bgdialog.cpp | 42 +-- kcontrol/background/bgdialog_ui.ui | 78 ++-- kcontrol/background/bghash.h | 4 +- kcontrol/background/bgmonitor.cpp | 8 +- kcontrol/background/bgmonitor.h | 6 +- kcontrol/background/bgrender.cpp | 48 +-- kcontrol/background/bgsettings.cpp | 30 +- kcontrol/background/bgwallpaper.h | 2 +- kcontrol/background/bgwallpaper_ui.ui | 28 +- kcontrol/background/main.cpp | 2 +- kcontrol/clock/dtime.cpp | 22 +- kcontrol/clock/dtime.h | 26 +- kcontrol/clock/tzone.cpp | 4 +- kcontrol/clock/tzone.h | 2 +- kcontrol/colors/colorscm.cpp | 12 +- kcontrol/colors/widgetcanvas.cpp | 30 +- kcontrol/colors/widgetcanvas.h | 2 +- kcontrol/componentchooser/browserconfig_ui.ui | 20 +- kcontrol/componentchooser/componentchooser.cpp | 32 +- kcontrol/componentchooser/componentchooser_ui.ui | 12 +- kcontrol/componentchooser/componentconfig_ui.ui | 8 +- kcontrol/componentchooser/emailclientconfig_ui.ui | 24 +- .../componentchooser/terminalemulatorconfig_ui.ui | 20 +- kcontrol/crypto/certgen.ui | 62 ++-- kcontrol/crypto/crypto.cpp | 120 +++--- kcontrol/crypto/crypto.h | 10 +- kcontrol/crypto/kdatetimedlg.cpp | 2 +- kcontrol/css/cssconfig.ui | 24 +- kcontrol/css/csscustom.ui | 58 +-- kcontrol/css/kcmcss.cpp | 4 +- kcontrol/css/preview.ui | 8 +- kcontrol/css/template.cpp | 6 +- kcontrol/display/display.cpp | 2 +- kcontrol/dnssd/configdialog.ui | 34 +- kcontrol/dnssd/kcmdnssd.cpp | 6 +- kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp | 4 +- kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui | 18 +- .../ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp | 44 +-- .../ebrowsing/plugins/ikws/searchproviderdlg.cpp | 4 +- .../ebrowsing/plugins/ikws/searchproviderdlg_ui.ui | 10 +- .../plugins/localdomain/localdomainurifilter.cpp | 12 +- .../ebrowsing/plugins/shorturi/kshorturifilter.cpp | 44 +-- kcontrol/filetypes/filegroupdetails.cpp | 6 +- kcontrol/filetypes/filegroupdetails.h | 2 +- kcontrol/filetypes/filetypedetails.cpp | 4 +- kcontrol/filetypes/filetypedetails.h | 2 +- kcontrol/filetypes/filetypesview.cpp | 16 +- kcontrol/filetypes/kservicelistwidget.h | 4 +- kcontrol/filetypes/newtypedlg.cpp | 2 +- kcontrol/filetypes/typeslistitem.cpp | 32 +- kcontrol/filetypes/typeslistitem.h | 2 +- kcontrol/fonts/kxftconfig.cpp | 36 +- kcontrol/iccconfig/iccconfig.cpp | 10 +- kcontrol/iccconfig/iccconfigbase.ui | 24 +- kcontrol/icons/icons.cpp | 56 +-- kcontrol/icons/iconthemes.cpp | 2 +- kcontrol/info/info.cpp | 16 +- kcontrol/info/info.h | 4 +- kcontrol/info/info_fbsd.cpp | 26 +- kcontrol/info/info_linux.cpp | 14 +- kcontrol/info/info_netbsd.cpp | 22 +- kcontrol/info/info_openbsd.cpp | 12 +- kcontrol/info/info_solaris.cpp | 4 +- kcontrol/info/info_svr4.cpp | 4 +- kcontrol/info/memory.cpp | 12 +- kcontrol/info/opengl.cpp | 10 +- kcontrol/input/core/themepage.cpp | 4 +- kcontrol/input/core/themepage.h | 4 +- kcontrol/input/kapplymousetheme.cpp | 22 +- kcontrol/input/kmousedlg.ui | 60 +-- kcontrol/input/logitechmouse.cpp | 6 +- kcontrol/input/logitechmouse.h | 22 +- kcontrol/input/logitechmouse_base.ui | 24 +- kcontrol/input/mouse.cpp | 10 +- kcontrol/input/xcursor/previewwidget.cpp | 4 +- kcontrol/input/xcursor/themepage.cpp | 26 +- kcontrol/ioslaveinfo/kcmioslaveinfo.cpp | 10 +- kcontrol/joystick/caldialog.cpp | 4 +- kcontrol/joystick/joystick.cpp | 2 +- kcontrol/joystick/joywidget.cpp | 10 +- kcontrol/joystick/joywidget.h | 2 +- kcontrol/joystick/poswidget.h | 2 +- kcontrol/kcontrol/aboutwidget.cpp | 2 +- kcontrol/kcontrol/aboutwidget.h | 2 +- kcontrol/kcontrol/dockcontainer.cpp | 8 +- kcontrol/kcontrol/dockcontainer.h | 4 +- kcontrol/kcontrol/global.cpp | 4 +- kcontrol/kcontrol/helpwidget.cpp | 4 +- kcontrol/kcontrol/helpwidget.h | 2 +- kcontrol/kcontrol/indexwidget.cpp | 2 +- kcontrol/kcontrol/indexwidget.h | 2 +- kcontrol/kcontrol/kcrootonly.cpp | 4 +- kcontrol/kcontrol/main.cpp | 12 +- kcontrol/kcontrol/moduleIface.cpp | 2 +- kcontrol/kcontrol/moduleiconview.cpp | 2 +- kcontrol/kcontrol/modulemenu.cpp | 4 +- kcontrol/kcontrol/modules.cpp | 22 +- kcontrol/kcontrol/moduletreeview.cpp | 14 +- kcontrol/kcontrol/moduletreeview.h | 4 +- kcontrol/kcontrol/proxywidget.cpp | 24 +- kcontrol/kcontrol/proxywidget.h | 2 +- kcontrol/kcontrol/searchwidget.cpp | 2 +- kcontrol/kcontrol/searchwidget.h | 2 +- kcontrol/kcontrol/toplevel.cpp | 24 +- kcontrol/kded/kcmkded.cpp | 18 +- kcontrol/kded/kcmkded.h | 2 +- kcontrol/kdm/background.h | 2 +- kcontrol/kdm/kbackedcombobox.cpp | 2 +- kcontrol/kdm/kdm-appear.cpp | 32 +- kcontrol/kdm/kdm-appear.h | 2 +- kcontrol/kdm/kdm-conv.cpp | 14 +- kcontrol/kdm/kdm-conv.h | 16 +- kcontrol/kdm/kdm-font.h | 4 +- kcontrol/kdm/kdm-shut.h | 6 +- kcontrol/kdm/kdm-users.cpp | 38 +- kcontrol/kdm/kdm-users.h | 30 +- kcontrol/kdm/main.cpp | 18 +- kcontrol/kdm/main.h | 2 +- kcontrol/keys/commandShortcuts.cpp | 14 +- kcontrol/keys/commandShortcuts.h | 2 +- kcontrol/keys/kaccelaction.h | 2 +- kcontrol/keys/keyconfig.cpp | 14 +- kcontrol/keys/keyconfig.h | 2 +- kcontrol/keys/modifiers.h | 2 +- kcontrol/keys/shortcuts.cpp | 18 +- kcontrol/keys/shortcuts.h | 2 +- kcontrol/keys/treeview.cpp | 14 +- kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp | 28 +- kcontrol/kfontinst/kcmfontinst/KFileFontView.h | 2 +- kcontrol/kfontinst/kfile-plugin/KFileFont.cpp | 68 ++-- kcontrol/kfontinst/kfontinst/FontEngine.cpp | 4 +- kcontrol/kfontinst/kfontinst/Fontmap.cpp | 20 +- kcontrol/kfontinst/kfontinst/Main.cpp | 4 +- kcontrol/kfontinst/kfontinst/XConfig.cpp | 4 +- kcontrol/kfontinst/kio/KioFonts.cpp | 64 ++-- kcontrol/kfontinst/kio/KioFonts.h | 4 +- kcontrol/kfontinst/lib/FcEngine.cpp | 58 +-- kcontrol/kfontinst/lib/Misc.cpp | 14 +- kcontrol/kfontinst/viewpart/FontPreview.cpp | 6 +- kcontrol/kfontinst/viewpart/FontPreview.h | 6 +- kcontrol/kfontinst/viewpart/FontViewPart.cpp | 16 +- kcontrol/kfontinst/viewpart/FontViewerApp.cpp | 6 +- kcontrol/kicker/advancedDialog.cpp | 6 +- kcontrol/kicker/advancedOptions.ui | 40 +- kcontrol/kicker/applettab.ui | 34 +- kcontrol/kicker/applettab_impl.cpp | 4 +- kcontrol/kicker/extensionInfo.cpp | 16 +- kcontrol/kicker/extensionInfo.h | 4 +- kcontrol/kicker/hidingtab.ui | 74 ++-- kcontrol/kicker/lookandfeeltab.ui | 50 +-- kcontrol/kicker/lookandfeeltab_impl.cpp | 12 +- kcontrol/kicker/main.cpp | 4 +- kcontrol/kicker/menutab.ui | 88 ++--- kcontrol/kicker/menutab_impl.cpp | 12 +- kcontrol/kicker/menutab_impl.h | 2 +- kcontrol/kicker/positiontab.ui | 146 ++++---- kcontrol/kicker/positiontab_impl.cpp | 14 +- kcontrol/kio/cache_ui.ui | 20 +- kcontrol/kio/envvarproxy_ui.ui | 16 +- kcontrol/kio/fakeuaprovider.cpp | 30 +- kcontrol/kio/kcookiesmanagement.cpp | 16 +- kcontrol/kio/kcookiesmanagement.h | 2 +- kcontrol/kio/kcookiesmanagementdlg_ui.ui | 36 +- kcontrol/kio/kcookiespolicies.cpp | 4 +- kcontrol/kio/kcookiespoliciesdlg_ui.ui | 40 +- kcontrol/kio/kenvvarproxydlg.cpp | 8 +- kcontrol/kio/kmanualproxydlg.cpp | 4 +- kcontrol/kio/kproxydlg_ui.ui | 44 +-- kcontrol/kio/ksaveioconfig.cpp | 20 +- kcontrol/kio/manualproxy_ui.ui | 34 +- kcontrol/kio/policydlg.cpp | 6 +- kcontrol/kio/policydlg.h | 6 +- kcontrol/kio/policydlg_ui.ui | 6 +- kcontrol/kio/smbrodlg.cpp | 4 +- kcontrol/kio/socksbase.ui | 40 +- kcontrol/kio/uagentproviderdlg.cpp | 4 +- kcontrol/kio/uagentproviderdlg_ui.ui | 18 +- kcontrol/kio/useragentdlg.cpp | 26 +- kcontrol/kio/useragentdlg_ui.ui | 34 +- kcontrol/knotify/knotify.cpp | 2 +- kcontrol/knotify/playersettings.ui | 36 +- kcontrol/konq/behaviour.cpp | 4 +- kcontrol/konq/desktop.cpp | 2 +- kcontrol/konq/desktopbehavior.ui | 58 +-- kcontrol/konq/desktopbehavior_impl.cpp | 16 +- kcontrol/konq/fontopts.cpp | 8 +- kcontrol/konq/previews.cpp | 4 +- kcontrol/konq/rootopts.cpp | 10 +- kcontrol/konqhtml/advancedTabOptions.ui | 22 +- kcontrol/konqhtml/appearance.cpp | 4 +- kcontrol/konqhtml/domainlistview.cpp | 4 +- kcontrol/konqhtml/filteropts.cpp | 6 +- kcontrol/konqhtml/htmlopts.cpp | 4 +- kcontrol/konqhtml/jsopts.cpp | 2 +- kcontrol/konqhtml/jspolicies.cpp | 12 +- kcontrol/konqhtml/nsconfigwidget.ui | 36 +- kcontrol/konqhtml/pluginopts.cpp | 18 +- kcontrol/konsole/kcmkonsoledialog.ui | 48 +-- kcontrol/konsole/schemadialog.ui | 70 ++-- kcontrol/konsole/schemaeditor.cpp | 10 +- kcontrol/konsole/sessiondialog.ui | 64 ++-- kcontrol/konsole/sessioneditor.cpp | 2 +- kcontrol/krdb/krdb.cpp | 18 +- kcontrol/kthememanager/ktheme.cpp | 32 +- kcontrol/kthememanager/kthemedlg.ui | 68 ++-- kcontrol/kthememanager/kthememanager.cpp | 8 +- kcontrol/kthememanager/newthemewidget.ui | 28 +- kcontrol/locale/kcmlocale.cpp | 38 +- kcontrol/locale/kcmlocale.h | 2 +- kcontrol/locale/klocalesample.cpp | 14 +- kcontrol/locale/klocalesample.h | 2 +- kcontrol/locale/localemon.cpp | 22 +- kcontrol/locale/localemon.h | 2 +- kcontrol/locale/localenum.cpp | 14 +- kcontrol/locale/localenum.h | 2 +- kcontrol/locale/localeother.cpp | 2 +- kcontrol/locale/localeother.h | 2 +- kcontrol/locale/localetime.cpp | 16 +- kcontrol/locale/localetime.h | 2 +- kcontrol/locale/toplevel.cpp | 6 +- kcontrol/nics/nic.cpp | 6 +- kcontrol/performance/konqueror_ui.ui | 26 +- kcontrol/performance/system_ui.ui | 10 +- kcontrol/privacy/kcmprivacydialog.ui | 28 +- kcontrol/privacy/kprivacymanager.cpp | 12 +- kcontrol/privacy/kprivacymanager.h | 2 +- kcontrol/privacy/kprivacysettings.ui | 54 +-- kcontrol/randr/configdialog.cpp | 2 +- kcontrol/randr/configdialog.h | 8 +- kcontrol/randr/krandrbindings.cpp | 4 +- kcontrol/randr/krandrmodule.cpp | 22 +- kcontrol/randr/krandrpassivepopup.cpp | 6 +- kcontrol/randr/krandrtray.cpp | 14 +- kcontrol/randr/ktimerdialog.cpp | 6 +- kcontrol/samba/kcmsambaimports.cpp | 14 +- kcontrol/samba/kcmsambaimports.h | 2 +- kcontrol/samba/kcmsambalog.cpp | 18 +- kcontrol/samba/kcmsambalog.h | 4 +- kcontrol/samba/kcmsambastatistics.cpp | 44 +-- kcontrol/samba/kcmsambastatistics.h | 2 +- kcontrol/samba/ksmbstatus.cpp | 20 +- kcontrol/samba/ksmbstatus.h | 2 +- kcontrol/screensaver/advanceddialogimpl.ui | 56 +-- kcontrol/screensaver/kswidget.cpp | 4 +- kcontrol/screensaver/saverconfig.cpp | 2 +- kcontrol/screensaver/scrnsave.cpp | 34 +- kcontrol/screensaver/scrnsave.h | 2 +- kcontrol/screensaver/testwin.cpp | 2 +- kcontrol/smartcard/nosmartcardbase.ui | 6 +- kcontrol/smartcard/smartcardbase.ui | 6 +- kcontrol/smserver/smserverconfigdlg.ui | 30 +- kcontrol/style/kcmstyle.cpp | 46 +-- kcontrol/style/keramik/keramikconf.h | 2 +- kcontrol/style/menupreview.cpp | 16 +- kcontrol/style/menupreview.h | 2 +- kcontrol/style/stylepreview.ui | 50 +-- kcontrol/style/stylepreview.ui.h | 2 +- kcontrol/taskbar/kcmtaskbarui.ui | 60 +-- kcontrol/usbview/kcmusb.cpp | 18 +- kcontrol/usbview/usbdevices.cpp | 10 +- kcontrol/view1394/view1394widget.ui | 2 +- kcontrol/xinerama/kcmxinerama.cpp | 8 +- kcontrol/xinerama/xineramawidget.ui | 38 +- kdcop/kdcoplistview.cpp | 8 +- kdcop/kdcoplistview.h | 2 +- kdcop/kdcopview.ui | 14 +- kdcop/kdcopwindow.cpp | 74 ++-- kdebugdialog/kabstractdebugdialog.cpp | 8 +- kdebugdialog/kdebugdialog.cpp | 6 +- kdebugdialog/klistdebugdialog.cpp | 8 +- kdebugdialog/main.cpp | 2 +- kdepasswd/kcm/chfacedlg.cpp | 2 +- kdepasswd/kcm/chfnprocess.cpp | 8 +- kdepasswd/kcm/main.cpp | 8 +- kdepasswd/kcm/main_widget.ui | 50 +-- kdepasswd/passwd.cpp | 4 +- kdepasswd/passwddlg.cpp | 2 +- kdeprint/descriptions/sortthem.cpp | 2 +- kdeprint/kdeprint_part/printpart.cpp | 6 +- kdeprint/kdeprint_part/printpart.h | 2 +- kdeprint/kdeprintfax/conffax.cpp | 8 +- kdeprint/kdeprintfax/conffax.h | 4 +- kdeprint/kdeprintfax/conffilters.cpp | 36 +- kdeprint/kdeprintfax/conffilters.h | 4 +- kdeprint/kdeprintfax/confgeneral.cpp | 8 +- kdeprint/kdeprintfax/confgeneral.h | 4 +- kdeprint/kdeprintfax/configdlg.cpp | 8 +- kdeprint/kdeprintfax/confsystem.cpp | 34 +- kdeprint/kdeprintfax/confsystem.h | 8 +- kdeprint/kdeprintfax/defcmds.cpp | 8 +- kdeprint/kdeprintfax/faxab.cpp | 14 +- kdeprint/kdeprintfax/faxctrl.cpp | 60 +-- kdeprint/kdeprintfax/faxctrl.h | 8 +- kdeprint/kdeprintfax/filterdlg.cpp | 8 +- kdeprint/kdeprintfax/filterdlg.h | 2 +- kdeprint/kdeprintfax/kdeprintfax.cpp | 64 ++-- kdeprint/kdeprintfax/kdeprintfax.h | 14 +- kdeprint/kjobviewer/kjobviewer.cpp | 6 +- kdeprint/kprinter/printwrapper.cpp | 20 +- kdeprint/kprinter/printwrapper.h | 2 +- kdeprint/printmgr/kcmprintmgr.cpp | 2 +- kdeprint/slave/kio_print.cpp | 90 ++--- kdesktop/bgmanager.cc | 30 +- kdesktop/bgmanager.h | 2 +- kdesktop/desktop.cc | 30 +- kdesktop/desktop.h | 2 +- kdesktop/init.cc | 2 +- kdesktop/kcustommenu.cc | 2 +- kdesktop/kcustommenu.h | 2 +- kdesktop/kdesktopbindings.cpp | 8 +- kdesktop/kdiconview.cc | 90 ++--- kdesktop/kdiconview.h | 2 +- kdesktop/kfileividesktop.cpp | 10 +- kdesktop/kfileividesktop.h | 2 +- kdesktop/krootwm.cc | 22 +- kdesktop/kshadowengine.cpp | 20 +- kdesktop/kshadowengine.h | 4 +- kdesktop/kwebdesktop/kwebdesktop.cpp | 2 +- kdesktop/kwebdesktop/kwebdesktop.h | 2 +- kdesktop/kxdglauncher.cpp | 6 +- kdesktop/lock/autologout.cc | 8 +- kdesktop/lock/autologout.h | 2 +- kdesktop/lock/infodlg.cc | 6 +- kdesktop/lock/infodlg.h | 2 +- kdesktop/lock/lockdlg.cc | 24 +- kdesktop/lock/lockprocess.cc | 34 +- kdesktop/lock/lockprocess.h | 4 +- kdesktop/lock/main.cc | 2 +- kdesktop/lock/querydlg.cc | 8 +- kdesktop/lock/querydlg.h | 2 +- kdesktop/main.cc | 2 +- kdesktop/minicli.cpp | 50 +-- kdesktop/minicli.h | 2 +- kdesktop/minicli_ui.ui | 62 ++-- kdesktop/pixmapserver.cc | 24 +- kdesktop/pixmapserver.h | 2 +- kdesktop/startupid.cpp | 8 +- kdesktop/startupid.h | 2 +- kdesktop/xautolock.h | 2 +- kdesu/kdesu/kdesu.cpp | 4 +- kdesu/kdesu/sudlg.cpp | 4 +- kdesu/kdesud/handler.cpp | 6 +- kdesu/kdesud/kdesud.cpp | 6 +- kdesu/kdesud/repo.cpp | 14 +- kdialog/kdialog.cpp | 50 +-- kdialog/klistboxdialog.cpp | 2 +- kdialog/widgets.cpp | 8 +- kdm/confproc.pl | 8 +- kdm/kfrontend/kchooser.cpp | 10 +- kdm/kfrontend/kconsole.cpp | 2 +- kdm/kfrontend/kdm_greet.c | 4 +- kdm/kfrontend/kdm_greet.h | 2 +- kdm/kfrontend/kdmadmindialog.cpp | 6 +- kdm/kfrontend/kdmclock.cpp | 8 +- kdm/kfrontend/kdmconfig.cpp | 12 +- kdm/kfrontend/kdmshutdown.cpp | 40 +- kdm/kfrontend/kdmshutdown.h | 2 +- kdm/kfrontend/kfdialog.cpp | 8 +- kdm/kfrontend/kgapp.cpp | 2 +- kdm/kfrontend/kgdialog.cpp | 4 +- kdm/kfrontend/kgreeter.cpp | 48 +-- kdm/kfrontend/kgverify.cpp | 18 +- kdm/kfrontend/kgverify.h | 2 +- kdm/kfrontend/krootimage.cpp | 4 +- kdm/kfrontend/themer/kdmitem.cpp | 54 +-- kdm/kfrontend/themer/kdmitem.h | 14 +- kdm/kfrontend/themer/kdmlabel.cpp | 20 +- kdm/kfrontend/themer/kdmlabel.h | 2 +- kdm/kfrontend/themer/kdmlayout.cpp | 28 +- kdm/kfrontend/themer/kdmlayout.h | 2 +- kdm/kfrontend/themer/kdmpixmap.cpp | 20 +- kdm/kfrontend/themer/kdmpixmap.h | 2 +- kdm/kfrontend/themer/kdmthemer.cpp | 24 +- kdm/kfrontend/themer/kdmthemer.h | 4 +- kdmlib/dmctl.cpp | 36 +- kdmlib/kgreet_classic.cpp | 13 +- kdmlib/kgreet_pam.cpp | 62 ++-- kdmlib/kgreet_pam.h | 4 +- kdmlib/kgreet_winbind.cpp | 21 +- kfind/kdatecombo.cpp | 12 +- kfind/kdatecombo.h | 2 +- kfind/kfind.cpp | 2 +- kfind/kfind.h | 2 +- kfind/kfinddlg.cpp | 8 +- kfind/kfindpart.cpp | 6 +- kfind/kfindpart.h | 2 +- kfind/kftabdlg.cpp | 36 +- kfind/kftabdlg.h | 6 +- kfind/kfwin.cpp | 26 +- kfind/kfwin.h | 2 +- kfind/kquery.cpp | 18 +- kfind/kquery.h | 2 +- khelpcenter/docentry.cpp | 2 +- khelpcenter/docmetainfo.cpp | 10 +- khelpcenter/formatter.cpp | 6 +- khelpcenter/glossary.cpp | 42 +-- khelpcenter/history.cpp | 8 +- khelpcenter/history.h | 2 +- khelpcenter/htmlsearch/htmlsearch.cpp | 10 +- khelpcenter/htmlsearch/kcmhtmlsearch.cpp | 18 +- khelpcenter/htmlsearch/klangcombo.cpp | 6 +- khelpcenter/htmlsearch/ktagcombobox.cpp | 12 +- khelpcenter/htmlsearchconfig.cpp | 6 +- khelpcenter/htmlsearchconfig.h | 4 +- khelpcenter/infotree.cpp | 8 +- khelpcenter/kcmhelpcenter.cpp | 12 +- khelpcenter/mainwindow.cpp | 24 +- khelpcenter/navigator.cpp | 18 +- khelpcenter/navigator.h | 2 +- khelpcenter/navigatoritem.h | 2 +- khelpcenter/scopeitem.h | 2 +- khelpcenter/scrollkeepertreebuilder.cpp | 2 +- khelpcenter/scrollkeepertreebuilder.h | 2 +- khelpcenter/searchengine.cpp | 38 +- khelpcenter/searchengine.h | 2 +- khelpcenter/searchhandler.cpp | 18 +- khelpcenter/toc.cpp | 14 +- khelpcenter/treebuilder.h | 2 +- khelpcenter/view.cpp | 12 +- khelpcenter/view.h | 2 +- khotkeys/app/app.cpp | 2 +- khotkeys/arts/soundrecorder_arts.cpp | 2 +- khotkeys/kcontrol/action_list_widget.cpp | 4 +- khotkeys/kcontrol/action_list_widget.h | 2 +- khotkeys/kcontrol/actions_listview_widget.cpp | 6 +- khotkeys/kcontrol/actions_listview_widget.h | 2 +- khotkeys/kcontrol/condition_list_widget.cpp | 12 +- khotkeys/kcontrol/condition_list_widget.h | 2 +- khotkeys/kcontrol/gesturedrawer.cpp | 20 +- khotkeys/kcontrol/gesturedrawer.h | 6 +- khotkeys/kcontrol/gesturerecorder.cpp | 6 +- khotkeys/kcontrol/gesturerecorder.h | 2 +- khotkeys/kcontrol/gesturerecordpage.cpp | 2 +- khotkeys/kcontrol/gesturerecordpage.h | 4 +- khotkeys/kcontrol/kcmkhotkeys.cpp | 6 +- khotkeys/kcontrol/main_buttons_widget.cpp | 2 +- khotkeys/kcontrol/tab_widget.cpp | 2 +- khotkeys/kcontrol/tab_widget.h | 2 +- khotkeys/kcontrol/triggers_tab.cpp | 4 +- khotkeys/kcontrol/triggers_tab.h | 4 +- khotkeys/kcontrol/ui/action_group_tab_ui.ui | 14 +- khotkeys/kcontrol/ui/action_list_widget_ui.ui | 18 +- khotkeys/kcontrol/ui/actions_listview_widget_ui.ui | 6 +- khotkeys/kcontrol/ui/command_url_widget_ui.ui | 6 +- khotkeys/kcontrol/ui/condition_list_widget_ui.ui | 18 +- khotkeys/kcontrol/ui/dcop_widget_ui.ui | 38 +- khotkeys/kcontrol/ui/general_settings_tab_ui.ui | 12 +- khotkeys/kcontrol/ui/general_tab_ui.ui | 20 +- khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui | 60 +-- khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui | 18 +- khotkeys/kcontrol/ui/info_tab_ui.ui | 8 +- khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui | 18 +- khotkeys/kcontrol/ui/main_buttons_widget_ui.ui | 10 +- khotkeys/kcontrol/ui/menuentry_widget_ui.ui | 12 +- khotkeys/kcontrol/ui/triggers_tab_ui.ui | 18 +- khotkeys/kcontrol/ui/voice_input_widget_ui.ui | 6 +- khotkeys/kcontrol/ui/voice_settings_tab_ui.ui | 16 +- khotkeys/kcontrol/ui/window_trigger_widget_ui.ui | 14 +- khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui | 18 +- khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui | 58 +-- khotkeys/kcontrol/voicerecorder.cpp | 2 +- khotkeys/kcontrol/voicerecordpage.cpp | 2 +- khotkeys/kcontrol/voicerecordpage.h | 2 +- khotkeys/kcontrol/windowdef_list_widget.cpp | 4 +- khotkeys/kcontrol/windowdef_list_widget.h | 2 +- khotkeys/kcontrol/windowdef_simple_widget.cpp | 2 +- khotkeys/kcontrol/windowselector.cpp | 4 +- khotkeys/shared/actions.cpp | 8 +- khotkeys/shared/gestures.cpp | 4 +- khotkeys/shared/gestures.h | 2 +- khotkeys/shared/input.cpp | 22 +- khotkeys/shared/input.h | 4 +- khotkeys/shared/khlistbox.h | 2 +- khotkeys/shared/khotkeysglobal.cpp | 2 +- khotkeys/shared/settings.cpp | 2 +- khotkeys/shared/sound.cpp | 68 ++-- khotkeys/shared/sound.h | 4 +- khotkeys/shared/soundrecorder.h | 2 +- khotkeys/shared/triggers.cpp | 8 +- khotkeys/shared/voices.cpp | 4 +- khotkeys/shared/voices.h | 2 +- khotkeys/shared/windows.cpp | 4 +- khotkeys/shared/windows.h | 2 +- khotkeys/update/update.cpp | 2 +- kicker/applets/clock/analog.ui | 36 +- kicker/applets/clock/clock.cpp | 136 +++---- kicker/applets/clock/clock.h | 2 +- kicker/applets/clock/clockapplet.kcfg | 24 +- kicker/applets/clock/datepicker.cpp | 4 +- kicker/applets/clock/datepicker.h | 2 +- kicker/applets/clock/digital.ui | 32 +- kicker/applets/clock/fuzzy.ui | 36 +- kicker/applets/clock/settings.ui | 58 +-- kicker/applets/clock/zone.cpp | 6 +- kicker/applets/launcher/configdlgbase.ui | 38 +- kicker/applets/launcher/quickaddappsmenu.cpp | 2 +- kicker/applets/launcher/quickbutton.cpp | 14 +- kicker/applets/launcher/quicklauncher.cpp | 18 +- kicker/applets/lockout/lockout.cpp | 34 +- kicker/applets/media/mediaapplet.cpp | 14 +- kicker/applets/media/mediumbutton.cpp | 8 +- kicker/applets/media/preferencesdialog.cpp | 8 +- kicker/applets/menu/menuapplet.cpp | 8 +- kicker/applets/minipager/pagerapplet.cpp | 12 +- kicker/applets/minipager/pagerbutton.cpp | 46 +-- kicker/applets/naughty/NaughtyApplet.cpp | 4 +- kicker/applets/naughty/NaughtyConfigDialog.cpp | 2 +- kicker/applets/naughty/NaughtyProcessMonitor.cpp | 22 +- kicker/applets/naughty/NaughtyProcessMonitor.h | 2 +- kicker/applets/run/runapplet.cpp | 18 +- kicker/applets/swallow/prefwidgetbase.ui | 2 +- kicker/applets/swallow/swallow.cpp | 2 +- kicker/applets/systemtray/systemtrayapplet.cpp | 54 +-- kicker/applets/taskbar/taskbarapplet.cpp | 4 +- kicker/applets/trash/trashapplet.cpp | 2 +- kicker/applets/trash/trashbutton.cpp | 4 +- kicker/extensions/dockbar/dockbarextension.cpp | 24 +- kicker/extensions/dockbar/dockbarextension.h | 2 +- kicker/extensions/dockbar/dockcontainer.cpp | 4 +- kicker/extensions/dockbar/dockcontainer.h | 2 +- kicker/extensions/kasbar/kasaboutdlg.cpp | 4 +- kicker/extensions/kasbar/kasbar.cpp | 40 +- kicker/extensions/kasbar/kasbar.h | 20 +- kicker/extensions/kasbar/kasbarapp.cpp | 6 +- kicker/extensions/kasbar/kasbarextension.cpp | 18 +- kicker/extensions/kasbar/kasbarextension.h | 2 +- kicker/extensions/kasbar/kasclockitem.cpp | 6 +- kicker/extensions/kasbar/kasgroupitem.cpp | 2 +- kicker/extensions/kasbar/kasitem.cpp | 16 +- kicker/extensions/kasbar/kasitem.h | 8 +- kicker/extensions/kasbar/kasloaditem.cpp | 4 +- kicker/extensions/kasbar/kaspopup.cpp | 12 +- kicker/extensions/kasbar/kaspopup.h | 2 +- kicker/extensions/kasbar/kasprefsdlg.cpp | 4 +- kicker/extensions/kasbar/kasresources.cpp | 4 +- kicker/extensions/kasbar/kasresources.h | 2 +- kicker/extensions/kasbar/kastasker.cpp | 54 +-- kicker/extensions/kasbar/kastasker.h | 6 +- kicker/extensions/kasbar/kastaskitem.cpp | 12 +- kicker/extensions/kasbar/kastaskpopup.cpp | 2 +- kicker/extensions/sidebar/sidebarextension.cpp | 14 +- kicker/extensions/sidebar/sidebarextension.h | 2 +- kicker/extensions/taskbar/taskbarextension.cpp | 14 +- kicker/extensions/taskbar/taskbarextension.h | 2 +- kicker/kicker/buttons/browserbutton.cpp | 2 +- kicker/kicker/buttons/desktopbutton.cpp | 2 +- kicker/kicker/buttons/knewbutton.cpp | 40 +- kicker/kicker/buttons/nonkdeappbutton.cpp | 2 +- kicker/kicker/core/applethandle.cpp | 40 +- kicker/kicker/core/applethandle.h | 16 +- kicker/kicker/core/container_applet.cpp | 22 +- kicker/kicker/core/container_applet.h | 2 +- kicker/kicker/core/container_base.cpp | 14 +- kicker/kicker/core/container_base.h | 10 +- kicker/kicker/core/container_button.cpp | 12 +- kicker/kicker/core/container_extension.cpp | 114 +++--- kicker/kicker/core/container_extension.h | 14 +- kicker/kicker/core/containerarea.cpp | 76 ++-- kicker/kicker/core/containerarea.h | 6 +- kicker/kicker/core/containerarealayout.cpp | 93 +++-- kicker/kicker/core/containerarealayout.h | 16 +- kicker/kicker/core/extensionmanager.cpp | 12 +- kicker/kicker/core/extensionmanager.h | 2 +- kicker/kicker/core/kicker.cpp | 4 +- kicker/kicker/core/kickerbindings.cpp | 4 +- kicker/kicker/core/kmenubase.ui | 34 +- kicker/kicker/core/kmenubase.ui.h | 2 +- kicker/kicker/core/main.cpp | 2 +- kicker/kicker/core/menumanager.cpp | 14 +- kicker/kicker/core/panelextension.cpp | 6 +- kicker/kicker/core/panelextension.h | 2 +- kicker/kicker/core/pluginmanager.cpp | 10 +- kicker/kicker/core/pluginmanager.h | 4 +- kicker/kicker/core/showdesktop.h | 2 +- kicker/kicker/core/userrectsel.cpp | 14 +- kicker/kicker/core/userrectsel.h | 12 +- kicker/kicker/interfaces/kickoff-search-plugin.cpp | 2 +- kicker/kicker/kicker-3.4-reverseLayout.cpp | 2 +- kicker/kicker/plugins/beaglesearch.cpp | 2 +- kicker/kicker/plugins/kickoff-beagle-plugin.cpp | 10 +- kicker/kicker/ui/addapplet.cpp | 28 +- kicker/kicker/ui/addapplet_mnu.cpp | 4 +- kicker/kicker/ui/addapplet_mnu.h | 2 +- kicker/kicker/ui/addappletvisualfeedback.cpp | 10 +- kicker/kicker/ui/addappletvisualfeedback.h | 2 +- kicker/kicker/ui/addbutton_mnu.cpp | 2 +- kicker/kicker/ui/addextension_mnu.cpp | 2 +- kicker/kicker/ui/addextension_mnu.h | 2 +- kicker/kicker/ui/appletitem.ui | 24 +- kicker/kicker/ui/appletop_mnu.cpp | 16 +- kicker/kicker/ui/appletop_mnu.h | 2 +- kicker/kicker/ui/appletview.ui | 24 +- kicker/kicker/ui/browser_mnu.cpp | 22 +- kicker/kicker/ui/clicklineedit.cpp | 10 +- kicker/kicker/ui/client_mnu.cpp | 2 +- kicker/kicker/ui/dirdrop_mnu.h | 2 +- kicker/kicker/ui/exe_dlg.cpp | 12 +- kicker/kicker/ui/extensionop_mnu.cpp | 2 +- kicker/kicker/ui/extensionop_mnu.h | 2 +- kicker/kicker/ui/flipscrollview.cpp | 8 +- kicker/kicker/ui/hidebutton.cpp | 16 +- kicker/kicker/ui/hidebutton.h | 2 +- kicker/kicker/ui/itemview.cpp | 96 ++--- kicker/kicker/ui/itemview.h | 2 +- kicker/kicker/ui/k_mnu.cpp | 40 +- kicker/kicker/ui/k_mnu.h | 2 +- kicker/kicker/ui/k_mnu_stub.cpp | 6 +- kicker/kicker/ui/k_mnu_stub.h | 2 +- kicker/kicker/ui/k_new_mnu.cpp | 312 ++++++++-------- kicker/kicker/ui/k_new_mnu.h | 6 +- kicker/kicker/ui/kickoff_bar.cpp | 34 +- kicker/kicker/ui/kickoff_bar.h | 2 +- kicker/kicker/ui/kmenuitembase.ui | 24 +- kicker/kicker/ui/nonKDEButtonSettings.ui | 26 +- kicker/kicker/ui/popupmenutitle.h | 8 +- kicker/kicker/ui/query.cpp | 4 +- kicker/kicker/ui/removeapplet_mnu.cpp | 2 +- kicker/kicker/ui/removeapplet_mnu.h | 2 +- kicker/kicker/ui/removebutton_mnu.h | 2 +- kicker/kicker/ui/removecontainer_mnu.h | 2 +- kicker/kicker/ui/removeextension_mnu.cpp | 2 +- kicker/kicker/ui/removeextension_mnu.h | 2 +- kicker/kicker/ui/service_mnu.cpp | 46 +-- kicker/libkicker/global.cpp | 24 +- kicker/libkicker/global.h | 2 +- kicker/libkicker/kickerSettings.kcfg | 2 +- kicker/libkicker/kickerSettings.kcfgc | 2 +- kicker/libkicker/kickertip.cpp | 22 +- kicker/libkicker/kickertip.h | 2 +- kicker/libkicker/kshadowengine.cpp | 22 +- kicker/libkicker/kshadowengine.h | 4 +- kicker/libkicker/menuinfo.cpp | 4 +- kicker/libkicker/panelbutton.cpp | 52 +-- kicker/libkicker/panelbutton.h | 4 +- kicker/libkicker/paneldrag.cpp | 10 +- kicker/libkicker/paneldrag.h | 8 +- kicker/libkicker/panner.cpp | 20 +- kicker/libkicker/panner.h | 10 +- kicker/libkicker/simplebutton.cpp | 18 +- kicker/libkicker/simplebutton.h | 8 +- kicker/menuext/kate/katesessionmenu.cpp | 4 +- kicker/menuext/konsole/konsole_mnu.cpp | 2 +- kicker/menuext/konsole/konsolebookmarkhandler.cpp | 2 +- kicker/menuext/konsole/konsolebookmarkmenu.cpp | 6 +- kicker/menuext/prefmenu/prefmenu.cpp | 14 +- kicker/menuext/recentdocs/recentdocsmenu.cpp | 10 +- kicker/menuext/remote/remotemenu.cpp | 4 +- kicker/menuext/system/systemmenu.cpp | 2 +- kicker/menuext/tom/tom.cc | 26 +- kicker/proxy/appletproxy.cpp | 30 +- kicker/proxy/appletproxy.h | 2 +- kicker/proxy/extensiondebugger.h | 2 +- kicker/proxy/extensionproxy.cpp | 14 +- kicker/taskbar/taskbar.cpp | 44 +-- kicker/taskbar/taskbar.h | 6 +- kicker/taskbar/taskbarbindings.cpp | 4 +- kicker/taskbar/taskbarcontainer.cpp | 14 +- kicker/taskbar/taskbarcontainer.h | 2 +- kicker/taskbar/taskcontainer.cpp | 80 ++-- kicker/taskbar/taskcontainer.h | 8 +- kicker/taskmanager/tasklmbmenu.cpp | 6 +- kicker/taskmanager/tasklmbmenu.h | 6 +- kicker/taskmanager/taskmanager.cpp | 24 +- kicker/taskmanager/taskmanager.h | 6 +- kicker/taskmanager/taskrmbmenu.cpp | 4 +- kicker/taskmanager/taskrmbmenu.h | 2 +- kioslave/cgi/cgi.cpp | 11 +- kioslave/cgi/kcmcgi/kcmcgi.cpp | 2 +- kioslave/filter/filter.cc | 4 +- kioslave/finger/kio_finger.cpp | 4 +- kioslave/fish/fish.cpp | 40 +- kioslave/floppy/kio_floppy.cpp | 26 +- kioslave/home/homeimpl.cpp | 8 +- kioslave/home/kdedmodule/homedirnotify.cpp | 4 +- kioslave/info/info.cc | 4 +- kioslave/ldap/kio_ldap.cpp | 22 +- kioslave/mac/kio_mac.cpp | 42 +-- kioslave/man/kio_man.cpp | 84 ++--- kioslave/man/kmanpart.cpp | 4 +- kioslave/man/kmanpart.h | 2 +- kioslave/man/man2html.cpp | 73 ++-- kioslave/media/kcmodule/managermoduleview.ui | 10 +- kioslave/media/kcmodule/mimetypelistboxitem.h | 4 +- kioslave/media/kcmodule/notifiermodule.cpp | 4 +- kioslave/media/kcmodule/notifiermoduleview.ui | 14 +- kioslave/media/kcmodule/serviceconfigdialog.cpp | 2 +- kioslave/media/kcmodule/serviceview.ui | 22 +- kioslave/media/kfile-plugin/kfilemediaplugin.cpp | 6 +- .../media/libmediacommon/actionlistboxitem.cpp | 2 +- kioslave/media/libmediacommon/actionlistboxitem.h | 4 +- kioslave/media/libmediacommon/medium.cpp | 2 +- kioslave/media/libmediacommon/medium.h | 4 +- kioslave/media/libmediacommon/notifieraction.cpp | 2 +- .../media/libmediacommon/notifieropenaction.cpp | 2 +- .../media/libmediacommon/notifierserviceaction.cpp | 4 +- kioslave/media/libmediacommon/notifiersettings.cpp | 12 +- kioslave/media/libmediacommon/notifiersettings.h | 2 +- kioslave/media/mediaimpl.cpp | 12 +- kioslave/media/mediamanager/fstabbackend.cpp | 80 ++-- kioslave/media/mediamanager/halbackend.cpp | 42 +-- kioslave/media/mediamanager/linuxcdpolling.cpp | 18 +- kioslave/media/mediamanager/medialist.cpp | 22 +- kioslave/media/mediamanager/removablebackend.cpp | 16 +- kioslave/media/medianotifier/medianotifier.cpp | 6 +- .../media/medianotifier/notificationdialog.cpp | 2 +- .../media/medianotifier/notificationdialogview.ui | 16 +- kioslave/media/mounthelper/decryptdialog.ui | 32 +- .../media/mounthelper/kio_media_mounthelper.cpp | 6 +- kioslave/media/propsdlgplugin/propertiespage.cpp | 50 +-- kioslave/media/propsdlgplugin/propertiespagegui.ui | 2 +- kioslave/nfs/kio_nfs.cpp | 26 +- kioslave/nntp/nntp.cpp | 30 +- kioslave/pop3/pop3.cc | 40 +- kioslave/remote/kdedmodule/remotedirnotify.cpp | 2 +- kioslave/remote/kio_remote.cpp | 4 +- kioslave/remote/remoteimpl.cpp | 2 +- kioslave/sftp/kio_sftp.cpp | 196 +++++----- kioslave/sftp/kio_sftp.h | 8 +- kioslave/sftp/ksshprocess.cpp | 54 +-- kioslave/sftp/ksshprocess.h | 4 +- kioslave/sftp/process.cpp | 6 +- kioslave/sftp/sftpfileattr.cpp | 18 +- kioslave/sftp/sftpfileattr.h | 8 +- kioslave/smb/kio_smb_auth.cpp | 2 +- kioslave/smb/kio_smb_browse.cpp | 16 +- kioslave/smb/kio_smb_mount.cpp | 2 +- kioslave/smtp/capabilities.cc | 2 +- kioslave/smtp/capabilities.h | 4 +- kioslave/smtp/command.cc | 4 +- kioslave/smtp/interactivesmtpserver.h | 8 +- kioslave/smtp/request.cc | 8 +- kioslave/smtp/response.cc | 4 +- kioslave/smtp/response.h | 2 +- kioslave/smtp/smtp.cc | 2 +- kioslave/smtp/smtp.h | 4 +- kioslave/smtp/test_commands.cc | 14 +- kioslave/system/kdedmodule/systemdirnotify.cpp | 2 +- kioslave/system/systemimpl.cpp | 10 +- kioslave/system/systemimpl.h | 2 +- kioslave/tar/tar.cc | 16 +- kioslave/thumbnail/cursorcreator.cpp | 12 +- kioslave/thumbnail/exrcreator.cpp | 2 +- kioslave/thumbnail/htmlcreator.cpp | 6 +- kioslave/thumbnail/textcreator.cpp | 4 +- kioslave/thumbnail/thumbnail.cpp | 8 +- kioslave/trash/kio_trash.cpp | 8 +- kioslave/trash/ktrash.cpp | 2 +- kioslave/trash/testtrash.cpp | 14 +- kioslave/trash/trashimpl.cpp | 24 +- kioslave/trash/trashimpl.h | 2 +- klipper/applet.cpp | 2 +- klipper/clipboardpoll.h | 2 +- klipper/configdialog.cpp | 24 +- klipper/configdialog.h | 14 +- klipper/history.h | 2 +- klipper/historyitem.cpp | 2 +- klipper/historyurlitem.cpp | 2 +- klipper/klipperbindings.cpp | 4 +- klipper/klipperpopup.cpp | 6 +- klipper/popupproxy.cpp | 10 +- klipper/popupproxy.h | 2 +- klipper/toplevel.cpp | 40 +- klipper/toplevel.h | 4 +- klipper/urlgrabber.cpp | 10 +- klipper/urlgrabber.h | 6 +- kmenuedit/basictab.cpp | 4 +- kmenuedit/basictab.h | 4 +- kmenuedit/kmenuedit.cpp | 8 +- kmenuedit/menufile.cpp | 6 +- kmenuedit/menuinfo.cpp | 14 +- kmenuedit/treeview.cpp | 42 +-- kmenuedit/treeview.h | 2 +- knetattach/knetattach.ui | 65 ++-- knetattach/knetattach.ui.h | 2 +- konqueror/KonqMainWindowIface.cc | 6 +- konqueror/KonquerorIface.cc | 18 +- konqueror/about/konq_aboutpage.cc | 30 +- konqueror/about/konq_aboutpage.h | 4 +- konqueror/about/specs.html | 2 +- konqueror/client/kfmclient.cc | 56 +-- konqueror/delayedinitializer.h | 2 +- konqueror/iconview/konq_iconview.cc | 32 +- konqueror/iconview/konq_iconview.h | 2 +- konqueror/keditbookmarks/actionsimpl.cpp | 92 ++--- konqueror/keditbookmarks/commands.cpp | 6 +- konqueror/keditbookmarks/favicons.cpp | 2 +- konqueror/keditbookmarks/importers.cpp | 2 +- konqueror/keditbookmarks/kbookmarkmerger.cpp | 2 +- konqueror/keditbookmarks/listview.cpp | 32 +- konqueror/keditbookmarks/listview.h | 10 +- konqueror/keditbookmarks/main.cpp | 8 +- konqueror/keditbookmarks/testlink.cpp | 10 +- konqueror/keditbookmarks/toplevel.cpp | 16 +- konqueror/konq_actions.cc | 2 +- konqueror/konq_combo.cc | 50 +-- konqueror/konq_extensionmanager.cc | 4 +- konqueror/konq_factory.cc | 16 +- konqueror/konq_factory.h | 2 +- konqueror/konq_frame.cc | 74 ++-- konqueror/konq_frame.h | 2 +- konqueror/konq_guiclients.cc | 10 +- konqueror/konq_guiclients.h | 2 +- konqueror/konq_main.cc | 8 +- konqueror/konq_main.h | 2 +- konqueror/konq_mainwindow.cc | 410 ++++++++++----------- konqueror/konq_mainwindow.h | 18 +- konqueror/konq_misc.cc | 8 +- konqueror/konq_misc.h | 2 +- konqueror/konq_profiledlg.cc | 12 +- konqueror/konq_profiledlg.h | 2 +- konqueror/konq_tabs.cc | 12 +- konqueror/konq_view.cc | 60 +-- konqueror/konq_view.h | 2 +- konqueror/konq_viewmgr.cc | 54 +-- konqueror/konqueror.kcfg | 2 +- konqueror/listview/konq_infolistviewitem.cc | 6 +- konqueror/listview/konq_infolistviewitem.h | 2 +- konqueror/listview/konq_infolistviewwidget.cc | 10 +- konqueror/listview/konq_infolistviewwidget.h | 2 +- konqueror/listview/konq_listview.cc | 20 +- konqueror/listview/konq_listview.h | 4 +- konqueror/listview/konq_listviewitems.cc | 24 +- konqueror/listview/konq_listviewitems.h | 2 +- konqueror/listview/konq_listviewwidget.cc | 72 ++-- konqueror/listview/konq_listviewwidget.h | 4 +- konqueror/listview/konq_textviewitem.cc | 4 +- konqueror/listview/konq_textviewitem.h | 2 +- konqueror/listview/konq_textviewwidget.cc | 6 +- konqueror/listview/konq_textviewwidget.h | 2 +- konqueror/listview/konq_treeviewwidget.cc | 6 +- konqueror/listview/konq_treeviewwidget.h | 2 +- konqueror/preloader/preloader.cc | 4 +- .../remoteencodingplugin/kremoteencodingplugin.cpp | 4 +- konqueror/shellcmdplugin/kshellcmddialog.cpp | 8 +- konqueror/shellcmdplugin/kshellcmdexecutor.cpp | 8 +- konqueror/shellcmdplugin/kshellcmdexecutor.h | 2 +- konqueror/sidebar/konqsidebar.cpp | 12 +- konqueror/sidebar/konqsidebar.h | 4 +- konqueror/sidebar/konqsidebarplugin.cpp | 2 +- konqueror/sidebar/konqsidebarplugin.h | 2 +- konqueror/sidebar/sidebar_widget.cpp | 61 +-- konqueror/sidebar/sidebar_widget.h | 6 +- .../trees/bookmark_module/bookmark_module.cpp | 12 +- .../sidebar/trees/dirtree_module/dirtree_item.cpp | 12 +- .../sidebar/trees/dirtree_module/dirtree_item.h | 2 +- .../trees/dirtree_module/dirtree_module.cpp | 6 +- .../sidebar/trees/history_module/history_dlg.ui | 36 +- .../sidebar/trees/history_module/history_item.cpp | 16 +- .../sidebar/trees/history_module/history_item.h | 2 +- .../trees/history_module/history_module.cpp | 14 +- .../trees/history_module/history_settings.cpp | 8 +- .../sidebar/trees/history_module/kcmhistory.cpp | 8 +- konqueror/sidebar/trees/konq_sidebartree.cpp | 52 +-- konqueror/sidebar/trees/konq_sidebartree.h | 4 +- konqueror/sidebar/trees/konq_sidebartreeitem.h | 2 +- .../sidebar/trees/konq_sidebartreetoplevelitem.cpp | 6 +- konqueror/sidebar/trees/konqsidebar_tree.cpp | 6 +- konqueror/sidebar/web_module/web_module.h | 4 +- konsole/doc/VT100/Table.Codes | 2 +- konsole/doc/VT100/techref.html | 2 +- konsole/konsole/TEHistory.cpp | 2 +- konsole/konsole/TEScreen.cpp | 14 +- konsole/konsole/TEWidget.cpp | 168 ++++----- konsole/konsole/TEWidget.h | 4 +- konsole/konsole/TEmuVt102.cpp | 36 +- konsole/konsole/TEmulation.cpp | 18 +- konsole/konsole/fontembedder.cpp | 12 +- konsole/konsole/keytrans.cpp | 18 +- konsole/konsole/konsole.cpp | 265 ++++++------- konsole/konsole/konsole_part.cpp | 66 ++-- konsole/konsole/konsole_part.h | 6 +- konsole/konsole/konsole_wcwidth.cpp | 12 +- konsole/konsole/konsole_wcwidth.h | 4 +- konsole/konsole/konsolebookmarkmenu.cpp | 4 +- konsole/konsole/kwrited.cpp | 6 +- konsole/konsole/kwrited.h | 2 +- konsole/konsole/linefont.h | 2 +- konsole/konsole/main.cpp | 18 +- konsole/konsole/printsettings.cpp | 2 +- konsole/konsole/printsettings.h | 6 +- konsole/konsole/schema.cpp | 24 +- konsole/konsole/schema.h | 6 +- konsole/konsole/session.cpp | 14 +- kpager/desktop.cpp | 40 +- kpager/desktop.h | 4 +- kpager/kpager.cpp | 46 +-- kpager/kpager.h | 4 +- kpager/main.cpp | 2 +- kpager/windowdrag.h | 2 +- kpersonalizer/kcountrypage.cpp | 36 +- kpersonalizer/kcountrypagedlg.ui | 26 +- kpersonalizer/keyecandypage.cpp | 14 +- kpersonalizer/keyecandypagedlg.ui | 28 +- kpersonalizer/kfindlanguage.cpp | 28 +- kpersonalizer/kospage.cpp | 2 +- kpersonalizer/kospage.h | 2 +- kpersonalizer/kospagedlg.ui | 32 +- kpersonalizer/kpersonalizer.cpp | 10 +- kpersonalizer/krefinepagedlg.ui | 36 +- kpersonalizer/kstylepage.cpp | 14 +- kpersonalizer/kstylepagedlg.ui | 12 +- kpersonalizer/ksysinfo.cpp | 32 +- kpersonalizer/stylepreview.ui | 36 +- kpersonalizer/stylepreview.ui.h | 2 +- kreadconfig/kwriteconfig.cpp | 12 +- kscreensaver/blankscrn.cpp | 2 +- kscreensaver/random.cpp | 8 +- ksmserver/client.cpp | 8 +- ksmserver/global.h | 4 + ksmserver/legacy.cpp | 14 +- ksmserver/main.cpp | 4 +- ksmserver/server.cpp | 16 +- ksmserver/shutdown.cpp | 2 +- ksmserver/shutdowndlg.cpp | 46 +-- ksmserver/shutdowndlg.h | 11 +- ksmserver/startup.cpp | 4 +- ksmserver/timed.ui | 42 +-- ksplashml/kcmksplash/installer.cpp | 22 +- ksplashml/themeengine/default/themelegacy.cpp | 4 +- ksplashml/themeengine/objkstheme.cpp | 2 +- ksplashml/themeengine/redmond/previewredmond.h | 2 +- ksplashml/themeengine/redmond/themeredmond.cpp | 6 +- ksplashml/themeengine/redmond/themeredmond.h | 2 +- ksplashml/themeengine/standard/themestandard.cpp | 4 +- ksplashml/themeengine/standard/wndicon.cpp | 8 +- ksplashml/themeengine/standard/wndicon.h | 2 +- ksplashml/themeengine/standard/wndstatus.cpp | 2 +- ksplashml/themeengine/standard/wndstatus.h | 2 +- ksplashml/themeengine/themeengine.cpp | 8 +- ksplashml/themeengine/themeengine.h | 4 +- kstart/kstart.cpp | 24 +- ksysguard/gui/KSGAppletSettings.cc | 2 +- ksysguard/gui/KSysGuardApplet.cc | 4 +- ksysguard/gui/SensorBrowser.cc | 8 +- ksysguard/gui/SensorDisplayLib/BarGraph.cc | 6 +- ksysguard/gui/SensorDisplayLib/BarGraph.h | 2 +- ksysguard/gui/SensorDisplayLib/DancingBars.cc | 12 +- ksysguard/gui/SensorDisplayLib/DancingBars.h | 2 +- ksysguard/gui/SensorDisplayLib/DummyDisplay.cc | 2 +- ksysguard/gui/SensorDisplayLib/FancyPlotter.cc | 18 +- ksysguard/gui/SensorDisplayLib/FancyPlotter.h | 2 +- .../gui/SensorDisplayLib/FancyPlotterSettings.cc | 8 +- ksysguard/gui/SensorDisplayLib/ListView.cc | 48 +-- ksysguard/gui/SensorDisplayLib/ListView.h | 10 +- .../gui/SensorDisplayLib/ListViewSettingsWidget.ui | 36 +- ksysguard/gui/SensorDisplayLib/LogFile.cc | 14 +- ksysguard/gui/SensorDisplayLib/LogFileSettings.ui | 58 +-- ksysguard/gui/SensorDisplayLib/MultiMeter.cc | 6 +- .../SensorDisplayLib/MultiMeterSettingsWidget.ui | 88 ++--- .../SensorDisplayLib/MultiMeterSettingsWidget.ui.h | 4 +- .../gui/SensorDisplayLib/ProcessController.cc | 12 +- ksysguard/gui/SensorDisplayLib/ProcessList.cc | 14 +- ksysguard/gui/SensorDisplayLib/ReniceDlg.cc | 2 +- ksysguard/gui/SensorDisplayLib/SensorDisplay.cc | 16 +- ksysguard/gui/SensorDisplayLib/SensorLogger.cc | 34 +- ksysguard/gui/SensorDisplayLib/SensorLogger.h | 6 +- .../gui/SensorDisplayLib/SensorLoggerDlgWidget.ui | 34 +- .../SensorDisplayLib/SensorLoggerDlgWidget.ui.h | 4 +- .../SensorDisplayLib/SensorLoggerSettingsWidget.ui | 36 +- ksysguard/gui/SensorDisplayLib/SignalPlotter.cc | 8 +- ksysguard/gui/SensorDisplayLib/SignalPlotter.h | 2 +- ksysguard/gui/WorkSheet.cc | 6 +- ksysguard/gui/WorkSheet.h | 2 +- ksysguard/gui/WorkSheetSettings.cc | 6 +- ksysguard/gui/Workspace.cc | 18 +- ksysguard/gui/Workspace.h | 2 +- ksysguard/gui/ksgrd/HostConnector.cc | 2 +- ksysguard/gui/ksgrd/SensorAgent.cc | 2 +- ksysguard/gui/ksgrd/SensorManager.cc | 16 +- ksysguard/gui/ksysguard.cc | 34 +- ksysguard/gui/ksysguard.h | 2 +- ksystraycmd/ksystraycmd.cpp | 14 +- ksystraycmd/ksystraycmd.h | 2 +- ktip/ktipwindow.cpp | 2 +- kwin/activation.cpp | 6 +- kwin/bridge.cpp | 2 +- kwin/client.cpp | 134 +++---- kwin/client.h | 16 +- kwin/clients/b2/b2client.cpp | 110 +++--- kwin/clients/b2/b2client.h | 10 +- kwin/clients/b2/config/config.h | 2 +- kwin/clients/default/config/config.h | 2 +- kwin/clients/default/kdedefault.cpp | 28 +- kwin/clients/keramik/config/keramikconfig.ui | 10 +- kwin/clients/keramik/embedtool.cpp | 20 +- kwin/clients/keramik/keramik.cpp | 112 +++--- kwin/clients/keramik/keramik.h | 8 +- kwin/clients/kwmtheme/cli_installer/main.cpp | 16 +- kwin/clients/kwmtheme/kwmthemeclient.cpp | 28 +- kwin/clients/kwmtheme/kwmthemeclient.h | 4 +- kwin/clients/laptop/laptopclient.cpp | 26 +- kwin/clients/modernsystem/config/config.cpp | 10 +- kwin/clients/modernsystem/config/config.h | 18 +- kwin/clients/modernsystem/modernsys.cpp | 20 +- kwin/clients/plastik/config/config.h | 2 +- kwin/clients/plastik/config/configdialog.ui | 18 +- kwin/clients/plastik/misc.cpp | 10 +- kwin/clients/plastik/plastik.cpp | 2 +- kwin/clients/plastik/plastik.h | 4 +- kwin/clients/plastik/plastikbutton.cpp | 6 +- kwin/clients/plastik/plastikclient.cpp | 30 +- kwin/clients/quartz/config/config.h | 2 +- kwin/clients/quartz/quartz.cpp | 36 +- kwin/clients/redmond/redmond.cpp | 24 +- kwin/clients/test/test.cpp | 24 +- kwin/clients/test/test.h | 2 +- kwin/clients/web/Web.cpp | 34 +- kwin/clients/web/Web.h | 2 +- kwin/clients/web/WebButton.cpp | 26 +- kwin/clients/web/WebButton.h | 4 +- kwin/data/update_default_rules.cpp | 2 +- kwin/data/update_window_settings.cpp | 2 +- kwin/events.cpp | 42 +-- kwin/geometry.cpp | 22 +- kwin/geometrytip.cpp | 12 +- kwin/geometrytip.h | 4 +- kwin/group.cpp | 34 +- kwin/kcmkwin/kwindecoration/buttons.cpp | 70 ++-- kwin/kcmkwin/kwindecoration/buttons.h | 10 +- kwin/kcmkwin/kwindecoration/kwindecoration.cpp | 16 +- kwin/kcmkwin/kwindecoration/preview.cpp | 14 +- kwin/kcmkwin/kwindecoration/preview.h | 2 +- kwin/kcmkwin/kwinoptions/main.cpp | 4 +- kwin/kcmkwin/kwinoptions/mouse.cpp | 38 +- kwin/kcmkwin/kwinoptions/mouse.h | 2 +- kwin/kcmkwin/kwinoptions/windows.cpp | 34 +- kwin/kcmkwin/kwinrules/detectwidget.cpp | 8 +- kwin/kcmkwin/kwinrules/detectwidgetbase.ui | 40 +- kwin/kcmkwin/kwinrules/editshortcutbase.ui | 16 +- kwin/kcmkwin/kwinrules/kcm.cpp | 4 +- kwin/kcmkwin/kwinrules/main.cpp | 8 +- kwin/kcmkwin/kwinrules/ruleslistbase.ui | 4 +- kwin/kcmkwin/kwinrules/ruleswidget.cpp | 6 +- kwin/kcmkwin/kwinrules/ruleswidgetbase.ui | 168 ++++----- kwin/killer/killer.cpp | 4 +- kwin/kompmgr/kompmgr.c | 16 +- kwin/layers.cpp | 20 +- kwin/lib/kcommondecoration.cpp | 38 +- kwin/lib/kcommondecoration.h | 13 +- kwin/lib/kdecoration.cpp | 6 +- kwin/lib/kdecoration.h | 16 +- kwin/lib/kdecoration_plugins_p.cpp | 2 +- kwin/lib/kdecorationfactory.cpp | 2 +- kwin/lib/kdecorationfactory.h | 2 +- kwin/main.cpp | 2 +- kwin/manage.cpp | 8 +- kwin/options.cpp | 8 +- kwin/popupinfo.cpp | 6 +- kwin/popupinfo.h | 2 +- kwin/rules.cpp | 4 +- kwin/rules.h | 8 +- kwin/sm.cpp | 10 +- kwin/tabbox.cpp | 46 +-- kwin/tabbox.h | 2 +- kwin/tools/decobenchmark/main.cpp | 4 +- kwin/tools/decobenchmark/preview.cpp | 8 +- kwin/useractions.cpp | 10 +- kwin/utils.cpp | 18 +- kwin/utils.h | 10 +- kwin/wm-spec/x351.html | 4 +- kwin/workspace.cpp | 68 ++-- kxkb/extension.cpp | 6 +- kxkb/kcmlayout.cpp | 62 ++-- kxkb/kcmlayoutwidget.ui | 96 ++--- kxkb/kcmmiscwidget.ui | 24 +- kxkb/kxkb.cpp | 6 +- kxkb/kxkbbindings.cpp | 4 +- kxkb/kxkbconfig.cpp | 18 +- kxkb/kxkbtraywindow.h | 2 +- kxkb/pixmap.cpp | 6 +- kxkb/rules.cpp | 14 +- kxkb/x11helper.cpp | 42 +-- libkonq/favicons/favicons.cpp | 6 +- libkonq/kfileivi.cc | 2 +- libkonq/kfileivi.h | 4 +- libkonq/kivdirectoryoverlay.cc | 2 +- libkonq/knewmenu.cc | 30 +- libkonq/knewmenu.h | 2 +- libkonq/konq_bgnddlg.cc | 8 +- libkonq/konq_dirpart.cc | 8 +- libkonq/konq_drag.cc | 16 +- libkonq/konq_drag.h | 10 +- libkonq/konq_filetip.cc | 6 +- libkonq/konq_filetip.h | 2 +- libkonq/konq_historycomm.h | 6 +- libkonq/konq_historymgr.cc | 40 +- libkonq/konq_historymgr.h | 22 +- libkonq/konq_iconviewwidget.cc | 80 ++-- libkonq/konq_operations.cc | 10 +- libkonq/konq_operations.h | 4 +- libkonq/konq_pixmapprovider.cc | 14 +- libkonq/konq_popupmenu.cc | 147 ++++---- libkonq/konq_popupmenu.h | 12 +- libkonq/konq_propsview.cc | 22 +- libkonq/konq_propsview.h | 4 +- libkonq/konq_settings.cc | 6 +- libkonq/konq_sound.cc | 4 +- libkonq/konq_sound.h | 2 +- libkonq/konq_undo.cc | 12 +- libkonq/konq_undo.h | 2 +- libkonq/konq_xmlguiclient.cc | 6 +- libkonq/konq_xmlguiclient.h | 4 +- libkonq/konqbookmarkmanager.h | 2 +- nsplugins/NSPluginCallbackIface.h | 2 +- nsplugins/nspluginloader.cpp | 8 +- nsplugins/nspluginloader.h | 2 +- nsplugins/plugin_part.cpp | 16 +- nsplugins/plugin_part.h | 6 +- nsplugins/pluginscan.cpp | 22 +- nsplugins/sdk/jni.h | 6 +- nsplugins/sdk/jri.h | 4 +- nsplugins/sdk/npruntime.h | 6 +- nsplugins/sdk/npupp.h | 4 +- nsplugins/viewer/NSPluginClassIface.h | 12 +- nsplugins/viewer/kxt.cpp | 6 +- nsplugins/viewer/nsplugin.cpp | 50 +-- nsplugins/viewer/nsplugin.h | 14 +- nsplugins/viewer/qxteventloop.cpp | 16 +- nsplugins/viewer/qxteventloop.h | 7 +- nsplugins/viewer/viewer.cpp | 2 +- nsplugins/wrapper/wrapper.c | 16 +- 1188 files changed, 9436 insertions(+), 9372 deletions(-) diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index c60d6a41c..98d466fb4 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -71,7 +71,7 @@ void BackTrace::start() TQString exec = m_krashconf->tryExec(); if ( !exec.isEmpty() && KStandardDirs::findExe(exec).isEmpty() ) { - TQObject * o = parent(); + TQObject * o = tqparent(); if (o && !o->inherits("QWidget")) { @@ -137,7 +137,7 @@ bool BackTrace::usefulBacktrace() { // remove crap if( !m_krashconf->removeFromBacktraceRegExp().isEmpty()) - m_strBt.replace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null); + m_strBt.tqreplace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString()); if( m_krashconf->disableChecks()) return true; @@ -146,16 +146,16 @@ bool BackTrace::usefulBacktrace() // how many " ?? " in the bt ? int unknown = 0; if( !m_krashconf->invalidStackFrameRegExp().isEmpty()) - unknown = strBt.contains( TQRegExp( m_krashconf->invalidStackFrameRegExp())); + unknown = strBt.tqcontains( TQRegExp( m_krashconf->invalidStackFrameRegExp())); // how many stack frames in the bt ? int frames = 0; if( !m_krashconf->frameRegExp().isEmpty()) - frames = strBt.contains( TQRegExp( m_krashconf->frameRegExp())); + frames = strBt.tqcontains( TQRegExp( m_krashconf->frameRegExp())); else - frames = strBt.contains('\n'); + frames = strBt.tqcontains('\n'); bool tooShort = false; if( !m_krashconf->neededInValidBacktraceRegExp().isEmpty()) - tooShort = ( strBt.find( TQRegExp( m_krashconf->neededInValidBacktraceRegExp())) == -1 ); + tooShort = ( strBt.tqfind( TQRegExp( m_krashconf->neededInValidBacktraceRegExp())) == -1 ); return !m_strBt.isNull() && !tooShort && (unknown < frames); } @@ -175,7 +175,7 @@ void BackTrace::processBacktrace() --len; } m_strBt.remove( pos, len ); - m_strBt.insert( pos, TQString::fromLatin1( "[KCrash handler]\n" )); + m_strBt.insert( pos, TQString::tqfromLatin1( "[KCrash handler]\n" )); } } } diff --git a/drkonqi/backtrace.h b/drkonqi/backtrace.h index b6779f3eb..4a94bcfc6 100644 --- a/drkonqi/backtrace.h +++ b/drkonqi/backtrace.h @@ -34,7 +34,7 @@ class KTempFile; #include -class BackTrace : public QObject +class BackTrace : public TQObject { Q_OBJECT diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp index c6b073e4f..b63025563 100644 --- a/drkonqi/debugger.cpp +++ b/drkonqi/debugger.cpp @@ -54,15 +54,15 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent, vbox->setAutoAdd(TRUE); m_backtrace = new KTextBrowser(this); - m_backtrace->setTextFormat(Qt::PlainText); + m_backtrace->setTextFormat(TQt::PlainText); m_backtrace->setFont(KGlobalSettings::fixedFont()); TQWidget *w = new TQWidget( this ); ( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true ); m_status = new TQLabel( w ); - m_status->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); + m_status->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); //m_copyButton = new KPushButton( KStdGuiItem::copy(), w ); - KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "editcopy" ) ); + KGuiItem item( i18n( "C&opy" ), TQString::tqfromLatin1( "editcopy" ) ); m_copyButton = new KPushButton( item, w ); connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) ); m_copyButton->setEnabled( false ); @@ -109,9 +109,9 @@ void KrashDebugger :: slotSave() } else { - TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" ); - if( defname.contains( '/' )) - defname = defname.mid( defname.findRev( '/' ) + 1 ); + TQString defname = m_krashconf->execName() + TQString::tqfromLatin1( ".kcrash" ); + if( defname.tqcontains( '/' )) + defname = defname.mid( defname.tqfindRev( '/' ) + 1 ); TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename")); if (!filename.isEmpty()) { @@ -193,7 +193,7 @@ void KrashDebugger :: startDebugger() } m_status->setText(i18n("Loading symbols...")); - m_proctrace = new BackTrace(m_krashconf, this); + m_proctrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this)); connect(m_proctrace, TQT_SIGNAL(append(const TQString &)), TQT_SLOT(slotAppend(const TQString &))); @@ -208,7 +208,7 @@ void KrashDebugger :: startDebugger() bool KrashDebugger::performChecks( TQString* msg ) { bool ret = true; - KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true ); + KConfig kdedcfg( TQString::tqfromLatin1( "kdedrc" ), true ); kdedcfg.setGroup( "General" ); if( kdedcfg.readBoolEntry( "DelayedCheck", false )) { diff --git a/drkonqi/debugger.h b/drkonqi/debugger.h index bbfc617e1..0604d5fcf 100644 --- a/drkonqi/debugger.h +++ b/drkonqi/debugger.h @@ -36,7 +36,7 @@ class BackTrace; #include -class KrashDebugger : public QWidget +class KrashDebugger : public TQWidget { Q_OBJECT diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index 4faccc956..7c276cf41 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -93,12 +93,12 @@ void KrashConfig :: readConfig() // maybe we should check if it's relative? TQString configname = config->readEntry("ConfigName", - TQString::fromLatin1("enduser")); + TQString::tqfromLatin1("enduser")); TQString debuggername = config->readEntry("Debugger", - TQString::fromLatin1("gdb")); + TQString::tqfromLatin1("gdb")); - KConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername), + KConfig debuggers(TQString::tqfromLatin1("debuggers/%1rc").arg(debuggername), true, false, "appdata"); debuggers.setGroup("General"); @@ -112,7 +112,7 @@ void KrashConfig :: readConfig() m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp"); m_kcrashRegExp = debuggers.readEntry("KCrashRegExp"); - KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname), + KConfig preset(TQString::tqfromLatin1("presets/%1rc").arg(configname), true, false, "appdata"); preset.setGroup("ErrorDescription"); @@ -138,7 +138,7 @@ void KrashConfig :: readConfig() TQString str = TQString::number(m_signalnum); // use group unknown if signal not found if (!preset.hasGroup(str)) - str = TQString::fromLatin1("unknown"); + str = TQString::tqfromLatin1("unknown"); preset.setGroup(str); m_signalName = preset.readEntry("Name"); if (b) @@ -149,13 +149,13 @@ void KrashConfig :: readConfig() void KrashConfig :: expandString(TQString &str, bool shell, const TQString &tempFile) const { TQMap map; - map[TQString::fromLatin1("appname")] = TQString::fromLatin1(appName()); - map[TQString::fromLatin1("execname")] = startedByKdeinit() ? TQString::fromLatin1("kdeinit") : m_execname; - map[TQString::fromLatin1("signum")] = TQString::number(signalNumber()); - map[TQString::fromLatin1("signame")] = signalName(); - map[TQString::fromLatin1("progname")] = programName(); - map[TQString::fromLatin1("pid")] = TQString::number(pid()); - map[TQString::fromLatin1("tempfile")] = tempFile; + map[TQString::tqfromLatin1("appname")] = TQString::tqfromLatin1(appName()); + map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("kdeinit") : m_execname; + map[TQString::tqfromLatin1("signum")] = TQString::number(signalNumber()); + map[TQString::tqfromLatin1("signame")] = signalName(); + map[TQString::tqfromLatin1("progname")] = programName(); + map[TQString::tqfromLatin1("pid")] = TQString::number(pid()); + map[TQString::tqfromLatin1("tempfile")] = tempFile; if (shell) str = KMacroExpander::expandMacrosShellQuote( str, map ); else diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp index 488edaebd..118e56c39 100644 --- a/drkonqi/toplevel.cpp +++ b/drkonqi/toplevel.cpp @@ -67,12 +67,12 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name) // picture of konqi TQLabel *lab = new TQLabel(page); lab->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); - TQPixmap pix(locate("appdata", TQString::fromLatin1("pics/konqi.png"))); + TQPixmap pix(locate("appdata", TQString::tqfromLatin1("pics/konqi.png"))); lab->setPixmap(pix); - lab->setFixedSize( lab->sizeHint() ); + lab->setFixedSize( lab->tqsizeHint() ); TQLabel * info = new TQLabel(generateText(), page); - info->setMinimumSize(info->sizeHint()); + info->setMinimumSize(info->tqsizeHint()); if (m_krashconf->showBacktrace()) { @@ -151,10 +151,10 @@ void Toplevel :: slotUser1() m_bugreport = new DrKBugReport(0, true, m_krashconf->aboutData()); if (i == KMessageBox::Yes) { - TQApplication::setOverrideCursor ( waitCursor ); + TQApplication::setOverrideCursor ( tqwaitCursor ); // generate the backtrace - BackTrace *backtrace = new BackTrace(m_krashconf, this); + BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this)); connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotBacktraceSomeError())); connect(backtrace, TQT_SIGNAL(done(const TQString &)), TQT_SLOT(slotBacktraceDone(const TQString &))); @@ -196,7 +196,7 @@ void Toplevel :: slotUser3() void Toplevel :: slotBacktraceDone(const TQString &str) { // Do not translate.. This will be included in the _MAIL_. - TQString buf = TQString::fromLatin1 + TQString buf = TQString::tqfromLatin1 ("\n\n\nHere is a backtrace generated by DrKonqi:\n") + str; m_bugreport->setText(buf); diff --git a/kappfinder/common.cpp b/kappfinder/common.cpp index 71ae2319e..c5cea0df5 100644 --- a/kappfinder/common.cpp +++ b/kappfinder/common.cpp @@ -61,13 +61,13 @@ bool scanDesktopFile( TQPtrList &appCache, const TQString &templ, // find out the name of the file to store destName = templ; - int pos = templ.find( "kappfinder/apps/" ); + int pos = templ.tqfind( "kappfinder/apps/" ); if ( pos > 0 ) destName = destName.mid( pos + strlen( "kappfinder/apps/" ) ); // calculate real dir and filename destName = destDir + destName; - pos = destName.findRev( '/' ); + pos = destName.tqfindRev( '/' ); if ( pos > 0 ) { destDir = destName.left( pos ); destName = destName.mid( pos + 1 ); @@ -77,7 +77,7 @@ bool scanDesktopFile( TQPtrList &appCache, const TQString &templ, TQString exec = desktop.readPathEntry( "TryExec" ); if ( exec.isEmpty() ) exec = desktop.readPathEntry( "Exec" ); - pos = exec.find( ' ' ); + pos = exec.tqfind( ' ' ); if ( pos > 0 ) exec = exec.left( pos ); @@ -117,7 +117,7 @@ void createDesktopFiles( TQPtrList &appCache, int &added ) destDir += "/"; TQDir d; int pos = -1; - while ( ( pos = destDir.find( '/', pos + 1 ) ) >= 0 ) { + while ( ( pos = destDir.tqfind( '/', pos + 1 ) ) >= 0 ) { TQString path = destDir.left( pos + 1 ); d = path; if ( !d.exists() ) @@ -144,7 +144,7 @@ void decorateDirs( TQString destDir ) for ( it = dirs.begin(); it != dirs.end(); ++it ) { // find out the name of the file to store TQString destName = *it; - int pos = destName.find( "kappfinder/apps/" ); + int pos = destName.tqfind( "kappfinder/apps/" ); if ( pos > 0 ) destName = destName.mid( pos + strlen( "kappfinder/apps/" ) ); diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp index 660c5b498..389beacda 100644 --- a/kappfinder/toplevel.cpp +++ b/kappfinder/toplevel.cpp @@ -54,7 +54,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name "applications on your system and adds " "them to the KDE menu system. " "Click 'Scan' to begin, select the desired applications and then click 'Apply'."), this); - label->setAlignment( AlignAuto | WordBreak ); + label->tqsetAlignment( AlignAuto | WordBreak ); layout->addWidget( label ); layout->addSpacing( 5 ); @@ -77,18 +77,18 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name layout->addWidget( mSummary ); KButtonBox* bbox = new KButtonBox( this ); - mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "find"), this, TQT_SLOT( slotScan() ) ); + mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "find"), TQT_TQOBJECT(this), TQT_SLOT( slotScan() ) ); bbox->addStretch( 5 ); - mSelectButton = bbox->addButton( i18n( "Select All" ), this, + mSelectButton = bbox->addButton( i18n( "Select All" ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ) ); mSelectButton->setEnabled( false ); - mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), this, + mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this), TQT_SLOT( slotUnselectAll() ) ); mUnSelectButton->setEnabled( false ); bbox->addStretch( 5 ); - mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQT_SLOT( slotCreate() ) ); + mApplyButton = bbox->addButton( KStdGuiItem::apply(), TQT_TQOBJECT(this), TQT_SLOT( slotCreate() ) ); mApplyButton->setEnabled( false ); - bbox->addButton( KStdGuiItem::close(), kapp, TQT_SLOT( quit() ) ); + bbox->addButton( KStdGuiItem::close(), TQT_TQOBJECT(kapp), TQT_SLOT( quit() ) ); bbox->layout(); layout->addWidget( bbox ); @@ -100,7 +100,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name adjustSize(); mDestDir = destDir; - mDestDir = mDestDir.replace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" ); + mDestDir = mDestDir.tqreplace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" ); KStartupInfo::appStarted(); @@ -183,9 +183,9 @@ void TopLevel::slotScan() mProgress->setProgress( mProgress->progress() + 1 ); TQString desktopName = *it; - int i = desktopName.findRev('/'); + int i = desktopName.tqfindRev('/'); desktopName = desktopName.mid(i+1); - i = desktopName.findRev('.'); + i = desktopName.tqfindRev('.'); if (i != -1) desktopName = desktopName.left(i); @@ -207,9 +207,9 @@ void TopLevel::slotScan() // copy over the desktop file, if exists if ( scanDesktopFile( mAppCache, *it, mDestDir ) ) { TQString relPath = *it; - int pos = relPath.find( "kappfinder/apps/" ); + int pos = relPath.tqfind( "kappfinder/apps/" ); relPath = relPath.mid( pos + strlen( "kappfinder/apps/" ) ); - relPath = relPath.left( relPath.findRev( '/' ) + 1 ); + relPath = relPath.left( relPath.tqfindRev( '/' ) + 1 ); TQStringList dirList = TQStringList::split( '/', relPath ); TQListViewItem *dirItem = 0; diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index 70c81d465..3518c6308 100644 --- a/kate/app/kateapp.cpp +++ b/kate/app/kateapp.cpp @@ -69,19 +69,19 @@ KateApp::KateApp (KCmdLineArgs *args) m_application = new Kate::Application (this); // doc + project man - m_docManager = new KateDocManager (this); + m_docManager = new KateDocManager (TQT_TQOBJECT(this)); // init all normal plugins - m_pluginManager = new KatePluginManager (this); + m_pluginManager = new KatePluginManager (TQT_TQOBJECT(this)); // session manager up - m_sessionManager = new KateSessionManager (this); + m_sessionManager = new KateSessionManager (TQT_TQOBJECT(this)); // application dcop interface m_obj = new KateAppDCOPIface (this); kdDebug()<<"Setting KATE_PID: '"<External Tools menu path.clear(); @@ -269,7 +269,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) page = addVBoxPage( path, i18n("External Tools"), BarIcon("configure", KIcon::SizeSmall) ); configExternalToolsPage = new KateExternalToolsConfigWidget(page, "external tools config page"); - connect( configExternalToolsPage, TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()) ); + connect( configExternalToolsPage, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotChanged()) ); // editor widgets from kwrite/kwdialog path.clear(); @@ -334,7 +334,7 @@ void KateConfigDialog::removePluginPage (Kate::Plugin *plugin) { if ( pluginPages.at(i)->plugin == plugin ) { - TQWidget *w = pluginPages.at(i)->page->parentWidget(); + TQWidget *w = pluginPages.at(i)->page->tqparentWidget(); delete pluginPages.at(i)->page; delete w; pluginPages.remove(pluginPages.at(i)); diff --git a/kate/app/kateconfigplugindialogpage.cpp b/kate/app/kateconfigplugindialogpage.cpp index 4aa56c78d..7fecffcc5 100644 --- a/kate/app/kateconfigplugindialogpage.cpp +++ b/kate/app/kateconfigplugindialogpage.cpp @@ -33,7 +33,7 @@ #include #include -class KatePluginListItem : public QCheckListItem +class KatePluginListItem : public TQCheckListItem { public: KatePluginListItem(bool checked, KatePluginInfo *info, TQListView *parent); diff --git a/kate/app/kateconfigplugindialogpage.h b/kate/app/kateconfigplugindialogpage.h index c02c0411b..afdfc7911 100644 --- a/kate/app/kateconfigplugindialogpage.h +++ b/kate/app/kateconfigplugindialogpage.h @@ -45,7 +45,7 @@ class KatePluginListView : public KListView void stateChanged(KatePluginListItem *, bool); }; -class KateConfigPluginPage: public QVBox +class KateConfigPluginPage: public TQVBox { Q_OBJECT diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp index a160162db..8041d5910 100644 --- a/kate/app/kateconsole.cpp +++ b/kate/app/kateconsole.cpp @@ -57,14 +57,14 @@ void KateConsole::loadConsoleIfNeeded() { if (m_part) return; - if (!topLevelWidget() || !parentWidget()) return; - if (!topLevelWidget() || !isVisibleTo(topLevelWidget())) return; + if (!tqtopLevelWidget() || !tqparentWidget()) return; + if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return; KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart"); if (!factory) return; - m_part = static_cast(factory->create(this,"libkonsolepart", "KParts::ReadOnlyPart")); + m_part = static_cast(factory->create(TQT_TQOBJECT(this),"libkonsolepart", "KParts::ReadOnlyPart")); if (!m_part) return; @@ -86,7 +86,7 @@ void KateConsole::slotDestroyed () m_part = 0; // hide the dockwidget - if (parentWidget()) + if (tqparentWidget()) { m_mw->hideToolView (m_toolView); m_mw->centralWidget()->setFocus (); @@ -115,7 +115,7 @@ void KateConsole::sendInput( const TQString& text ) if (!m_part) return; - TerminalInterface *t = static_cast( m_part->qt_cast( "TerminalInterface" ) ); + TerminalInterface *t = static_cast( m_part->tqqt_cast( "TerminalInterface" ) ); if (!t) return; diff --git a/kate/app/kateconsole.h b/kate/app/kateconsole.h index e308f1df2..dabfda38d 100644 --- a/kate/app/kateconsole.h +++ b/kate/app/kateconsole.h @@ -42,7 +42,7 @@ class KateMainWindow; * This class is used for the internal terminal emulator * It uses internally the konsole part, thx to konsole devs :) */ -class KateConsole : public QVBox +class KateConsole : public TQVBox { Q_OBJECT diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp index f60c09783..c06aa7ead 100644 --- a/kate/app/katedocmanager.cpp +++ b/kate/app/katedocmanager.cpp @@ -86,7 +86,7 @@ KateDocManager::~KateDocManager () { m_metaInfos->setGroup(*it); TQDateTime last = m_metaInfos->readDateTimeEntry("Time", def); - if (last.daysTo(TQDateTime::currentDateTime()) > m_daysMetaInfos) + if (last.daysTo(TQDateTime::tqcurrentDateTime()) > m_daysMetaInfos) m_metaInfos->deleteGroup(*it); } delete def; @@ -194,7 +194,7 @@ const KateDocumentInfo *KateDocManager::documentInfo (Kate::Document *doc) int KateDocManager::findDocument (Kate::Document *doc) { - return m_docList.find (doc); + return m_docList.tqfind (doc); } uint KateDocManager::documents () @@ -306,7 +306,7 @@ bool KateDocManager::closeDocument(class Kate::Document *doc,bool closeURL) KateApp::self()->mainWindow(i)->viewManager()->closeViews(documentNumber); } - if ( closeURL && m_tempFiles.contains( documentNumber ) ) + if ( closeURL && m_tempFiles.tqcontains( documentNumber ) ) { TQFileInfo fi( m_tempFiles[ documentNumber ].first.path() ); if ( fi.lastModified() <= m_tempFiles[ documentNumber ].second /*|| @@ -583,7 +583,7 @@ void KateDocManager::saveMetaInfos(Kate::Document *doc) m_metaInfos->setGroup(doc->url().prettyURL()); doc->writeSessionConfig(m_metaInfos); m_metaInfos->writeEntry("MD5", (const char *)md5); - m_metaInfos->writeEntry("Time", TQDateTime::currentDateTime()); + m_metaInfos->writeEntry("Time", TQDateTime::tqcurrentDateTime()); m_metaInfos->sync(); } } @@ -596,7 +596,7 @@ bool KateDocManager::computeUrlMD5(const KURL &url, TQCString &result) { KMD5 md5; - if (!md5.update(f)) + if (!md5.update(TQT_TQIODEVICE_OBJECT(f))) return false; md5.hexDigest(result); diff --git a/kate/app/katedocmanager.h b/kate/app/katedocmanager.h index b35d0a65f..25b1ba631 100644 --- a/kate/app/katedocmanager.h +++ b/kate/app/katedocmanager.h @@ -54,7 +54,7 @@ class KateDocumentInfo typedef QPair TPair; -class KateDocManager : public QObject +class KateDocManager : public TQObject { Q_OBJECT diff --git a/kate/app/katedocmanageriface.cpp b/kate/app/katedocmanageriface.cpp index 5ef01a1df..64d9d558a 100644 --- a/kate/app/katedocmanageriface.cpp +++ b/kate/app/katedocmanageriface.cpp @@ -35,7 +35,7 @@ DCOPRef KateDocManagerDCOPIface::document (uint n) if (!doc) return DCOPRef (); - DCOPObject *obj = static_cast(doc->qt_cast("DCOPObject")); + DCOPObject *obj = static_cast(doc->tqqt_cast("DCOPObject")); if (!obj) return DCOPRef (); @@ -50,7 +50,7 @@ DCOPRef KateDocManagerDCOPIface::activeDocument () if (!doc) return DCOPRef (); - DCOPObject *obj = static_cast(doc->qt_cast("DCOPObject")); + DCOPObject *obj = static_cast(doc->tqqt_cast("DCOPObject")); if (!obj) return DCOPRef (); @@ -75,7 +75,7 @@ DCOPRef KateDocManagerDCOPIface::documentWithID (uint id) if (!doc) return DCOPRef (); - DCOPObject *obj = static_cast(doc->qt_cast("DCOPObject")); + DCOPObject *obj = static_cast(doc->tqqt_cast("DCOPObject")); if (!obj) return DCOPRef (); @@ -90,7 +90,7 @@ DCOPRef KateDocManagerDCOPIface::openURL (KURL url, TQString encoding) if (!doc) return DCOPRef (); - DCOPObject *obj = static_cast(doc->qt_cast("DCOPObject")); + DCOPObject *obj = static_cast(doc->tqqt_cast("DCOPObject")); if (!obj) return DCOPRef (); diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp index 6680e26a4..a7b1f2afd 100644 --- a/kate/app/kateexternaltools.cpp +++ b/kate/app/kateexternaltools.cpp @@ -127,7 +127,7 @@ bool KateExternalTool::checkExec() bool KateExternalTool::valid( const TQString &mt ) const { - return mimetypes.isEmpty() || mimetypes.contains( mt ); + return mimetypes.isEmpty() || mimetypes.tqcontains( mt ); } //END KateExternalTool @@ -191,7 +191,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<(wv->topLevelWidget()); + KateMDI::MainWindow *dmw=dynamic_cast(wv->tqtopLevelWidget()); if (!dmw) { // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<(dmw->action("tools_external")); if (!a) return false; // kdDebug(13001)<<"trying to find action"<actionCollection()->action(actionName.utf8()); + KAction *a1=a->actionCollection()->action(static_cast(actionName.utf8())); if (!a1) return false; // kdDebug(13001)<<"activating action"<activate(); @@ -330,8 +330,8 @@ void KateExternalToolsMenuAction::reload() bool sepadded = false; for (TQStringList::iterator itg = dtools.begin(); itg != dtools.end(); ++itg ) { - if ( ! tools.contains( *itg ) && - ! removed.contains( *itg ) ) + if ( ! tools.tqcontains( *itg ) && + ! removed.tqcontains( *itg ) ) { if ( ! sepadded ) { @@ -394,7 +394,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged() if ( action ) { l = action->tool->mimetypes; - b = ( ! l.count() || l.contains( mt ) ); + b = ( ! l.count() || l.tqcontains( mt ) ); action->setEnabled( b ); } } @@ -407,7 +407,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged() * This is a TQListBoxItem, that has a KateExternalTool. The text is the Name * of the tool. */ -class ToolItem : public QListBoxPixmap +class ToolItem : public TQListBoxPixmap { public: ToolItem( TQListBox *lb, const TQPixmap &icon, KateExternalTool *tool ) @@ -439,7 +439,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leName = new TQLineEdit( w ); lo->addWidget( leName, 1, 2 ); l = new TQLabel( leName, i18n("&Label:"), w ); - l->setAlignment( l->alignment()|Qt::AlignRight ); + l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); lo->addWidget( l, 1, 1 ); if ( tool ) leName->setText( tool->name ); TQWhatsThis::add( leName, i18n( @@ -454,7 +454,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * teCommand = new TQTextEdit( w ); lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 ); l = new TQLabel( teCommand, i18n("S&cript:"), w ); - l->setAlignment( Qt::AlignTop|Qt::AlignRight ); + l->tqsetAlignment( Qt::AlignTop|Qt::AlignRight ); lo->addWidget( l, 2, 1 ); if ( tool ) teCommand->setText( tool->command ); TQWhatsThis::add( teCommand, i18n( @@ -477,7 +477,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leExecutable = new TQLineEdit( w ); lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 ); l = new TQLabel( leExecutable, i18n("&Executable:"), w ); - l->setAlignment( l->alignment()|Qt::AlignRight ); + l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); lo->addWidget( l, 3, 1 ); if ( tool ) leExecutable->setText( tool->tryexec ); TQWhatsThis::add( leExecutable, i18n( @@ -488,7 +488,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leMimetypes = new TQLineEdit( w ); lo->addWidget( leMimetypes, 4, 2 ); l = new TQLabel( leMimetypes, i18n("&Mime types:"), w ); - l->setAlignment( l->alignment()|Qt::AlignRight ); + l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); lo->addWidget( l, 4, 1 ); if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") ); TQWhatsThis::add( leMimetypes, i18n( @@ -506,7 +506,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * cmbSave = new TQComboBox(w); lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 ); l = new TQLabel( cmbSave, i18n("&Save:"), w ); - l->setAlignment( l->alignment()|Qt::AlignRight ); + l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); lo->addWidget( l, 5, 1 ); TQStringList sl; sl << i18n("None") << i18n("Current Document") << i18n("All Documents"); @@ -521,7 +521,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leCmdLine = new TQLineEdit( w ); lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 ); l = new TQLabel( leCmdLine, i18n("&Command line name:"), w ); - l->setAlignment( l->alignment()|Qt::AlignRight ); + l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); lo->addWidget( l, 6, 1 ); if ( tool ) leCmdLine->setText( tool->cmdname ); TQWhatsThis::add( leCmdLine, i18n( @@ -745,7 +745,7 @@ void KateExternalToolsConfigWidget::slotNew() // This is sticky, it does not change again, so that shortcuts sticks // TODO check for dups - t->acname = "externaltool_" + TQString(t->name).replace( TQRegExp("\\W+"), "" ); + t->acname = "externaltool_" + TQString(t->name).tqreplace( TQRegExp("\\W+"), "" ); new ToolItem ( lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon( t->icon ), t ); diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp index 47c8aa75b..11561e5fd 100644 --- a/kate/app/katefilelist.cpp +++ b/kate/app/katefilelist.cpp @@ -51,7 +51,7 @@ //END Includes //BEGIN ToolTip -class ToolTip : public QToolTip +class ToolTip : public TQToolTip { public: ToolTip( TQWidget *parent, KateFileList *lv ) @@ -69,7 +69,7 @@ class ToolTip : public QToolTip KateFileListItem *item = ((KateFileListItem*)i); if ( ! item ) return; - tip( m_listView->itemRect( i ), m_listView->tooltip( item, 0 ) ); + tip( m_listView->tqitemRect( i ), m_listView->tooltip( item, 0 ) ); } @@ -94,7 +94,7 @@ KateFileList::KateFileList (KateMainWindow *main, m_editShade = TQColor( 255, 102, 153 ); m_enableBgShading = false; - setFocusPolicy ( TQWidget::NoFocus ); + setFocusPolicy ( TQ_NoFocus ); viewManager = _viewManager; @@ -134,14 +134,14 @@ KateFileList::~KateFileList () void KateFileList::setupActions () { - windowNext = KStdAction::back(this, TQT_SLOT(slotPrevDocument()), m_main->actionCollection()); - windowPrev = KStdAction::forward(this, TQT_SLOT(slotNextDocument()), m_main->actionCollection()); + windowNext = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotPrevDocument()), m_main->actionCollection()); + windowPrev = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotNextDocument()), m_main->actionCollection()); sortAction = new KSelectAction( i18n("Sort &By"), 0, m_main->actionCollection(), "filelist_sortby" ); TQStringList l; l << i18n("Opening Order") << i18n("Document Name") << i18n("URL"); sortAction->setItems( l ); - connect( sortAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setSortType(int)) ); + connect( sortAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setSortType(int)) ); } void KateFileList::updateActions () @@ -273,11 +273,11 @@ void KateFileList::slotModChanged (Kate::Document *doc) for ( uint i=0; i < m_editHistory.count(); i++ ) { m_editHistory.at( i )->setEditHistPos( i+1 ); - repaintItem( m_editHistory.at( i ) ); + tqrepaintItem( m_editHistory.at( i ) ); } } else - repaintItem( item ); + tqrepaintItem( item ); } void KateFileList::slotModifiedOnDisc (Kate::Document *doc, bool, unsigned char) @@ -296,7 +296,7 @@ void KateFileList::slotNameChanged (Kate::Document *doc) if ( ((KateFileListItem*)item)->document() == doc ) { item->setText( 0, doc->docName() ); - repaintItem( item ); + tqrepaintItem( item ); break; } item = item->nextSibling(); @@ -334,7 +334,7 @@ void KateFileList::slotViewChanged () // int p = 0; // if ( m_viewHistory.count() ) // { -// int p = m_viewHistory.findRef( item ); // only repaint items that needs it +// int p = m_viewHistory.findRef( item ); // only tqrepaint items that needs it // } m_viewHistory.removeRef( item ); @@ -343,7 +343,7 @@ void KateFileList::slotViewChanged () for ( uint i=0; i < m_viewHistory.count(); i++ ) { m_viewHistory.at( i )->setViewHistPos( i+1 ); - repaintItem( m_viewHistory.at( i ) ); + tqrepaintItem( m_viewHistory.at( i ) ); } } @@ -616,7 +616,7 @@ void KFLConfigPage::apply() m_filelist->m_editShade = kcbEditShade->color(); m_filelist->m_enableBgShading = cbEnableShading->isChecked(); m_filelist->setSortType( cmbSort->currentItem() ); - // repaint the affected items + // tqrepaint the affected items m_filelist->triggerUpdate(); } diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h index e90281558..176898c4d 100644 --- a/kate/app/katefilelist.h +++ b/kate/app/katefilelist.h @@ -38,7 +38,7 @@ class KateMainWindow; class KAction; class KSelectAction; -class KateFileListItem : public QListViewItem +class KateFileListItem : public TQListViewItem { public: KateFileListItem( TQListView *lv, diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp index 5ab42a289..fb1a3187b 100644 --- a/kate/app/katefileselector.cpp +++ b/kate/app/katefileselector.cpp @@ -67,7 +67,7 @@ //BEGIN Toolbar // from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors) -static void silenceQToolBar(QtMsgType, const char *){} +static void silenceQToolBar(TQtMsgType, const char *){} // helper classes to be able to have a toolbar without move handle KateFileSelectorToolBar::KateFileSelectorToolBar(TQWidget *parent) @@ -96,7 +96,7 @@ void KateFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) { if (m_tb) { - setMinimumHeight(m_tb->sizeHint().height()); + setMinimumHeight(m_tb->tqsizeHint().height()); m_tb->resize(width(),height()); } } @@ -113,17 +113,17 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, { mActionCollection = new KActionCollection( this ); - QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar ); + TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar ); KateFileSelectorToolBarParent *tbp=new KateFileSelectorToolBarParent(this); toolbar = new KateFileSelectorToolBar(tbp); tbp->setToolBar(toolbar); toolbar->setMovingEnabled(false); toolbar->setFlat(true); - qInstallMsgHandler( oldHandler ); + tqInstallMsgHandler( oldHandler ); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion); cmbPath->setCompletionObject( cmpl ); cmbPath->setAutoDeleteCompletionObject( true ); @@ -157,7 +157,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, btnFilter->setIconSet( SmallIconSet("filter" ) ); btnFilter->setToggleButton( true ); filter = new KHistoryCombo( true, filterBox, "filter"); - filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) ); @@ -168,7 +168,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, // kaction for the dir sync method acSyncDir = new KAction( i18n("Current Document Folder"), "curfiledir", 0, - this, TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); + TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); toolbar->setIconText( KToolBar::IconOnly ); toolbar->setIconSize( 16 ); toolbar->setEnableContextMenu( false ); @@ -354,7 +354,7 @@ void KateFileSelector::setDir( KURL u ) newurl.setPath(pathstr); if ( !kateFileSelectorIsReadable ( newurl ) ) - newurl.cd(TQString::fromLatin1("..")); + newurl.cd(TQString::tqfromLatin1("..")); if ( !kateFileSelectorIsReadable (newurl) ) newurl.setPath( TQDir::homeDirPath() ); @@ -486,7 +486,7 @@ bool KateFileSelector::eventFilter( TQObject* o, TQEvent *e ) And the popup is rather useless, if the paths are only partly visible. */ TQListBox *lb = cmbPath->listBox(); - if ( o == lb && e->type() == TQEvent::Show ) { + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lb) && e->type() == TQEvent::Show ) { int add = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0; int w = QMIN( mainwin->width(), lb->contentsWidth() + add ); lb->resize( w, lb->height() ); @@ -692,13 +692,13 @@ void KFSConfigPage::init() KAction *ac; TQListBox *lb; for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) { - lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox(); + lb = l.tqcontains( *it ) ? acSel->selectedListBox() : acSel->availableListBox(); if ( *it == "bookmarks" || *it == "sync_dir" ) ac = fileSelector->actionCollection()->action( (*it).latin1() ); else ac = fileSelector->dirOperator()->actionCollection()->action( (*it).latin1() ); if ( ac ) - new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().replace( re, "" ), *it ); + new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().tqreplace( re, "" ), *it ); } // sync diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h index 442d3101e..285418d64 100644 --- a/kate/app/katefileselector.h +++ b/kate/app/katefileselector.h @@ -56,7 +56,7 @@ public: virtual void setMovingEnabled( bool b ); }; -class KateFileSelectorToolBarParent: public QFrame +class KateFileSelectorToolBarParent: public TQFrame { Q_OBJECT public: @@ -69,7 +69,7 @@ protected: virtual void resizeEvent ( TQResizeEvent * ); }; -class KateFileSelector : public QVBox +class KateFileSelector : public TQVBox { Q_OBJECT diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp index 409bfd0a1..7d8cfd951 100644 --- a/kate/app/kategrepdialog.cpp +++ b/kate/app/kategrepdialog.cpp @@ -100,8 +100,8 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) loInput->setColStretch(1, 20); TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this); - lPattern->setFixedSize(lPattern->sizeHint()); - loInput->addWidget(lPattern, 0, 0, AlignRight | AlignVCenter); + lPattern->setFixedSize(lPattern->tqsizeHint()); + loInput->addWidget(lPattern, 0, 0, Qt::AlignRight | Qt::AlignVCenter); TQBoxLayout *loPattern = new TQHBoxLayout( 4 ); loInput->addLayout( loPattern, 0, 1 ); @@ -112,23 +112,23 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) cmbPattern->setInsertionPolicy(TQComboBox::NoInsertion); lPattern->setBuddy(cmbPattern); cmbPattern->setFocus(); - cmbPattern->setMinimumSize(cmbPattern->sizeHint()); + cmbPattern->setMinimumSize(cmbPattern->tqsizeHint()); loPattern->addWidget( cmbPattern ); cbCasesensitive = new TQCheckBox(i18n("Case sensitive"), this); - cbCasesensitive->setMinimumWidth(cbCasesensitive->sizeHint().width()); + cbCasesensitive->setMinimumWidth(cbCasesensitive->tqsizeHint().width()); cbCasesensitive->setChecked(config->readBoolEntry("CaseSensitive", true)); loPattern->addWidget(cbCasesensitive); cbRegex = new TQCheckBox( i18n("Regular expression"), this ); - cbRegex->setMinimumWidth( cbRegex->sizeHint().width() ); + cbRegex->setMinimumWidth( cbRegex->tqsizeHint().width() ); cbRegex->setChecked( config->readBoolEntry( "Regex", true ) ); loPattern->addWidget( cbRegex ); loPattern->setStretchFactor( cmbPattern, 100 ); TQLabel *lTemplate = new TQLabel(i18n("Template:"), this); - lTemplate->setFixedSize(lTemplate->sizeHint()); - loInput->addWidget(lTemplate, 1, 0, AlignRight | AlignVCenter); + lTemplate->setFixedSize(lTemplate->tqsizeHint()); + loInput->addWidget(lTemplate, 1, 0, Qt::AlignRight | Qt::AlignVCenter); TQBoxLayout *loTemplate = new TQHBoxLayout(4); loInput->addLayout(loTemplate, 1, 1); @@ -136,7 +136,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) leTemplate = new KLineEdit(this); lTemplate->setBuddy(leTemplate); leTemplate->setText(strTemplate[0]); - leTemplate->setMinimumSize(leTemplate->sizeHint()); + leTemplate->setMinimumSize(leTemplate->tqsizeHint()); loTemplate->addWidget(leTemplate); KComboBox *cmbTemplate = new KComboBox(false, this); @@ -146,20 +146,20 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) loTemplate->addWidget(cmbTemplate); TQLabel *lFiles = new TQLabel(i18n("Files:"), this); - lFiles->setFixedSize(lFiles->sizeHint()); - loInput->addWidget(lFiles, 2, 0, AlignRight | AlignVCenter); + lFiles->setFixedSize(lFiles->tqsizeHint()); + loInput->addWidget(lFiles, 2, 0, Qt::AlignRight | Qt::AlignVCenter); cmbFiles = new KComboBox(true, this); - lFiles->setBuddy(cmbFiles->focusProxy()); - cmbFiles->setMinimumSize(cmbFiles->sizeHint()); + lFiles->setBuddy(TQT_TQWIDGET(cmbFiles->focusProxy())); + cmbFiles->setMinimumSize(cmbFiles->tqsizeHint()); cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion); cmbFiles->setDuplicatesEnabled(false); cmbFiles->insertStringList(lastSearchFiles); loInput->addWidget(cmbFiles, 2, 1); TQLabel *lDir = new TQLabel(i18n("Folder:"), this); - lDir->setFixedSize(lDir->sizeHint()); - loInput->addWidget(lDir, 3, 0, AlignRight | AlignVCenter); + lDir->setFixedSize(lDir->tqsizeHint()); + loInput->addWidget(lDir, 3, 0, Qt::AlignRight | Qt::AlignVCenter); TQBoxLayout *loDir = new TQHBoxLayout(3); loInput->addLayout(loDir, 3, 1); @@ -176,7 +176,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) lDir->setBuddy(cmbDir); cbRecursive = new TQCheckBox(i18n("Recursive"), this); - cbRecursive->setMinimumWidth(cbRecursive->sizeHint().width()); + cbRecursive->setMinimumWidth(cbRecursive->tqsizeHint().width()); cbRecursive->setChecked(config->readBoolEntry("Recursive", true)); loDir->addWidget(cbRecursive); @@ -286,11 +286,11 @@ void GrepTool::itemSelected(const TQString& item) TQString filename, linenumber; TQString str = item; - if ( (pos = str.find(':')) != -1) + if ( (pos = str.tqfind(':')) != -1) { filename = str.left(pos); str = str.mid(pos+1); - if ( (pos = str.find(':')) != -1) + if ( (pos = str.tqfind(':')) != -1) { filename = m_workingDir + TQDir::separator() + filename; linenumber = str.left(pos); @@ -302,7 +302,7 @@ void GrepTool::itemSelected(const TQString& item) void GrepTool::processOutput() { int pos; - while ( (pos = buf.find('\n')) != -1) + while ( (pos = buf.tqfind('\n')) != -1) { TQString item = buf.mid(2,pos-2); if (!item.isEmpty()) @@ -329,7 +329,7 @@ void GrepTool::slotSearch() return; } - if ( ! leTemplate->text().contains("%s") ) + if ( ! leTemplate->text().tqcontains("%s") ) { leTemplate->setFocus(); return; @@ -347,9 +347,9 @@ void GrepTool::slotSearch() TQString s = cmbPattern->currentText(); if ( ! cbRegex->isChecked() ) - s.replace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" ); + s.tqreplace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" ); TQString pattern = leTemplate->text(); - pattern.replace( "%s", s ); + pattern.tqreplace( "%s", s ); childproc = new KProcess(); childproc->setWorkingDirectory( m_workingDir ); @@ -476,7 +476,7 @@ void GrepTool::childExited() if ( ! errbuf.isEmpty() ) { - KMessageBox::information( parentWidget(), i18n("Error:

") + errbuf, i18n("Grep Tool Error") ); + KMessageBox::information( tqparentWidget(), i18n("Error:

") + errbuf, i18n("Grep Tool Error") ); errbuf.truncate(0); } else diff --git a/kate/app/kategrepdialog.h b/kate/app/kategrepdialog.h index e5462a274..525d6b7f1 100644 --- a/kate/app/kategrepdialog.h +++ b/kate/app/kategrepdialog.h @@ -35,7 +35,7 @@ class KConfig; class KURLRequester; class TQEvent; -class GrepTool : public QWidget +class GrepTool : public TQWidget { Q_OBJECT diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp index 79a1e19c6..52bf1f243 100644 --- a/kate/app/katemailfilesdialog.cpp +++ b/kate/app/katemailfilesdialog.cpp @@ -78,7 +78,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow *mainwin ) } list->hide(); connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) ); - mw->setMinimumSize( lInfo->sizeHint() ); + mw->setMinimumSize( lInfo->tqsizeHint() ); } TQPtrList KateMailDialog::selectedDocs() @@ -105,8 +105,8 @@ void KateMailDialog::slotShowButton() lInfo->setText( i18n("Press Mail... to send selected documents") ); } - mw->setMinimumSize( TQSize( lInfo->sizeHint().width(), mw->sizeHint().height()) ); - setMinimumSize( calculateSize( mw->minimumSize().width(), mw->sizeHint().height() ) ); + mw->setMinimumSize( TQSize( lInfo->tqsizeHint().width(), mw->tqsizeHint().height()) ); + setMinimumSize( calculateSize( mw->tqminimumSize().width(), mw->tqsizeHint().height() ) ); resize( width(), minimumHeight() ); } #include "katemailfilesdialog.moc" diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index dea2b0fae..bb6d26f5a 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -87,7 +87,7 @@ uint KateMainWindow::uniqueID = 1; KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup) - : KateMDI::MainWindow (0,(TQString("__KateMainWindow#%1").arg(uniqueID)).latin1()) + : KateMDI::MainWindow (0,(TQString(TQString("__KateMainWindow#%1").arg(uniqueID))).latin1()) { // first the very important id myID = uniqueID; @@ -101,7 +101,7 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup) // here we go, set some usable default sizes if (!initialGeometrySet()) { - int scnum = TQApplication::desktop()->screenNumber(parentWidget()); + int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); TQSize size; @@ -110,8 +110,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup) if (sconfig) { sconfig->setGroup (sgroup); - size.setWidth (sconfig->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 )); - size.setHeight (sconfig->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 )); + size.setWidth (sconfig->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 )); + size.setHeight (sconfig->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 )); } // if thats fails, try to reuse size @@ -131,8 +131,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup) { // first try global app config KateApp::self()->config()->setGroup ("MainWindow"); - size.setWidth (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 )); - size.setHeight (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 )); + size.setWidth (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 )); + size.setHeight (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 )); if (size.isEmpty()) size = TQSize (kMin (700, desk.width()), kMin(480, desk.height())); @@ -239,25 +239,25 @@ void KateMainWindow::setupActions() { KAction *a; - KStdAction::openNew( m_viewManager, TQT_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document")); - KStdAction::open( m_viewManager, TQT_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing")); + KStdAction::openNew( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document")); + KStdAction::open( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing")); - fileOpenRecent = KStdAction::openRecent (m_viewManager, TQT_SLOT(openURL (const KURL&)), actionCollection()); + fileOpenRecent = KStdAction::openRecent (TQT_TQOBJECT(m_viewManager), TQT_SLOT(openURL (const KURL&)), actionCollection()); fileOpenRecent->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again.")); a=new KAction( i18n("Save A&ll"),"save_all", CTRL+Key_L, KateDocManager::self(), TQT_SLOT( saveAll() ), actionCollection(), "file_save_all" ); a->setWhatsThis(i18n("Save all open, modified documents to disk.")); - KStdAction::close( m_viewManager, TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document.")); + KStdAction::close( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document.")); - a=new KAction( i18n( "Clos&e All" ), 0, this, TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" ); + a=new KAction( i18n( "Clos&e All" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" ); a->setWhatsThis(i18n("Close all open documents.")); - KStdAction::mail( this, TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments.")); + KStdAction::mail( TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments.")); - KStdAction::quit( this, TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window")); + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window")); - a=new KAction(i18n("&New Window"), "window_new", 0, this, TQT_SLOT(newWindow()), actionCollection(), "view_new_view"); + a=new KAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection(), "view_new_view"); a->setWhatsThis(i18n("Create a new Kate view (a new window with the same document list).")); if ( KateApp::self()->authorize("shell_access") ) @@ -274,39 +274,39 @@ void KateMainWindow::setupActions() connect(documentOpenWith->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(mSlotFixOpenWithMenu())); connect(documentOpenWith->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenWithMenuAction(int))); - a=KStdAction::keyBindings(this, TQT_SLOT(editKeys()), actionCollection()); + a=KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editKeys()), actionCollection()); a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments.")); - a=KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection()); + a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s).")); - KAction* settingsConfigure = KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure"); + KAction* settingsConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure"); settingsConfigure->setWhatsThis(i18n("Configure various aspects of this application and the editing component.")); // pipe to terminal action if (KateApp::self()->authorize("shell_access")) - new KAction(i18n("&Pipe to Console"), "pipe", 0, console, TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal"); + new KAction(i18n("&Pipe to Console"), "pipe", 0, TQT_TQOBJECT(console), TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal"); // tip of the day :-) - KStdAction::tipOfDay( this, TQT_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); + KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); if (KatePluginManager::self()->pluginList().count() > 0) { - a=new KAction(i18n("&Plugins Handbook"), 0, this, TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents"); + a=new KAction(i18n("&Plugins Handbook"), 0, TQT_TQOBJECT(this), TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents"); a->setWhatsThis(i18n("This shows help files for various available plugins.")); } - connect(m_viewManager,TQT_SIGNAL(viewChanged()),this,TQT_SLOT(slotWindowActivated())); - connect(m_viewManager,TQT_SIGNAL(viewChanged()),this,TQT_SLOT(slotUpdateOpenWith())); + connect(m_viewManager,TQT_SIGNAL(viewChanged()),TQT_TQOBJECT(this),TQT_SLOT(slotWindowActivated())); + connect(m_viewManager,TQT_SIGNAL(viewChanged()),TQT_TQOBJECT(this),TQT_SLOT(slotUpdateOpenWith())); slotWindowActivated (); // session actions - new KAction(i18n("Menu entry Session->New", "&New"), "filenew", 0, KateSessionManager::self(), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new"); - new KAction(i18n("&Open..."), "fileopen", 0, KateSessionManager::self(), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open"); - new KAction(i18n("&Save"), "filesave", 0, KateSessionManager::self(), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save"); - new KAction(i18n("Save &As..."), "filesaveas", 0, KateSessionManager::self(), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as"); - new KAction(i18n("&Manage..."), "view_choose", 0, KateSessionManager::self(), TQT_SLOT(sessionManage()), actionCollection(), "sessions_manage"); + new KAction(i18n("Menu entry Session->New", "&New"), "filenew", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new"); + new KAction(i18n("&Open..."), "fileopen", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open"); + new KAction(i18n("&Save"), "filesave", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save"); + new KAction(i18n("Save &As..."), "filesaveas", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as"); + new KAction(i18n("&Manage..."), "view_choose", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionManage()), actionCollection(), "sessions_manage"); // quick open menu ;) new KateSessionsAction (i18n("&Quick Open"), actionCollection(), "sessions_list"); diff --git a/kate/app/katemainwindowiface.cpp b/kate/app/katemainwindowiface.cpp index c966cb71e..af3c74ed2 100644 --- a/kate/app/katemainwindowiface.cpp +++ b/kate/app/katemainwindowiface.cpp @@ -22,6 +22,6 @@ #include -KateMainWindowDCOPIface::KateMainWindowDCOPIface (KateMainWindow *w) : DCOPObject ((TQString("KateMainWindow#%1").arg(w->mainWindowNumber())).latin1()), m_w (w) +KateMainWindowDCOPIface::KateMainWindowDCOPIface (KateMainWindow *w) : DCOPObject (TQString(TQString("KateMainWindow#%1").arg(w->mainWindowNumber())).latin1()), m_w (w) { } diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index 9d73e762c..9dcb5769d 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -128,7 +128,7 @@ GUIClient::GUIClient ( MainWindow *mw ) if ( domDocument().documentElement().isNull() ) { - TQString completeDescription = TQString::fromLatin1( guiDescription ) + TQString completeDescription = TQString::tqfromLatin1( guiDescription ) .arg( actionListName ); setXML( completeDescription, false /*merge*/ ); @@ -176,7 +176,7 @@ void GUIClient::registerToolView (ToolView *tv) KToggleAction *a = new ToggleToolViewAction(i18n("Show %1").arg(tv->text), sc,tv, actionCollection(), aname.latin1() ); - a->setCheckedState(i18n("Hide %1").arg(tv->text)); + a->setCheckedState(TQString(i18n("Hide %1").arg(tv->text))); m_toolViewActions.append(a); m_toolMenu->insert(a); @@ -256,8 +256,8 @@ bool ToolView::visible () const void ToolView::childEvent ( TQChildEvent *ev ) { // set the widget to be focus proxy if possible - if (ev->inserted() && ev->child() && ev->child()->qt_cast("TQWidget")) - setFocusProxy ((TQWidget *)(ev->child()->qt_cast("TQWidget"))); + if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqqt_cast("TQWidget")) + setFocusProxy ((TQWidget *)(TQT_TQOBJECT(ev->child())->tqqt_cast("TQWidget"))); TQVBox::childEvent (ev); } @@ -339,7 +339,7 @@ ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolVi bool Sidebar::removeWidget (ToolView *widget) { - if (!m_widgetToId.contains(widget)) + if (!m_widgetToId.tqcontains(widget)) return false; removeTab(m_widgetToId[widget]); @@ -369,7 +369,7 @@ bool Sidebar::removeWidget (ToolView *widget) bool Sidebar::showWidget (ToolView *widget) { - if (!m_widgetToId.contains(widget)) + if (!m_widgetToId.tqcontains(widget)) return false; // hide other non-persistent views @@ -394,7 +394,7 @@ bool Sidebar::showWidget (ToolView *widget) bool Sidebar::hideWidget (ToolView *widget) { - if (!m_widgetToId.contains(widget)) + if (!m_widgetToId.tqcontains(widget)) return false; bool anyVis = false; @@ -659,8 +659,8 @@ void Sidebar::saveSession (KConfig *config) //BEGIN MAIN WINDOW -MainWindow::MainWindow (TQWidget* parentWidget, const char* name) - : KParts::MainWindow( parentWidget, name) +MainWindow::MainWindow (TQWidget* tqparentWidget, const char* name) + : KParts::MainWindow( tqparentWidget, name) , m_sidebarsVisible(true) , m_restoreConfig (0) , m_guiClient (new GUIClient (this)) diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h index 1b13c30a8..a4baf6b16 100644 --- a/kate/app/katemdi.h +++ b/kate/app/katemdi.h @@ -38,7 +38,7 @@ namespace KateMDI { /** This class is needed because TQSplitter cant return an index for a widget. */ -class Splitter : public QSplitter +class Splitter : public TQSplitter { Q_OBJECT @@ -99,7 +99,7 @@ class GUIClient : public TQObject, public KXMLGUIClient KActionMenu *m_toolMenu; }; -class ToolView : public QVBox +class ToolView : public TQVBox { Q_OBJECT @@ -258,7 +258,7 @@ class MainWindow : public KParts::MainWindow /** * Constructor */ - MainWindow (TQWidget* parentWidget = 0, const char* name = 0); + MainWindow (TQWidget* tqparentWidget = 0, const char* name = 0); /** * Destructor diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp index 5199a6925..42d2089c3 100644 --- a/kate/app/katemwmodonhddialog.cpp +++ b/kate/app/katemwmodonhddialog.cpp @@ -40,7 +40,7 @@ #include #include -class KateDocItem : public QCheckListItem +class KateDocItem : public TQCheckListItem { public: KateDocItem( Kate::Document *doc, const TQString &status, KListView *lv ) diff --git a/kate/app/katepluginmanager.h b/kate/app/katepluginmanager.h index 568b3bbd1..1617c5501 100644 --- a/kate/app/katepluginmanager.h +++ b/kate/app/katepluginmanager.h @@ -41,7 +41,7 @@ class KatePluginInfo typedef TQValueList KatePluginList; -class KatePluginManager : public QObject +class KatePluginManager : public TQObject { Q_OBJECT diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp index fd0e059f9..a62924b92 100644 --- a/kate/app/katesession.cpp +++ b/kate/app/katesession.cpp @@ -596,7 +596,7 @@ void KateSessionManager::sessionManage () //BEGIN CHOOSER DIALOG -class KateSessionChooserItem : public QListViewItem +class KateSessionChooserItem : public TQListViewItem { public: KateSessionChooserItem (KListView *lv, KateSession::Ptr s) diff --git a/kate/app/katesession.h b/kate/app/katesession.h index a670bb006..412207b28 100644 --- a/kate/app/katesession.h +++ b/kate/app/katesession.h @@ -160,7 +160,7 @@ class KateSession : public KShared typedef TQValueList KateSessionList; -class KateSessionManager : public QObject +class KateSessionManager : public TQObject { Q_OBJECT diff --git a/kate/app/katetabwidget.cpp b/kate/app/katetabwidget.cpp index 4b278e327..13a099730 100644 --- a/kate/app/katetabwidget.cpp +++ b/kate/app/katetabwidget.cpp @@ -70,7 +70,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQString & label, int in KTabWidget::insertTab(child,label,index); showPage(child); maybeShow(); - tabBar()->repaint(); + tabBar()->tqrepaint(); } void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index ) @@ -78,7 +78,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, con KTabWidget::insertTab(child,iconset,label,index); showPage(child); maybeShow(); - tabBar()->repaint(); + tabBar()->tqrepaint(); } void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) @@ -86,7 +86,7 @@ void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) KTabWidget::insertTab(child,tab,index); showPage(child); maybeShow(); - tabBar()->repaint(); + tabBar()->tqrepaint(); } void KateTabWidget::removePage ( TQWidget * w ) @@ -132,18 +132,18 @@ void KateTabWidget::setCornerWidgetVisibility(bool visible) { // there are two corner widgets: on TopLeft and on TopTight! - if (cornerWidget(Qt::TopLeft) ) { + if (cornerWidget(TQt::TopLeft) ) { if (visible) - cornerWidget(Qt::TopLeft)->show(); + cornerWidget(TQt::TopLeft)->show(); else - cornerWidget(Qt::TopLeft)->hide(); + cornerWidget(TQt::TopLeft)->hide(); } - if (cornerWidget(Qt::TopRight) ) { + if (cornerWidget(TQt::TopRight) ) { if (visible) - cornerWidget(Qt::TopRight)->show(); + cornerWidget(TQt::TopRight)->show(); else - cornerWidget(Qt::TopRight)->hide(); + cornerWidget(TQt::TopRight)->hide(); } } diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp index c62e6e082..0789f0502 100644 --- a/kate/app/kateviewmanager.cpp +++ b/kate/app/kateviewmanager.cpp @@ -94,47 +94,47 @@ void KateViewManager::setupActions () /** * tabbing */ - a=new KAction ( i18n("New Tab"),"tab_new", 0, this, TQT_SLOT(slotNewTab()), + a=new KAction ( i18n("New Tab"),"tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTab()), m_mainWindow->actionCollection(), "view_new_tab" ); - m_closeTab = new KAction ( i18n("Close Current Tab"),"tab_remove",0,this,TQT_SLOT(slotCloseTab()), + m_closeTab = new KAction ( i18n("Close Current Tab"),"tab_remove",0,TQT_TQOBJECT(this),TQT_SLOT(slotCloseTab()), m_mainWindow->actionCollection(),"view_close_tab"); m_activateNextTab = new KAction( i18n( "Activate Next Tab" ), TQApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(), - this, TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" ); + TQT_TQOBJECT(this), TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" ); m_activatePrevTab = new KAction( i18n( "Activate Previous Tab" ), TQApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(), - this, TQT_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" ); + TQT_TQOBJECT(this), TQT_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" ); /** * view splitting */ - a=new KAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, this, TQT_SLOT( + a=new KAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewSpaceVert() ), m_mainWindow->actionCollection(), "view_split_vert"); a->setWhatsThis(i18n("Split the currently active view vertically into two views.")); - a=new KAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, this, TQT_SLOT( + a=new KAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewSpaceHoriz() ), m_mainWindow->actionCollection(), "view_split_horiz"); a->setWhatsThis(i18n("Split the currently active view horizontally into two views.")); - m_closeView = new KAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, this, + m_closeView = new KAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), TQT_SLOT( slotCloseCurrentViewSpace() ), m_mainWindow->actionCollection(), "view_close_current_space" ); m_closeView->setWhatsThis(i18n("Close the currently active splitted view")); - goNext=new KAction(i18n("Next View"),Key_F8,this, + goNext=new KAction(i18n("Next View"),Key_F8,TQT_TQOBJECT(this), TQT_SLOT(activateNextView()),m_mainWindow->actionCollection(),"go_next"); goNext->setWhatsThis(i18n("Make the next split view the active one.")); - goPrev=new KAction(i18n("Previous View"),SHIFT+Key_F8, this, TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev"); + goPrev=new KAction(i18n("Previous View"),SHIFT+Key_F8, TQT_TQOBJECT(this), TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev"); goPrev->setWhatsThis(i18n("Make the previous split view the active one.")); @@ -168,7 +168,7 @@ void KateViewManager::updateViewSpaceActions () } void KateViewManager::tabChanged(TQWidget* widget) { - KateViewSpaceContainer *container=static_cast(widget->qt_cast("KateViewSpaceContainer")); + KateViewSpaceContainer *container=static_cast(widget->tqqt_cast("KateViewSpaceContainer")); Q_ASSERT(container); m_currentContainer=container; @@ -215,7 +215,7 @@ void KateViewManager::slotCloseTab() if (m_viewSpaceContainerList.count() <= 1) return; if (!m_currentContainer) return; - int pos = m_viewSpaceContainerList.find (m_currentContainer); + int pos = m_viewSpaceContainerList.tqfind (m_currentContainer); if (pos == -1) return; diff --git a/kate/app/kateviewmanager.h b/kate/app/kateviewmanager.h index ddc796a4c..6bf1b5f77 100644 --- a/kate/app/kateviewmanager.h +++ b/kate/app/kateviewmanager.h @@ -36,7 +36,7 @@ class KAction; class TQToolButton; -class KateViewManager : public QObject +class KateViewManager : public TQObject { Q_OBJECT diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp index 43a73a2b6..bdb4e22e4 100644 --- a/kate/app/kateviewspace.cpp +++ b/kate/app/kateviewspace.cpp @@ -67,9 +67,9 @@ protected: void paintEvent( TQPaintEvent *e ) { TQPainter p( this ); - p.setPen( colorGroup().shadow() ); + p.setPen( tqcolorGroup().shadow() ); p.drawLine( e->rect().left(), 0, e->rect().right(), 0 ); - p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? colorGroup().light() : colorGroup().midlight() ); + p.setPen( ((KateViewSpace*)tqparentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().midlight() ); p.drawLine( e->rect().left(), 1, e->rect().right(), 1 ); } }; @@ -228,7 +228,7 @@ bool KateViewSpace::event( TQEvent *e ) void KateViewSpace::slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg) { - if ((TQWidgetStack *)view->parentWidget() != stack) + if ((TQWidgetStack *)view->tqparentWidget() != stack) return; mStatusBar->setStatus( r, c, ovr, block, mod, msg ); } @@ -309,29 +309,29 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name ) { m_lineColLabel = new TQLabel( this ); addWidget( m_lineColLabel, 0, false ); - m_lineColLabel->setAlignment( Qt::AlignCenter ); + m_lineColLabel->tqsetAlignment( Qt::AlignCenter ); m_lineColLabel->installEventFilter( this ); m_modifiedLabel = new TQLabel( TQString(" "), this ); addWidget( m_modifiedLabel, 0, false ); - m_modifiedLabel->setAlignment( Qt::AlignCenter ); + m_modifiedLabel->tqsetAlignment( Qt::AlignCenter ); m_modifiedLabel->installEventFilter( this ); m_insertModeLabel = new TQLabel( i18n(" INS "), this ); addWidget( m_insertModeLabel, 0, false ); - m_insertModeLabel->setAlignment( Qt::AlignCenter ); + m_insertModeLabel->tqsetAlignment( Qt::AlignCenter ); m_insertModeLabel->installEventFilter( this ); m_selectModeLabel = new TQLabel( i18n(" NORM "), this ); addWidget( m_selectModeLabel, 0, false ); - m_selectModeLabel->setAlignment( Qt::AlignCenter ); + m_selectModeLabel->tqsetAlignment( Qt::AlignCenter ); m_selectModeLabel->installEventFilter( this ); m_fileNameLabel=new KSqueezedTextLabel( this ); addWidget( m_fileNameLabel, 1, true ); m_fileNameLabel->setMinimumSize( 0, 0 ); - m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); - m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft ); + m_fileNameLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); + m_fileNameLabel->tqsetAlignment( /*Qt::AlignRight*/Qt::AlignLeft ); m_fileNameLabel->installEventFilter( this ); installEventFilter( this ); @@ -396,7 +396,7 @@ void KateVSStatusBar::modifiedChanged() void KateVSStatusBar::showMenu() { - KMainWindow* mainWindow = static_cast( topLevelWidget() ); + KMainWindow* mainWindow = static_cast( tqtopLevelWidget() ); TQPopupMenu* menu = static_cast( mainWindow->factory()->container("viewspace_popup", mainWindow ) ); if (menu) @@ -410,7 +410,7 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e) if ( m_viewSpace->currentView() ) m_viewSpace->currentView()->setFocus(); - if ( ((TQMouseEvent*)e)->button()==RightButton) + if ( ((TQMouseEvent*)e)->button()==Qt::RightButton) showMenu(); return true; diff --git a/kate/app/kateviewspace.h b/kate/app/kateviewspace.h index b6a5a185e..2c82332d3 100644 --- a/kate/app/kateviewspace.h +++ b/kate/app/kateviewspace.h @@ -68,7 +68,7 @@ class KateVSStatusBar : public KStatusBar class KateViewSpace *m_viewSpace; }; -class KateViewSpace : public QVBox +class KateViewSpace : public TQVBox { friend class KateViewSpaceContainer; friend class KateVSStatusBar; diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp index 1e05e8b5a..98513a222 100644 --- a/kate/app/kateviewspacecontainer.cpp +++ b/kate/app/kateviewspacecontainer.cpp @@ -141,7 +141,7 @@ bool KateViewSpaceContainer::deleteView (Kate::View *view, bool delViewSpace) { if (!view) return true; - KateViewSpace *viewspace = (KateViewSpace *)view->parentWidget()->parentWidget(); + KateViewSpace *viewspace = (KateViewSpace *)view->tqparentWidget()->tqparentWidget(); viewspace->removeView (view); @@ -241,7 +241,7 @@ void KateViewSpaceContainer::activateSpace (Kate::View* v) { if (!v) return; - KateViewSpace* vs = (KateViewSpace*)v->parentWidget()->parentWidget(); + KateViewSpace* vs = (KateViewSpace*)v->tqparentWidget()->tqparentWidget(); if (!vs->isActiveSpace()) { setActiveSpace (vs); @@ -275,7 +275,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view ) } setActiveView (view); - m_viewList.findRef (view); + m_viewList.tqfindRef (view); mainWindow()->toolBar ()->setUpdatesEnabled (false); @@ -337,7 +337,7 @@ void KateViewSpaceContainer::slotViewChanged() void KateViewSpaceContainer::activateNextView() { - uint i = m_viewSpaceList.find (activeViewSpace())+1; + uint i = m_viewSpaceList.tqfind (activeViewSpace())+1; if (i >= m_viewSpaceList.count()) i=0; @@ -348,7 +348,7 @@ void KateViewSpaceContainer::activateNextView() void KateViewSpaceContainer::activatePrevView() { - int i = m_viewSpaceList.find (activeViewSpace())-1; + int i = m_viewSpaceList.tqfind (activeViewSpace())-1; if (i < 0) i=m_viewSpaceList.count()-1; @@ -446,23 +446,23 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs, if (!activeView()) return; if (!vs) vs = activeViewSpace(); - bool isFirstTime = vs->parentWidget() == this; + bool isFirstTime = vs->tqparentWidget() == this; TQValueList psizes; if ( ! isFirstTime ) - if ( TQSplitter *ps = static_cast(vs->parentWidget()->qt_cast("TQSplitter")) ) + if ( TQSplitter *ps = static_cast(vs->tqparentWidget()->tqqt_cast("TQSplitter")) ) psizes = ps->sizes(); Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal; - KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget()); + KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->tqparentWidget()); s->setOpaqueResize( KGlobalSettings::opaqueResize() ); if (! isFirstTime) { // anders: make sure the split' viewspace is always // correctly positioned. // If viewSpace is the first child, the new splitter must be moveToFirst'd - if ( !((KateMDI::Splitter*)vs->parentWidget())->isLastChild( vs ) ) - ((KateMDI::Splitter*)s->parentWidget())->moveToFirst( s ); + if ( !((KateMDI::Splitter*)vs->tqparentWidget())->isLastChild( vs ) ) + ((KateMDI::Splitter*)s->tqparentWidget())->moveToFirst( s ); } vs->reparent( s, 0, TQPoint(), true ); KateViewSpace* vsNew = new KateViewSpace( this, s ); @@ -471,13 +471,13 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs, s->moveToFirst( vsNew ); if (!isFirstTime) - if (TQSplitter *ps = static_cast(s->parentWidget()->qt_cast("TQSplitter")) ) + if (TQSplitter *ps = static_cast(s->tqparentWidget()->tqqt_cast("TQSplitter")) ) ps->setSizes( psizes ); s->show(); TQValueList sizes; - int space = 50;//isHoriz ? s->parentWidget()->height()/2 : s->parentWidget()->width()/2; + int space = 50;//isHoriz ? s->tqparentWidget()->height()/2 : s->tqparentWidget()->width()/2; sizes << space << space; s->setSizes( sizes ); @@ -503,7 +503,7 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace) // abort if this is the last viewspace if (m_viewSpaceList.count() < 2) return; - KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->parentWidget(); + KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->tqparentWidget(); // find out if it is the first child for repositioning // see below @@ -512,16 +512,16 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace) // save some size information KateMDI::Splitter* pp=0L; TQValueList ppsizes; - if (m_viewSpaceList.count() > 2 && p->parentWidget() != this) + if (m_viewSpaceList.count() > 2 && p->tqparentWidget() != this) { - pp = (KateMDI::Splitter*)p->parentWidget(); + pp = (KateMDI::Splitter*)p->tqparentWidget(); ppsizes = pp->sizes(); pIsFirst = !pp->isLastChild( p ); // simple logic, right- } // Figure out where to put views that are still needed KateViewSpace* next; - if (m_viewSpaceList.find(viewspace) == 0) + if (m_viewSpaceList.tqfind(viewspace) == 0) next = m_viewSpaceList.next(); else next = m_viewSpaceList.prev(); @@ -550,14 +550,14 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace) m_viewSpaceList.remove( viewspace ); // reparent the other sibling of the parent. - while (p->children ()) + while (!p->childrenListObject().isEmpty()) { - TQWidget* other = ((TQWidget *)(( TQPtrList*)p->children())->first()); + TQWidget* other = ((TQWidget *)(( TQPtrList)p->childrenListObject()).first()); - other->reparent( p->parentWidget(), 0, TQPoint(), true ); + other->reparent( p->tqparentWidget(), 0, TQPoint(), true ); // We also need to find the right viewspace to become active if (pIsFirst) - ((KateMDI::Splitter*)p->parentWidget())->moveToFirst( other ); + ((KateMDI::Splitter*)p->tqparentWidget())->moveToFirst( other ); if ( other->isA("KateViewSpace") ) { setActiveSpace( (KateViewSpace*)other ); } @@ -676,20 +676,20 @@ void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx, TQStringList childList; // a katesplitter has two children, of which one may be a KateSplitter. - const TQObjectList* l = s->children(); - TQObjectListIt it( *l ); + const TQObjectList l = s->childrenListObject(); + TQObjectListIt it( l ); TQObject* obj; for (; it.current(); ++it) { obj = it.current(); TQString n; // name for child list, see below // For KateViewSpaces, ask them to save the file list. if ( obj->isA("KateViewSpace") ) { - n = TQString(viewConfGrp+"-ViewSpace %1").arg( m_viewSpaceList.find((KateViewSpace*)obj) ); - ((KateViewSpace*)obj)->saveConfig ( config, m_viewSpaceList.find((KateViewSpace*)obj), viewConfGrp); + n = TQString(viewConfGrp+"-ViewSpace %1").arg( m_viewSpaceList.tqfind((KateViewSpace*)obj) ); + ((KateViewSpace*)obj)->saveConfig ( config, m_viewSpaceList.tqfind((KateViewSpace*)obj), viewConfGrp); // save active viewspace if ( ((KateViewSpace*)obj)->isActiveSpace() ) { config->setGroup(viewConfGrp); - config->writeEntry("Active Viewspace", m_viewSpaceList.find((KateViewSpace*)obj) ); + config->writeEntry("Active Viewspace", m_viewSpaceList.tqfind((KateViewSpace*)obj) ); } } // For KateSplitters, recurse diff --git a/kate/app/kateviewspacecontainer.h b/kate/app/kateviewspacecontainer.h index 402b368d1..0c6b33246 100644 --- a/kate/app/kateviewspacecontainer.h +++ b/kate/app/kateviewspacecontainer.h @@ -32,7 +32,7 @@ class KConfig; class KateMainWindow; -class KateViewSpaceContainer: public QVBox +class KateViewSpaceContainer: public TQVBox { Q_OBJECT diff --git a/kate/app/kbookmarkhandler.cpp b/kate/app/kbookmarkhandler.cpp index 8ef055e36..bdb85130b 100644 --- a/kate/app/kbookmarkhandler.cpp +++ b/kate/app/kbookmarkhandler.cpp @@ -73,7 +73,7 @@ void KBookmarkHandler::slotNewBookmark( const TQString& /*text*/, { *m_importStream << "\n"; - *m_importStream << "" << (additionalInfo.isEmpty() ? TQString::fromUtf8(url) : additionalInfo) << "\n\n"; + *m_importStream << "" << (additionalInfo.isEmpty() ? TQString(TQString::fromUtf8(url)) : additionalInfo) << "\n\n"; } void KBookmarkHandler::slotNewFolder( const TQString& text, bool /*open*/, diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index efb71b767..5494b4149 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -107,12 +107,12 @@ KWrite::KWrite (KTextEditor::Document *doc) guiFactory()->addClient( m_view ); // install a working kate part popup dialog thingy - if (static_cast(m_view->qt_cast("Kate::View"))) - static_cast(m_view->qt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) ); + if (static_cast(m_view->tqqt_cast("Kate::View"))) + static_cast(m_view->tqqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) ); // init with more usefull size, stolen from konq :) if (!initialGeometrySet()) - resize( TQSize(700, 480).expandedTo(minimumSizeHint())); + resize( TQSize(700, 480).expandedTo(tqminimumSizeHint())); // call it as last thing, must be sure everything is already set up ;) setAutoSaveSettings (); @@ -139,41 +139,41 @@ KWrite::~KWrite() void KWrite::setupActions() { - KStdAction::close( this, TQT_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document")); + KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document")); // setup File menu - KStdAction::print(this, TQT_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document")); - KStdAction::openNew( this, TQT_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document")); - KStdAction::open( this, TQT_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing")); + KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document")); + KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document")); + KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing")); - m_recentFiles = KStdAction::openRecent(this, TQT_SLOT(slotOpen(const KURL&)), + m_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotOpen(const KURL&)), actionCollection()); m_recentFiles->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again.")); - KAction *a=new KAction(i18n("&New Window"), "window_new", 0, this, TQT_SLOT(newView()), + KAction *a=new KAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newView()), actionCollection(), "view_new_view"); a->setWhatsThis(i18n("Create another view containing the current document")); - a=new KAction(i18n("Choose Editor..."),0,this,TQT_SLOT(changeEditor()), + a=new KAction(i18n("Choose Editor..."),0,TQT_TQOBJECT(this),TQT_SLOT(changeEditor()), actionCollection(),"settings_choose_editor"); a->setWhatsThis(i18n("Override the system wide setting for the default editing component")); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view")); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view")); // setup Settings menu setStandardToolBarMenuEnabled(true); - m_paShowStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar"); + m_paShowStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar"); m_paShowStatusBar->setWhatsThis(i18n("Use this command to show or hide the view's statusbar")); - m_paShowPath = new KToggleAction(i18n("Sho&w Path"), 0, this, TQT_SLOT(newCaption()), + m_paShowPath = new KToggleAction(i18n("Sho&w Path"), 0, TQT_TQOBJECT(this), TQT_SLOT(newCaption()), actionCollection(), "set_showPath"); m_paShowPath->setCheckedState(i18n("Hide Path")); m_paShowPath->setWhatsThis(i18n("Show the complete document path in the window caption")); - a=KStdAction::keyBindings(this, TQT_SLOT(editKeys()), actionCollection()); + a=KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editKeys()), actionCollection()); a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments.")); - a=KStdAction::configureToolbars(this, TQT_SLOT(editToolbars()), actionCollection()); + a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(editToolbars()), actionCollection()); a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s).")); } @@ -458,7 +458,7 @@ void KWrite::readProperties(KConfig *config) void KWrite::saveProperties(KConfig *config) { writeConfig(config); - config->writeEntry("DocumentNumber",docList.find(m_view->document()) + 1); + config->writeEntry("DocumentNumber",docList.tqfind(m_view->document()) + 1); if (KTextEditor::sessionConfigInterface(m_view)) KTextEditor::sessionConfigInterface(m_view)->writeSessionConfig(config); @@ -485,7 +485,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents TQString buf = TQString("Window %1").arg(z); config->setGroup(buf); - config->writeEntry("DocumentNumber",docList.find(winList.at(z-1)->view()->document()) + 1); + config->writeEntry("DocumentNumber",docList.tqfind(winList.at(z-1)->view()->document()) + 1); } } diff --git a/kate/interfaces/application.h b/kate/interfaces/application.h index be9cd23c6..52eb129d5 100644 --- a/kate/interfaces/application.h +++ b/kate/interfaces/application.h @@ -35,7 +35,7 @@ class MainWindow; * other objects like document/projectmanager, ... no way goes around this * central interface */ -class KDE_EXPORT Application : public QObject +class KDE_EXPORT Application : public TQObject { friend class PrivateApplication; diff --git a/kate/interfaces/documentmanager.h b/kate/interfaces/documentmanager.h index a0c5e2387..8b5f554af 100644 --- a/kate/interfaces/documentmanager.h +++ b/kate/interfaces/documentmanager.h @@ -26,7 +26,7 @@ namespace Kate { /** This interface provides access to the Kate Document Manager. */ -class KDE_EXPORT DocumentManager : public QObject +class KDE_EXPORT DocumentManager : public TQObject { friend class PrivateDocumentManager; diff --git a/kate/interfaces/mainwindow.h b/kate/interfaces/mainwindow.h index 5c8449b62..bb40ffb9c 100644 --- a/kate/interfaces/mainwindow.h +++ b/kate/interfaces/mainwindow.h @@ -29,7 +29,7 @@ namespace Kate class ViewManager; -class KDE_EXPORT MainWindow : public QObject +class KDE_EXPORT MainWindow : public TQObject { friend class PrivateMainWindow; diff --git a/kate/interfaces/plugin.cpp b/kate/interfaces/plugin.cpp index 849b12a1e..45c0b8f35 100644 --- a/kate/interfaces/plugin.cpp +++ b/kate/interfaces/plugin.cpp @@ -99,7 +99,7 @@ PluginViewInterface *pluginViewInterface (Plugin *plugin) if (!plugin) return 0; - return static_cast(plugin->qt_cast("Kate::PluginViewInterface")); + return static_cast(plugin->tqqt_cast("Kate::PluginViewInterface")); } } diff --git a/kate/interfaces/plugin.h b/kate/interfaces/plugin.h index 53ee16bd6..42803db7c 100644 --- a/kate/interfaces/plugin.h +++ b/kate/interfaces/plugin.h @@ -32,7 +32,7 @@ namespace Kate class Application; class MainWindow; -class KDE_EXPORT Plugin : public QObject +class KDE_EXPORT Plugin : public TQObject { friend class PrivatePlugin; diff --git a/kate/interfaces/pluginconfiginterface.cpp b/kate/interfaces/pluginconfiginterface.cpp index 594b73e5d..66afe4d7c 100644 --- a/kate/interfaces/pluginconfiginterface.cpp +++ b/kate/interfaces/pluginconfiginterface.cpp @@ -59,5 +59,5 @@ PluginConfigInterface *Kate::pluginConfigInterface (Plugin *plugin) if (!plugin) return 0; - return static_cast(plugin->qt_cast("Kate::PluginConfigInterface")); + return static_cast(plugin->tqqt_cast("Kate::PluginConfigInterface")); } diff --git a/kate/interfaces/pluginconfiginterfaceextension.cpp b/kate/interfaces/pluginconfiginterfaceextension.cpp index 53c22122b..d09996b8e 100644 --- a/kate/interfaces/pluginconfiginterfaceextension.cpp +++ b/kate/interfaces/pluginconfiginterfaceextension.cpp @@ -64,5 +64,5 @@ PluginConfigInterfaceExtension *Kate::pluginConfigInterfaceExtension (Plugin *pl if (!plugin) return 0; - return static_cast(plugin->qt_cast("Kate::PluginConfigInterfaceExtension")); + return static_cast(plugin->tqqt_cast("Kate::PluginConfigInterfaceExtension")); } diff --git a/kate/interfaces/pluginconfiginterfaceextension.h b/kate/interfaces/pluginconfiginterfaceextension.h index 17a74ce7d..2e66f9d79 100644 --- a/kate/interfaces/pluginconfiginterfaceextension.h +++ b/kate/interfaces/pluginconfiginterfaceextension.h @@ -26,7 +26,7 @@ namespace Kate { -class KDE_EXPORT PluginConfigPage : public QWidget +class KDE_EXPORT PluginConfigPage : public TQWidget { Q_OBJECT diff --git a/kate/interfaces/pluginmanager.h b/kate/interfaces/pluginmanager.h index d9473e584..0aeb7785e 100644 --- a/kate/interfaces/pluginmanager.h +++ b/kate/interfaces/pluginmanager.h @@ -27,7 +27,7 @@ namespace Kate { /** This interface provides access to the Kate Plugin Manager. */ -class KDE_EXPORT PluginManager : public QObject +class KDE_EXPORT PluginManager : public TQObject { friend class PrivatePluginManager; diff --git a/kate/interfaces/toolviewmanager.cpp b/kate/interfaces/toolviewmanager.cpp index 848ec5fa2..3d8b0a9db 100644 --- a/kate/interfaces/toolviewmanager.cpp +++ b/kate/interfaces/toolviewmanager.cpp @@ -60,7 +60,7 @@ TQWidget *ToolViewManager::createToolView (const TQString &identifier, ToolViewM bool ToolViewManager::moveToolView (TQWidget *widget, ToolViewManager::Position pos) { - if (!widget || !widget->qt_cast("KateMDI::ToolView")) + if (!widget || !widget->tqqt_cast("KateMDI::ToolView")) return false; return d->toolViewMan->moveToolView (static_cast(widget), (KMultiTabBar::KMultiTabBarPosition)pos); @@ -68,7 +68,7 @@ bool ToolViewManager::moveToolView (TQWidget *widget, ToolViewManager::Position bool ToolViewManager::showToolView(TQWidget *widget) { - if (!widget || !widget->qt_cast("KateMDI::ToolView")) + if (!widget || !widget->tqqt_cast("KateMDI::ToolView")) return false; return d->toolViewMan->showToolView (static_cast(widget)); @@ -76,7 +76,7 @@ bool ToolViewManager::showToolView(TQWidget *widget) bool ToolViewManager::hideToolView(TQWidget *widget) { - if (!widget || !widget->qt_cast("KateMDI::ToolView")) + if (!widget || !widget->tqqt_cast("KateMDI::ToolView")) return false; return d->toolViewMan->hideToolView (static_cast(widget)); diff --git a/kate/interfaces/toolviewmanager.h b/kate/interfaces/toolviewmanager.h index 2e9242f3a..88a669476 100644 --- a/kate/interfaces/toolviewmanager.h +++ b/kate/interfaces/toolviewmanager.h @@ -29,7 +29,7 @@ namespace Kate /** Interface to the toolviewmanager */ -class KDE_EXPORT ToolViewManager : public QObject +class KDE_EXPORT ToolViewManager : public TQObject { friend class PrivateToolViewManager; diff --git a/kate/interfaces/viewmanager.h b/kate/interfaces/viewmanager.h index 9bdc938d7..15eb61312 100644 --- a/kate/interfaces/viewmanager.h +++ b/kate/interfaces/viewmanager.h @@ -30,7 +30,7 @@ class View; /** * Interface to the viewmanager */ -class KDE_EXPORT ViewManager : public QObject +class KDE_EXPORT ViewManager : public TQObject { friend class PrivateViewManager; diff --git a/kate/utils/dockviewbase.cpp b/kate/utils/dockviewbase.cpp index 76e5844ed..6048f9b70 100644 --- a/kate/utils/dockviewbase.cpp +++ b/kate/utils/dockviewbase.cpp @@ -87,7 +87,7 @@ void Kate::DockViewBase::init( const TQString &prefix, const TQString &title ) { setSpacing( 4 ); d->header = new TQWidget( this ); - d->header->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) ); + d->header->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) ); TQHBoxLayout *lo = new TQHBoxLayout( d->header ); lo->setSpacing( 6 ); lo->insertSpacing( 0, 6 ); diff --git a/kcminit/main.cpp b/kcminit/main.cpp index 507d648c9..92dd3409d 100644 --- a/kcminit/main.cpp +++ b/kcminit/main.cpp @@ -113,10 +113,10 @@ void KCMInit::runModules( int phase ) TQString libName = TQString("kcm_%1").arg(library); // try to load the library - if (! alreadyInitialized.contains( libName.ascii() )) { + if (! alreadyInitialized.tqcontains( libName.ascii() )) { if (!runModule(libName, service)) { libName = TQString("libkcm_%1").arg(library); - if (! alreadyInitialized.contains( libName.ascii() )) { + if (! alreadyInitialized.tqcontains( libName.ascii() )) { runModule(libName, service); alreadyInitialized.append( libName.ascii() ); } @@ -159,7 +159,7 @@ KCMInit::KCMInit( KCmdLineArgs* args ) KService::Ptr serv = KService::serviceByStorageId( module ); if ( !serv || serv->library().isEmpty() || serv->init().isEmpty()) { - kdError(1208) << i18n("Module %1 not found!").arg(module) << endl; + kdError(1208) << TQString(i18n("Module %1 not found!").arg(module)) << endl; return; } else list.append(serv); @@ -193,8 +193,8 @@ KCMInit::KCMInit( KCmdLineArgs* args ) runModules( 0 ); kapp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("kcminit")); sendReady(); - TQTimer::singleShot( 300 * 1000, qApp, TQT_SLOT( quit())); // just in case - qApp->exec(); // wait for runPhase1() and runPhase2() + TQTimer::singleShot( 300 * 1000, tqApp, TQT_SLOT( quit())); // just in case + tqApp->exec(); // wait for runPhase1() and runPhase2() } else runModules( -1 ); // all phases @@ -215,7 +215,7 @@ void KCMInit::runPhase2() { runModules( 2 ); emitDCOPSignal( "phase2Done()", TQByteArray()); - qApp->exit( 0 ); + tqApp->exit( 0 ); } extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) 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 Fixed - + 20 20 @@ -244,7 +244,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Fixed - + 20 20 @@ -338,7 +338,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Expanding - + 0 15 @@ -363,7 +363,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Expanding - + 20 0 @@ -420,7 +420,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Fixed - + 20 20 @@ -534,7 +534,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Fixed - + 20 20 @@ -625,7 +625,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Fixed - + 20 20 @@ -683,7 +683,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Expanding - + 21 61 @@ -789,7 +789,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Ma&ximum speed: - + AlignVCenter|AlignRight @@ -806,7 +806,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Acceleration &time: - + AlignVCenter|AlignRight @@ -895,7 +895,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Fixed - + 20 20 @@ -944,7 +944,7 @@ Please note that on slow machines this may cause a "lag" between the event causi &Repeat interval: - + AlignVCenter|AlignRight @@ -992,7 +992,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Acceleration &profile: - + AlignVCenter|AlignRight @@ -1087,7 +1087,7 @@ Please note that on slow machines this may cause a "lag" between the event causi &Acceleration delay: - + AlignVCenter|AlignRight @@ -1108,7 +1108,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Expanding - + 20 1 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 @@ generalTab - + generalTab @@ -12,7 +12,7 @@ 613 - + 0 450 @@ -22,7 +22,7 @@ unnamed - + startServer @@ -42,7 +42,7 @@ Recommended if you want sound. - + frame3 @@ -53,7 +53,7 @@ Recommended if you want sound. Sunken - + networkedSoundGroupBox @@ -75,7 +75,7 @@ Recommended if you want sound. <i>Enable this option if you want to play sound on a remote computer or you want to be able to control sound on this system from another computer.</i> - + networkTransparent @@ -88,7 +88,7 @@ Recommended if you want sound. - + realtimeGroupBox @@ -107,7 +107,7 @@ Recommended if you want sound. <i>If your sound is skipping during playback, enable running with highest possible priority. Increasing your sound buffer might also help.</i> - + startRealtime @@ -121,7 +121,7 @@ Recommended if you want sound. On systems which support realtime scheduling, if you have sufficient permissions, this option will enable a very high priority for processing sound requests. - + latencySlider @@ -144,7 +144,7 @@ Recommended if you want sound. 50 - + textLabel5 @@ -155,7 +155,7 @@ Recommended if you want sound. latencySlider - + latencyLabel @@ -165,7 +165,7 @@ Recommended if you want sound. - + autoSuspendGroupBox @@ -184,7 +184,7 @@ Recommended if you want sound. <i>The KDE sound system takes exclusive control over your audio hardware, blocking programs that may wish to use it directly. If the KDE sound system sits idle it can give up this exclusive control.</i> - + layout7 @@ -192,7 +192,7 @@ Recommended if you want sound. unnamed - + autoSuspend @@ -227,7 +227,7 @@ Recommended if you want sound. Expanding - + 173 20 @@ -238,7 +238,7 @@ Recommended if you want sound. - + layout3 @@ -256,14 +256,14 @@ Recommended if you want sound. Expanding - + 40 20 - + testSound @@ -289,7 +289,7 @@ Recommended if you want sound. Expanding - + 40 20 @@ -308,7 +308,7 @@ Recommended if you want sound. Expanding - + 20 0 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 @@ hardwareTab - + hardwareTab @@ -16,7 +16,7 @@ unnamed - + groupBox4 @@ -33,7 +33,7 @@ unnamed - + layout57 @@ -41,7 +41,7 @@ unnamed - + textLabel3_2 @@ -60,7 +60,7 @@ audioIO - + audioIO @@ -75,7 +75,7 @@ - + layout31 @@ -83,7 +83,7 @@ unnamed - + fullDuplex @@ -99,7 +99,7 @@ - + customOptions @@ -107,7 +107,7 @@ Use other custom &options: - + customDevice @@ -115,7 +115,7 @@ Override &device location: - + layout4 @@ -133,14 +133,14 @@ Fixed - + 20 20 - + textLabel2 @@ -151,7 +151,7 @@ soundQuality - + Default @@ -189,7 +189,7 @@ Expanding - + 0 20 @@ -198,7 +198,7 @@ - + customRate @@ -206,7 +206,7 @@ Use &custom sampling rate: - + layout6 @@ -214,7 +214,7 @@ unnamed - + samplingRate @@ -252,7 +252,7 @@ Expanding - + 0 20 @@ -261,7 +261,7 @@ - + addOptions @@ -269,7 +269,7 @@ false - + deviceName @@ -282,7 +282,7 @@ - + groupBox3 @@ -293,7 +293,7 @@ unnamed - + midiUseMapper @@ -301,7 +301,7 @@ Use MIDI ma&pper: - + textLabel4 @@ -312,7 +312,7 @@ deviceName - + midiDevice @@ -345,7 +345,7 @@ Expanding - + 20 60 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 @@ BGAdvancedBase - + BGAdvancedBase @@ -19,7 +19,7 @@ 0 - + m_groupProgram @@ -33,7 +33,7 @@ 11 - + m_buttonAdd @@ -50,7 +50,7 @@ </qt> - + m_buttonRemove @@ -64,7 +64,7 @@ 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. - + m_buttonModify @@ -91,14 +91,14 @@ Expanding - + 20 20 - + Program @@ -138,7 +138,7 @@ false - + 400 0 @@ -156,7 +156,7 @@ You can also remove programs from this list clicking on the <b>Remove</ </qt> - + m_cbProgram @@ -169,7 +169,7 @@ You can also remove programs from this list clicking on the <b>Remove</ - + m_groupIconText @@ -199,7 +199,7 @@ You can also remove programs from this list clicking on the <b>Remove</ Click here to change the color of the desktop font. - + textLabel6 @@ -223,7 +223,7 @@ You can also remove programs from this list clicking on the <b>Remove</ Expanding - + 220 20 @@ -244,7 +244,7 @@ You can also remove programs from this list clicking on the <b>Remove</ Click here to select the solid background color. Choose a different color from the background text color to assure readability. - + m_cbSolidTextBackground @@ -255,7 +255,7 @@ You can also remove programs from this list clicking on the <b>Remove</ 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. - + m_cbShadow @@ -266,7 +266,7 @@ You can also remove programs from this list clicking on the <b>Remove</ 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. - + textLabel6_2 @@ -280,7 +280,7 @@ You can also remove programs from this list clicking on the <b>Remove</ 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. - + m_spinTextLines @@ -294,7 +294,7 @@ You can also remove programs from this list clicking on the <b>Remove</ 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. - + m_spinTextWidth @@ -314,7 +314,7 @@ You can also remove programs from this list clicking on the <b>Remove</ 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. - + textLabel6_2_2 @@ -330,7 +330,7 @@ You can also remove programs from this list clicking on the <b>Remove</ - + m_groupCache @@ -344,7 +344,7 @@ You can also remove programs from this list clicking on the <b>Remove</ 11 - + m_lblCache @@ -355,7 +355,7 @@ You can also remove programs from this list clicking on the <b>Remove</ 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. - + m_spinCache @@ -376,7 +376,7 @@ You can also remove programs from this list clicking on the <b>Remove</ Expanding - + 20 20 @@ -395,7 +395,7 @@ You can also remove programs from this list clicking on the <b>Remove</ Expanding - + 20 16 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 @@ BGDialog_UI - + BGDialog_UI @@ -20,7 +20,7 @@ 1 - + m_pDesktopLabel @@ -105,14 +105,14 @@ Expanding - + 0 0 - + layout36 @@ -120,7 +120,7 @@ unnamed - + m_screenArrangement @@ -132,14 +132,14 @@ 0 - + 100 0 - + layout35 @@ -161,14 +161,14 @@ Minimum - + 4 20 - + m_buttonIdentifyScreens @@ -197,7 +197,7 @@ Minimum - + 4 20 @@ -219,14 +219,14 @@ Minimum - + 4 20 - + m_buttonAdvanced @@ -255,7 +255,7 @@ Minimum - + 4 20 @@ -277,14 +277,14 @@ Minimum - + 4 20 - + m_buttonGetNew @@ -313,7 +313,7 @@ Minimum - + 4 20 @@ -333,7 +333,7 @@ MinimumExpanding - + 20 0 @@ -342,7 +342,7 @@ - + groupBox3 @@ -353,7 +353,7 @@ unnamed - + m_lblWallpaperPos @@ -376,7 +376,7 @@ </ul></qt> - + m_comboBlend @@ -384,7 +384,7 @@ 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. - + layout31 @@ -416,7 +416,7 @@ - + m_lblColors @@ -427,7 +427,7 @@ m_comboPattern - + m_lblBlending @@ -438,7 +438,7 @@ m_comboBlend - + layout23 @@ -446,7 +446,7 @@ unnamed - + m_lblBlendBalance @@ -460,7 +460,7 @@ 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. - + m_sliderBlend @@ -488,7 +488,7 @@ - + m_cbBlendReverse @@ -499,7 +499,7 @@ For some types of blending, you can reverse the role of the background and the picture by checking this option. - + m_comboPattern @@ -522,7 +522,7 @@ Fixed - + 120 10 @@ -539,14 +539,14 @@ Fixed - + 130 10 - + m_comboWallpaperPos @@ -565,7 +565,7 @@ - + m_buttonGroupBackground @@ -576,7 +576,7 @@ unnamed - + m_radioNoPicture @@ -584,7 +584,7 @@ &No picture - + m_radioSlideShow @@ -592,7 +592,7 @@ &Slide show: - + m_radioPicture @@ -613,14 +613,14 @@ Expanding - + 260 20 - + m_buttonSetupWallpapers @@ -641,14 +641,14 @@ Expanding - + 110 16 - + m_urlWallpaperButton 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(dst.scanLine(dr.y() + y) - + (dr.x() + x) * sizeof(QRgb)); - d = reinterpret_cast(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(dst.scanLine(dr.y() + y) + + (dr.x() + x) * sizeof(TQRgb)); + d = reinterpret_cast(const_cast(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=\""<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 @@ BGMultiWallpaperBase - + BGMultiWallPaperBase @@ -19,7 +19,7 @@ 0 - + textLabel2 @@ -27,7 +27,7 @@ Show the following pictures: - + m_cbRandom @@ -35,7 +35,7 @@ &Show pictures in random order - + layout3 @@ -43,7 +43,7 @@ unnamed - + textLabel1 @@ -54,7 +54,7 @@ m_spinInterval - + m_spinInterval @@ -69,7 +69,7 @@ Expanding - + 20 20 @@ -78,7 +78,7 @@ - + layout4 @@ -98,14 +98,14 @@ 0 - + 300 100 - + m_buttonAdd @@ -123,14 +123,14 @@ Expanding - + 20 20 - + m_buttonRemove @@ -138,7 +138,7 @@ &Remove - + m_buttonMoveDown @@ -146,7 +146,7 @@ Move &Down - + m_buttonMoveUp 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; icount();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(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 @@ BrowserConfig_UI - + BrowserConfig_UI @@ -27,7 +27,7 @@ 0 - + buttonGroup1 @@ -41,7 +41,7 @@ unnamed - + label @@ -49,7 +49,7 @@ <qt>Open <b>http</b> and <b>https</b> URLs</qt> - + radioKIO @@ -60,7 +60,7 @@ true - + radioExec @@ -68,7 +68,7 @@ in the following browser: - + layout3 @@ -86,14 +86,14 @@ Fixed - + 20 20 - + lineExec @@ -101,7 +101,7 @@ false - + btnSelectBrowser @@ -134,7 +134,7 @@ Expanding - + 20 20 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 #include -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(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(configWidget->qt_cast("CfgPlugin"))->load(&cfg); + static_cast(configWidget->tqqt_cast("CfgPlugin"))->load(&cfg); emitChanged(false); latestEditedService=static_cast(it)->File; @@ -487,7 +487,7 @@ void ComponentChooser::load() { if( configWidget ) { CfgPlugin * plugin = static_cast( - 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( - 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(configWidget->qt_cast("CfgPlugin"))->defaults(); + static_cast(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 @@ ComponentChooser_UI - + ComponentChooser_UI @@ -27,7 +27,7 @@ 0 - + GroupBox1 @@ -52,14 +52,14 @@ 11 - + configContainer - + GroupBox2 @@ -84,14 +84,14 @@ 11 - + ComponentDescription - + WordBreak|AlignTop 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 @@ ComponentConfig_UI - + ComponentConfig_UI @@ -19,14 +19,14 @@ 0 - + ChooserDocu - + WordBreak|AlignVCenter @@ -45,7 +45,7 @@ Expanding - + 0 91 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 @@ EmailClientConfig_UI - + EmailClientConfig_UI @@ -30,7 +30,7 @@ 0 - + ButtonGroup2 @@ -50,7 +50,7 @@ 0 - + Layout4 @@ -58,7 +58,7 @@ unnamed - + txtEMailClient @@ -73,7 +73,7 @@ 0 - + 0 0 @@ -86,7 +86,7 @@ Press this button to select your favorite email client. Please note that the file you select has to have the executable attribute set in order to be accepted.<br> You can also use several placeholders which will be replaced with the actual values when the email client is called:<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: Attachment </li> </ul> - + btnSelectEmail @@ -102,7 +102,7 @@ - + chkRunTerminal @@ -126,14 +126,14 @@ Expanding - + 0 16 - + kmailCB @@ -144,7 +144,7 @@ Kmail is the standard Mail program for the KDE desktop. - + otherCB @@ -165,7 +165,7 @@ Fixed - + 30 16 @@ -182,7 +182,7 @@ Fixed - + 30 16 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 @@ TerminalEmulatorConfig_UI - + TerminalEmulatorConfig_UI @@ -27,7 +27,7 @@ 0 - + ButtonGroup1 @@ -57,14 +57,14 @@ Expanding - + 0 87 - + otherCB @@ -82,14 +82,14 @@ Fixed - + 31 20 - + terminalCB @@ -97,7 +97,7 @@ &Use Konsole as terminal application - + Layout4 @@ -105,7 +105,7 @@ unnamed - + terminalLE @@ -120,7 +120,7 @@ 0 - + 0 0 @@ -130,7 +130,7 @@ Press this button to select your favorite terminal client. Please note that the file you select has to have the executable attribute set in order to be accepted.<br> Also note that some programs that utilize Terminal Emulator will not work if you add command line arguments (Example: konsole -ls). - + btnSelectTerminal 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 @@ D_GenCert - + D_GenCert @@ -15,7 +15,7 @@ Certificate Creation Wizard - + TextLabel2 @@ -37,7 +37,7 @@ Passphrase: - + TextLabel3 @@ -53,7 +53,7 @@ Country code: - + TextLabel4 @@ -69,7 +69,7 @@ State or province (in full): - + T_CertType @@ -85,7 +85,7 @@ Certificate type: - + TextLabel2_2 @@ -101,7 +101,7 @@ Passphrase (verify): - + TextLabel5 @@ -117,7 +117,7 @@ City: - + TextLabel6 @@ -133,7 +133,7 @@ Organization name: - + TextLabel7 @@ -149,7 +149,7 @@ Organizational unit/group: - + TextLabel8 @@ -165,7 +165,7 @@ Full hostname of the server: - + L_CertType @@ -178,7 +178,7 @@ - + LineEdit3 @@ -194,7 +194,7 @@ 2 - + TextLabel9 @@ -210,7 +210,7 @@ Email address: - + LineEdit4_2_2_2 @@ -226,7 +226,7 @@ 200 - + LineEdit4_2_2_2_2 @@ -242,7 +242,7 @@ 200 - + LineEdit4_2_2_2_3 @@ -258,7 +258,7 @@ 200 - + E_Passphrase @@ -277,7 +277,7 @@ Password - + E_Passphrase_2 @@ -296,7 +296,7 @@ Password - + TextLabel10 @@ -312,7 +312,7 @@ Days valid: - + SpinBox1 @@ -334,7 +334,7 @@ 365 - + TextLabel11 @@ -350,7 +350,7 @@ Digest: - + CheckBox1 @@ -369,7 +369,7 @@ true - + TextLabel12 @@ -385,7 +385,7 @@ Alias: - + LineEdit19 @@ -398,7 +398,7 @@ - + LineEdit4_2_2 @@ -414,7 +414,7 @@ 200 - + LineEdit4_2 @@ -430,7 +430,7 @@ 200 - + ComboBox2 @@ -443,7 +443,7 @@ - + CheckBox2 @@ -459,7 +459,7 @@ Use DSA instead of RSA - + TextLabel13 @@ -475,7 +475,7 @@ Bit strength: - + ComboBox5 @@ -488,7 +488,7 @@ - + LineEdit4 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("Use these preconfigurations to more easily configure the SSL encryption settings. You can choose among the following modes:

    "); - cwcb->insertItem(TQString::null); + cwcb->insertItem(TQString()); cwcb->insertItem(i18n("Most Compatible")); whatStr += i18n("
  • Most Compatible: Select the settings found to be most compatible.
    • "); 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 == "" || *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(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(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(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(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(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(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(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(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(hostAuthList->firstChild()); x; x = static_cast(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 @@ CSSConfigDialog - + CSSConfigDialog @@ -29,7 +29,7 @@ 0 - + ButtonGroup1 @@ -60,7 +60,7 @@ 6 - + useDefault @@ -74,7 +74,7 @@ <b>Use default stylesheet</b><p>Select this option to use the default stylesheet.</p> - + useUser @@ -85,7 +85,7 @@ <b>Use user-defined stylesheet</b><p>If this box is checked, Konqueror will try to load a user-defined style sheet as specified in the location below. The style sheet allows you to completely override the way web pages are rendered in your browser. The file specified should contain a valid style sheet (see http://www.w3.org/Style/CSS for further information on cascading style sheets).</p> - + layout3 @@ -103,7 +103,7 @@ Fixed - + 16 20 @@ -120,7 +120,7 @@ - + useAccess @@ -139,7 +139,7 @@ <b>Use accessibility stylesheet</b><p>Selecting this option will allow you to define a default font, font size, and font color with a few simple clicks of the mouse. Simply wander over to the Customize... dialog and pick out your desired options.</p> - + layout2 @@ -157,14 +157,14 @@ Fixed - + 16 20 - + customize @@ -185,7 +185,7 @@ Expanding - + 451 20 @@ -206,7 +206,7 @@ Expanding - + 20 50 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 @@ CSSCustomDialog - + CSSCustomDialog @@ -19,7 +19,7 @@ unnamed - + GroupBox3 @@ -38,7 +38,7 @@ unnamed - + 7 @@ -119,7 +119,7 @@ true - + txtFontsize @@ -130,7 +130,7 @@ basefontsize - + dontScale @@ -151,7 +151,7 @@ - + GroupBox3_2 @@ -165,7 +165,7 @@ unnamed - + hideImages @@ -176,7 +176,7 @@ <b>Suppress images</b><p>Selecting this will prevent Konqueror from loading images.</p> - + hideBackground @@ -192,7 +192,7 @@ - + GroupBox7 @@ -206,7 +206,7 @@ unnamed - + txtBaseFontFamily @@ -217,7 +217,7 @@ fontFamily - + fontFamily @@ -243,14 +243,14 @@ Expanding - + 0 20 - + sameFamily @@ -273,14 +273,14 @@ Expanding - + 20 0 - + Layout1 @@ -294,7 +294,7 @@ 6 - + preview @@ -315,7 +315,7 @@ Expanding - + 0 20 @@ -324,7 +324,7 @@ - + ButtonGroup2 @@ -341,7 +341,7 @@ unnamed - + blackOnWhite @@ -355,7 +355,7 @@ <b>Black on White</b><p>This is what you normally see.</p> - + whiteOnBlack @@ -366,7 +366,7 @@ <b>White on Black</b><p>This is your classic inverse color scheme.</p> - + customColor @@ -377,7 +377,7 @@ <b>Custom</b><p>Select this option to define a custom color for the default font.</p> - + Layout2 @@ -412,7 +412,7 @@ Expanding - + 0 20 @@ -429,7 +429,7 @@ Fixed - + 21 20 @@ -446,7 +446,7 @@ Fixed - + 20 20 @@ -463,14 +463,14 @@ Expanding - + 0 20 - + txtForeground @@ -495,7 +495,7 @@ <b>Background</b><p>Behind this door lays the ability to choose a custom default background.</p> - + txtBackground @@ -511,7 +511,7 @@ - + sameColor 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 @@ PreviewDialog - + PreviewDialog @@ -37,14 +37,14 @@ Expanding - + 20 20 - + preview @@ -62,7 +62,7 @@ people.</p> </qt> - + PushButton2 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 &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::Iterator currentModule = m_modules.find(static_cast(const_cast(sender()))); + TQMap::Iterator currentModule = m_modules.tqfind(static_cast(TQT_TQWIDGET(const_cast(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 @@ 0 - + 0 0 @@ -33,11 +33,11 @@ unnamed - + tabs - + tab @@ -48,7 +48,7 @@ unnamed - + kcfg_PublishType @@ -66,7 +66,7 @@ Publishing Mode - + WANButton @@ -91,7 +91,7 @@ Advertise services on Internet domain using public IP. To have this option working you need to configure wide area operation in using administrator mode - + LANButtor @@ -117,7 +117,7 @@ - + kcfg_BrowseLocal @@ -131,7 +131,7 @@ Browse local network (domain .local) using multicast DNS. - + enableZeroconf @@ -167,7 +167,7 @@ is configured with 'Browse local network' option above. - + tab @@ -178,7 +178,7 @@ is configured with 'Browse local network' option above. unnamed - + layout7 @@ -186,7 +186,7 @@ is configured with 'Browse local network' option above. unnamed - + textLabel2 @@ -204,7 +204,7 @@ is configured with 'Browse local network' option above. Expanding - + 130 21 @@ -227,7 +227,7 @@ is configured with 'Browse local network' option above. Optional shared secret used for authorization of DNS dynamic updates. - + domainLabel @@ -238,7 +238,7 @@ is configured with 'Browse local network' option above. Domain: - + textLabel1 @@ -264,7 +264,7 @@ is configured with 'Browse local network' option above. Expanding - + 90 20 @@ -281,7 +281,7 @@ is configured with 'Browse local network' option above. Expanding - + 90 21 @@ -300,7 +300,7 @@ is configured with 'Browse local network' option above. Expanding - + 50 110 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 @@ FilterOptionsUI - + FilterOptionsUI @@ -19,7 +19,7 @@ 0 - + cbEnableShortcuts @@ -32,7 +32,7 @@ Enable shortcuts that allow you to quickly search for information on the web. Fo </qt> - + layout10 @@ -40,7 +40,7 @@ Enable shortcuts that allow you to quickly search for information on the web. Fo unnamed - + lbDelimiter @@ -62,7 +62,7 @@ Enable shortcuts that allow you to quickly search for information on the web. Fo Choose the delimiter that separates the keyword from the phrase or word to be searched. - + lbDefaultEngine @@ -112,7 +112,7 @@ Select the search engine to use for input boxes that provide automatic lookup se </qt> - + pbChange @@ -126,7 +126,7 @@ Select the search engine to use for input boxes that provide automatic lookup se Modify a search provider. - + pbDelete @@ -140,7 +140,7 @@ Select the search engine to use for input boxes that provide automatic lookup se Delete the selected search provider. - + pbNew @@ -161,7 +161,7 @@ Select the search engine to use for input boxes that provide automatic lookup se Expanding - + 21 170 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 @@ SearchProviderDlgUI - + SearchProviderDlgUI @@ -27,7 +27,7 @@ Enter the human readable name of the search provider here. - + lbCharset @@ -41,7 +41,7 @@ Select the character set that will be used to encode your search query - + lbQuery @@ -58,7 +58,7 @@ Recommended is \{@}, since it removes all query variables (name=value) from the </qt> - + lbName @@ -82,7 +82,7 @@ The shortcuts entered here can be used as a pseudo-URI scheme in KDE. For exampl </qt> - + lbShortcut 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::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 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 mit = m_majorMap.find( maj ); + TQMapIterator 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 mit = m_majorMap.find( major ); + TQMapIterator 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::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 #include -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("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 @@ ICCConfigBase - + ICCConfigBase @@ -16,14 +16,14 @@ unnamed - + TabWidget2 true - + tab @@ -34,7 +34,7 @@ unnamed - + groupSystemSettings @@ -45,7 +45,7 @@ unnamed - + systemEnableSupport @@ -61,7 +61,7 @@ *.icc - + textLabel4_2 @@ -71,7 +71,7 @@ - + groupUserSettings @@ -82,7 +82,7 @@ unnamed - + enableSupport @@ -95,7 +95,7 @@ iccProfileList - + textLabel2_9 @@ -132,7 +132,7 @@ randrScreenList - + textLabel2_8 @@ -148,7 +148,7 @@ *.icc - + textLabel2_2 @@ -168,7 +168,7 @@ Expanding - + 20 20 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 = "" + hint + ""; Widget = new TQLabel("" + title + "", 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 + * Copyright (C) 2003 Fredrik H�glund * * Based on the large cursor code written by Rik Hemsley, * Copyright (c) 2000 Rik Hemsley @@ -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 + * Copyright (C) 2003 Fredrik H�glund * * 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 @@ KMouseDlg - + KMouseDlg @@ -16,7 +16,7 @@ unnamed - + handedBox @@ -57,7 +57,7 @@ Expanding - + 20 20 @@ -74,14 +74,14 @@ Expanding - + 20 20 - + rightHanded @@ -92,7 +92,7 @@ true - + leftHanded @@ -100,7 +100,7 @@ Le&ft handed - + mousePix @@ -112,7 +112,7 @@ 0 - + 150 115 @@ -124,7 +124,7 @@ - + cbScrollPolarity @@ -135,7 +135,7 @@ Change the direction of scrolling for the mouse wheel or the 4th and 5th mouse buttons. - + GroupBox1 @@ -146,7 +146,7 @@ unnamed - + doubleClick @@ -171,7 +171,7 @@ Horizontal - + cbVisualActivate @@ -179,18 +179,18 @@ Visual f&eedback on activation - + - cb_pointershape + cb_pointertqshape - Cha&nge pointer shape over icons + Cha&nge pointer tqshape over icons true - + cbAutoSelect @@ -208,14 +208,14 @@ Fixed - + 20 60 - + layout7 @@ -223,7 +223,7 @@ unnamed - + lb_short @@ -231,11 +231,11 @@ Short - + slAutoSelect - + 250 0 @@ -258,14 +258,14 @@ Expanding - + 230 20 - + lDelay @@ -276,14 +276,14 @@ slAutoSelect - + lb_long Long - + AlignVCenter|AlignRight @@ -301,14 +301,14 @@ Fixed - + 20 21 - + singleClick @@ -331,7 +331,7 @@ Expanding - + 20 16 @@ -344,7 +344,7 @@ singleClick toggled(bool) - cb_pointershape + cb_pointertqshape setEnabled(bool) @@ -364,7 +364,7 @@ rightHanded leftHanded singleClick - cb_pointershape + cb_pointertqshape cbAutoSelect slAutoSelect doubleClick 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 @@ LogitechMouseBase - + LogitechMouseBase @@ -16,7 +16,7 @@ unnamed - + cordlessNameLabel @@ -24,18 +24,18 @@ Cordless Name - + permissionProblemText 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. - + WordBreak|AlignVCenter - + resolutionSelector @@ -52,7 +52,7 @@ unnamed - + button400cpi @@ -63,7 +63,7 @@ 1 - + button800cpi @@ -76,7 +76,7 @@ - + batteryBox @@ -90,7 +90,7 @@ unnamed - + batteryBar @@ -100,7 +100,7 @@ - + channelSelector @@ -117,7 +117,7 @@ unnamed - + channel1 @@ -131,7 +131,7 @@ 3 - + channel2 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( image.bits() ); + TQ_UINT32 *dst = reinterpret_cast( 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( image.scanLine(dstOffset.y()) ) + dstOffset.x(); - src = reinterpret_cast( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x(); + dst = reinterpret_cast( image.scanLine(dstOffset.y()) ) + dstOffset.x(); + src = reinterpret_cast( 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( "toUnicode( helpData ); - index = text.find( "
    " ); + index = text.tqfind( "
    " ); text = text.mid( index ); - index = text.find( "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("Loading..."), 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("

    Use the \"What's This?\" (Shift+F1) to get help on specific options.

    To read the full manual click here.

    ") - .arg(docPath.local8Bit())); + .tqarg(static_cast(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("You need super user privileges to run this control module.
    " "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(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("Loading..."), _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 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 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 { 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(parent()); + ModuleTreeItem* p = dynamic_cast(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(parent()); + ModuleTreeItem* parentItem = dynamic_cast(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 #include -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(_lvStartup->findItem(file.readEntry("X-KDE-Library"),4)); + item = static_cast(_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 &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 &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 -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 &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 &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 -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( 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("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 " "KDE menu editor.")); - 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 treeItemList; typedef TQPtrListIterator 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 #include -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 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; c0x7E) + 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; chfonts[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(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 &ma { TQString name(Misc::getFile(*it)), path(Misc::getDir(*it)); - TQValueList::Iterator entry=list.find(FontList(name)); + TQValueList::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 &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; i1 || !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 &patterns= @@ -2079,14 +2079,14 @@ CKioFonts::EFolder CKioFonts::getFolder(const KURL &url) TQMap >::Iterator CKioFonts::getMap(const KURL &url) { EFolder folder(getFolder(url)); - TQMap >::Iterator it=itsFolders[folder].fontMap.find(removeMultipleExtension(url)); + TQMap >::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; chcharset, 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 @@ advancedKickerOptions - + advancedKickerOptions @@ -19,7 +19,7 @@ 0 - + groupBox3 @@ -30,7 +30,7 @@ unnamed - + TextLabel2 @@ -71,7 +71,7 @@ Expanding - + 101 20 @@ -80,7 +80,7 @@ - + handles @@ -91,7 +91,7 @@ unnamed - + visibleHandles @@ -108,7 +108,7 @@ </qt> - + fadeOutHandles @@ -122,7 +122,7 @@ </qt> - + hideHandles @@ -145,7 +145,7 @@ Expanding - + 21 20 @@ -154,7 +154,7 @@ - + groupBox2 @@ -194,21 +194,21 @@ Expanding - + 20 21 - + textLabel3 Min - + AlignVCenter|AlignLeft @@ -225,14 +225,14 @@ Expanding - + 81 20 - + tintSlider @@ -243,21 +243,21 @@ Use this slider to set how much transparent panels should be tinted using the tint color. - + textLabel2 Max - + AlignVCenter|AlignRight Use this slider to set how much transparent panels should be tinted using the tint color. - + textLabel1_2 @@ -271,7 +271,7 @@ Use this slider to set how much transparent panels should be tinted using the tint color. - + textLabel1 @@ -285,7 +285,7 @@ Click on this button to set the color to use when tinting transparent panels. - + menubarPanelTransparent 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 @@ AppletTabBase - + AppletTabBase @@ -16,7 +16,7 @@ unnamed - + level_group @@ -27,7 +27,7 @@ unnamed - + trusted_rb @@ -35,7 +35,7 @@ Load only trusted applets internal - + new_rb @@ -43,7 +43,7 @@ Load startup config applets internal - + all_rb @@ -53,7 +53,7 @@ - + list_group @@ -70,7 +70,7 @@ unnamed - + Layout13 @@ -78,7 +78,7 @@ unnamed - + Available Applets @@ -94,7 +94,7 @@ lb_available - + Layout12 @@ -112,18 +112,18 @@ Expanding - + 20 20 - + pb_add - + 0 0 @@ -143,14 +143,14 @@ Minimum - + 20 20 - + pb_remove @@ -162,7 +162,7 @@ 0 - + 0 0 @@ -182,7 +182,7 @@ Expanding - + 20 20 @@ -191,7 +191,7 @@ - + Trusted Applets 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 @@ HidingTabBase - + HidingTabBase @@ -19,7 +19,7 @@ 0 - + m_panelsGroupBox @@ -36,7 +36,7 @@ 0 - + m_panelListLabel @@ -47,7 +47,7 @@ m_panelList - + m_panelList @@ -62,7 +62,7 @@ Expanding - + 342 20 @@ -71,7 +71,7 @@ - + m_modeGroup @@ -92,14 +92,14 @@ Fixed - + 30 20 - + m_manual @@ -113,7 +113,7 @@ 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. - + layout5 @@ -144,7 +144,7 @@ Here you can change the delay after which the panel will disappear if not used. - + DelayLabel_2_3_2 @@ -179,7 +179,7 @@ Expanding - + 20 20 @@ -188,7 +188,7 @@ - + m_background @@ -202,7 +202,7 @@ If this option is selected, the panel will allow itself to be covered by other windows. - + m_automatic @@ -216,7 +216,7 @@ 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. - + layout6 @@ -224,7 +224,7 @@ unnamed - + m_backgroundRaise @@ -238,7 +238,7 @@ 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. - + Top Left Corner @@ -299,7 +299,7 @@ Expanding - + 20 20 @@ -308,7 +308,7 @@ - + m_autoHideSwitch @@ -332,7 +332,7 @@ Fixed - + 50 10 @@ -341,7 +341,7 @@ - + m_manualGroup @@ -363,7 +363,7 @@ unnamed - + m_lHB @@ -377,7 +377,7 @@ When this option is selected, a panel-hiding button appears on the left end of the panel. - + m_rHB @@ -401,7 +401,7 @@ Expanding - + 20 20 @@ -410,7 +410,7 @@ - + m_manualGroup_2 @@ -439,14 +439,14 @@ Expanding - + 20 20 - + m_animateHiding @@ -467,14 +467,14 @@ Fixed - + 30 20 - + Layout2 @@ -482,7 +482,7 @@ unnamed - + m_hideSlider @@ -532,14 +532,14 @@ Expanding - + 20 20 - + TextLabel4_2_2_2_3 @@ -557,7 +557,7 @@ Fast - + AlignVCenter|AlignRight @@ -573,14 +573,14 @@ Expanding - + 20 20 - + TextLabel5_2_2_2_3 @@ -598,13 +598,13 @@ Medium - + AlignCenter - + TextLabel3_2_2_3_3 @@ -637,7 +637,7 @@ Expanding - + 20 16 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 @@ LookAndFeelTabBase - + LookAndFeelTabBase @@ -22,7 +22,7 @@ 0 - + general_group @@ -33,7 +33,7 @@ unnamed - + kcfg_ShowMouseOverEffects @@ -44,7 +44,7 @@ When this option is selected a mouseover effect appears when the mouse cursor is moved over panel buttons - + kcfg_ShowIconActivationEffect @@ -55,7 +55,7 @@ When this option is selected an activation effect appears when panel buttons are left clicked. - + kcfg_ShowToolTips @@ -68,7 +68,7 @@ - + GroupBox9 @@ -79,7 +79,7 @@ unnamed - + TextLabel1 @@ -93,7 +93,7 @@ Choose a tile image for the K menu. - + TextLabel2 @@ -227,7 +227,7 @@ When the Custom Color option is selected, use this button to pick a color for window list tile backgrounds - + TextLabel5 @@ -281,7 +281,7 @@ When the Custom Color option is selected, use this button to pick a color for the desktop tile background - + TextLabel6 @@ -306,7 +306,7 @@ When the Custom Color option is selected, use this button to pick a color for application tile backgrounds - + TextLabel3 @@ -359,7 +359,7 @@ Expanding - + 66 130 @@ -368,7 +368,7 @@ - + buttonGroup1 @@ -389,14 +389,14 @@ Fixed - + 20 20 - + kcfg_ColorizeBackground @@ -413,7 +413,7 @@ 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. - + m_backgroundLabel @@ -428,13 +428,13 @@ 0 - + 50 50 - + 50 50 @@ -449,7 +449,7 @@ true - + AlignCenter @@ -480,7 +480,7 @@ This option is only active if 'Enable background image' is selected. - + kcfg_UseBackgroundTheme @@ -488,7 +488,7 @@ This option is only active if 'Enable background image' is selected. Enable &background image - + kcfg_Transparent @@ -498,7 +498,7 @@ This option is only active if 'Enable background image' is selected. - + layout3 @@ -506,7 +506,7 @@ This option is only active if 'Enable background image' is selected. unnamed - + advancedOptionsButton @@ -527,7 +527,7 @@ This option is only active if 'Enable background image' is selected. Expanding - + 289 20 @@ -546,7 +546,7 @@ This option is only active if 'Enable background image' is selected. Expanding - + 20 0 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 @@ MenuTabBase - + MenuTabBase @@ -19,7 +19,7 @@ 0 - + layout5 @@ -27,7 +27,7 @@ unnamed - + textLabel1 @@ -38,7 +38,7 @@ comboMenuStyle - + Kickoff @@ -63,7 +63,7 @@ Expanding - + 40 20 @@ -72,7 +72,7 @@ - + m_kmenuGroup @@ -83,7 +83,7 @@ unnamed - + layout7 @@ -91,7 +91,7 @@ unnamed - + m_openOnHover @@ -99,7 +99,7 @@ Open menu on mouse hover - + kcfg_MenuEntryFormat @@ -119,7 +119,7 @@ unnamed - + m_formatSimple @@ -130,7 +130,7 @@ When this option is selected, items in the K Menu will appear with the application's name next to the icon. - + m_formatNameDesc @@ -144,7 +144,7 @@ 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. - + m_formatDescOnly @@ -155,7 +155,7 @@ When this option is selected, items in the K Menu will appear with the application's brief description next to the icon. - + m_formDescName @@ -171,7 +171,7 @@ - + kcfg_UseSidePixmap @@ -197,14 +197,14 @@ MinimumExpanding - + 20 0 - + kcfg_ShowKMenuText @@ -225,7 +225,7 @@ 0 - + kcfg_KMenuText @@ -233,7 +233,7 @@ 35 - + TextLabel1_3_3_2 @@ -261,13 +261,13 @@ 0 - + 26 26 - + 26 26 @@ -280,7 +280,7 @@ - + TextLabel1_3_3_2 @@ -296,7 +296,7 @@ Text: - + TextLabel1_3_3_2 @@ -327,7 +327,7 @@ Expanding - + 20 20 @@ -345,7 +345,7 @@ MinimumExpanding - + 20 0 @@ -353,7 +353,7 @@ - + m_editKMenuButton @@ -389,7 +389,7 @@ 1 - + 0 0 @@ -411,7 +411,7 @@ 0 - + m_browserGroup @@ -422,7 +422,7 @@ unnamed - + Layout3 @@ -430,7 +430,7 @@ unnamed - + m_maxQuickBrowserItemsLabel @@ -463,7 +463,7 @@ - + kcfg_ShowHiddenFiles @@ -487,7 +487,7 @@ Expanding - + 20 0 @@ -496,7 +496,7 @@ - + m_recentGroup @@ -507,7 +507,7 @@ unnamed - + Layout3 @@ -515,7 +515,7 @@ unnamed - + m_maxRecentDocumentsItemsLabel @@ -558,7 +558,7 @@ Expanding - + 20 0 @@ -567,7 +567,7 @@ - + m_pRecentOrderGroup @@ -578,7 +578,7 @@ unnamed - + Layout4 @@ -586,7 +586,7 @@ unnamed - + TextLabel2 @@ -619,7 +619,7 @@ - + kcfg_RecentVsOften @@ -633,7 +633,7 @@ When this option is selected the QuickStart menu area will be filled with the applications you have used most recently. - + m_showFrequent @@ -654,7 +654,7 @@ Expanding - + 20 0 @@ -663,7 +663,7 @@ - + m_pSearchGroup @@ -674,7 +674,7 @@ unnamed - + kcfg_UseSearchBar @@ -698,7 +698,7 @@ Expanding - + 20 0 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 @@ PositionTabBase Aaron J. Seigo - + PositionTabBase @@ -23,7 +23,7 @@ 0 - + m_panelsGroupBox @@ -40,7 +40,7 @@ 0 - + m_panelListLabel @@ -51,7 +51,7 @@ m_panelList - + m_panelList @@ -66,7 +66,7 @@ Expanding - + 342 20 @@ -75,7 +75,7 @@ - + XineramaGroup @@ -86,7 +86,7 @@ unnamed - + Layout13 @@ -104,14 +104,14 @@ Expanding - + 20 0 - + m_monitorImage @@ -123,7 +123,7 @@ 0 - + 151 115 @@ -132,7 +132,7 @@ true - + AlignCenter @@ -149,7 +149,7 @@ Expanding - + 20 0 @@ -158,7 +158,7 @@ - + Layout12 @@ -176,14 +176,14 @@ Expanding - + 20 0 - + m_identifyButton @@ -196,7 +196,7 @@ - + Layout9 @@ -204,7 +204,7 @@ unnamed - + m_xineramaScreenLabel @@ -215,7 +215,7 @@ m_xineramaScreenComboBox - + m_xineramaScreenComboBox @@ -235,7 +235,7 @@ Expanding - + 0 101 @@ -244,7 +244,7 @@ - + m_rsizeGroup @@ -267,7 +267,7 @@ how it is positioned on the screen and how much of the screen it should use. unnamed - + Layout8 @@ -275,7 +275,7 @@ how it is positioned on the screen and how much of the screen it should use. unnamed - + m_percentSlider @@ -334,7 +334,7 @@ how it is positioned on the screen and how much of the screen it should use. - + m_expandCheckBox @@ -357,14 +357,14 @@ how it is positioned on the screen and how much of the screen it should use. Expanding - + 16 16 - + m_sizeGroup @@ -386,7 +386,7 @@ how it is positioned on the screen and how much of the screen it should use. unnamed - + Tiny @@ -426,14 +426,14 @@ how it is positioned on the screen and how much of the screen it should use. Fixed - + 30 40 - + Layout9 @@ -441,7 +441,7 @@ how it is positioned on the screen and how much of the screen it should use. unnamed - + m_customSlider @@ -511,7 +511,7 @@ how it is positioned on the screen and how much of the screen it should use. - + m_locationGroup @@ -538,7 +538,7 @@ how it is positioned on the screen and how much of the screen it should use. Expanding - + 20 0 @@ -555,14 +555,14 @@ how it is positioned on the screen and how much of the screen it should use. Expanding - + 21 0 - + Layout7 @@ -570,7 +570,7 @@ how it is positioned on the screen and how much of the screen it should use. unnamed - + Layout8 @@ -578,7 +578,7 @@ how it is positioned on the screen and how much of the screen it should use. unnamed - + locationTopLeft @@ -590,13 +590,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 32 16 - + 32 16 @@ -612,7 +612,7 @@ how it is positioned on the screen and how much of the screen it should use.true - + locationTop @@ -624,13 +624,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 32 16 - + 32 16 @@ -646,7 +646,7 @@ how it is positioned on the screen and how much of the screen it should use.true - + locationTopRight @@ -658,13 +658,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 32 16 - + 32 16 @@ -682,7 +682,7 @@ how it is positioned on the screen and how much of the screen it should use. - + Layout10 @@ -690,7 +690,7 @@ how it is positioned on the screen and how much of the screen it should use. unnamed - + locationLeftTop @@ -702,13 +702,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 16 24 - + 16 24 @@ -724,7 +724,7 @@ how it is positioned on the screen and how much of the screen it should use.true - + locationLeft @@ -736,13 +736,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 16 24 - + 16 24 @@ -758,7 +758,7 @@ how it is positioned on the screen and how much of the screen it should use.true - + locationLeftBottom @@ -770,13 +770,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 16 24 - + 16 24 @@ -794,7 +794,7 @@ how it is positioned on the screen and how much of the screen it should use. - + Layout7 @@ -802,7 +802,7 @@ how it is positioned on the screen and how much of the screen it should use. unnamed - + locationBottomLeft @@ -814,13 +814,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 32 16 - + 32 16 @@ -836,7 +836,7 @@ how it is positioned on the screen and how much of the screen it should use.true - + locationBottom @@ -848,13 +848,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 32 16 - + 32 16 @@ -870,7 +870,7 @@ how it is positioned on the screen and how much of the screen it should use.true - + locationBottomRight @@ -882,13 +882,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 32 16 - + 32 16 @@ -906,7 +906,7 @@ how it is positioned on the screen and how much of the screen it should use. - + Layout9 @@ -914,7 +914,7 @@ how it is positioned on the screen and how much of the screen it should use. unnamed - + locationRightTop @@ -926,13 +926,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 16 24 - + 16 24 @@ -948,7 +948,7 @@ how it is positioned on the screen and how much of the screen it should use.true - + locationRight @@ -960,13 +960,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 16 24 - + 16 24 @@ -982,7 +982,7 @@ how it is positioned on the screen and how much of the screen it should use.true - + locationRightBottom @@ -994,13 +994,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 16 24 - + 16 24 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(m_locationGroup->find(whichButton)); + TQPushButton* pushed = reinterpret_cast(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 @@ CacheDlgUI - + CacheDlgUI @@ -29,14 +29,14 @@ Fixed - + 16 21 - + lbMaxCacheSize @@ -67,7 +67,7 @@ KB - + pbClearCache @@ -88,14 +88,14 @@ MinimumExpanding - + 0 21 - + cbUseCache @@ -106,7 +106,7 @@ 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. - + bgCachePolicy @@ -120,7 +120,7 @@ unnamed - + rbVerifyCache @@ -131,7 +131,7 @@ Verify whether the cached web page is valid before attempting to fetch the web page again. - + rbCacheIfPossible @@ -142,7 +142,7 @@ Always use documents from the cache when available. You can still use the reload button to synchronize the cache with the remote host. - + rbOfflineMode 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 @@ EnvVarProxyDlgUI - + EnvVarProxyDlgUI @@ -41,7 +41,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a </qt> - + lbFtp @@ -58,7 +58,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a </qt> - + lbHttps @@ -75,7 +75,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a </qt> - + cbShowValue @@ -83,7 +83,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a Show the &value of the environment variables - + pbVerify @@ -94,7 +94,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a <qt>Verify whether or not the environment variable names you supplied are valid. If an environment variable is not found, the associated labels will be <b>highlighted</b> to indicate that they are invalid.</qt> - + pbDetect @@ -105,7 +105,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a <qt>Attempt automatic discovery of the environment variables used for setting system wide proxy information.<p> This feature works by searching for commonly used variable names such as HTTP_PROXY, FTP_PROXY and NO_PROXY.</qt> - + lbHttp @@ -144,7 +144,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a </qt> - + lbNoProxy 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"), 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( item->parent() ); + CookieListViewItem *parent = static_cast( item->tqparent() ); if ( parent ) domain = parent->domain (); @@ -407,8 +407,8 @@ void KCookiesManagement::deleteCookie(TQListViewItem* deleteItem) CookieListViewItem *item = static_cast( deleteItem ); if( item->cookie() ) { - CookieListViewItem *parent = static_cast(item->parent()); - CookiePropList *list = deletedCookies.find(parent->domain()); + CookieListViewItem *parent = static_cast(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 @@ KCookiesManagementDlgUI - + KCookiesManagementDlgUI @@ -19,7 +19,7 @@ 0 - + layout6 @@ -69,7 +69,7 @@ 15 - + layout4 @@ -77,7 +77,7 @@ unnamed - + pbDelete @@ -85,7 +85,7 @@ D&elete - + pbDeleteAll @@ -93,7 +93,7 @@ Delete A&ll - + pbPolicy @@ -101,7 +101,7 @@ Change &Policy... - + pbReload @@ -119,7 +119,7 @@ MinimumExpanding - + 21 62 @@ -128,7 +128,7 @@ - + layout3 @@ -136,7 +136,7 @@ unnamed - + tbClearSearchLine @@ -147,7 +147,7 @@ Clear Search - + textLabel1 @@ -173,7 +173,7 @@ - + gbDetails @@ -208,7 +208,7 @@ true - + lbName @@ -219,7 +219,7 @@ leName - + lbValue @@ -230,7 +230,7 @@ leValue - + lbDomain @@ -241,7 +241,7 @@ leDomain - + lbPath @@ -252,7 +252,7 @@ lePath - + lbExpires @@ -263,7 +263,7 @@ leExpires - + lbSecure 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 @@ KCookiesPolicyDlgUI - + KCookiesPolicyDlgUI @@ -16,7 +16,7 @@ unnamed - + cbEnableCookies @@ -30,7 +30,7 @@ Please note that disabling cookie support might make many web sites unbrowsable. </qt> - + bgPreferences @@ -41,7 +41,7 @@ Please note that disabling cookie support might make many web sites unbrowsable. unnamed - + cbRejectCrossDomainCookies @@ -54,7 +54,7 @@ Reject the so called third-party cookies. These are cookies that originate from </qt> - + cbAutoAcceptSessionCookies @@ -68,7 +68,7 @@ Automatically accept temporary cookies meant to expire at the end of the current </qt> - + cbIgnoreCookieExpirationDate @@ -84,7 +84,7 @@ Treat all cookies as session cookies. Session cookies are small pieces of data t - + bgDefault @@ -109,7 +109,7 @@ Determines how cookies received from a remote machine will be handled: unnamed - + rbPolicyAsk @@ -117,7 +117,7 @@ Determines how cookies received from a remote machine will be handled: Ask &for confirmation - + rbPolicyAccept @@ -125,7 +125,7 @@ Determines how cookies received from a remote machine will be handled: Accep&t all cookies - + rbPolicyReject @@ -135,7 +135,7 @@ Determines how cookies received from a remote machine will be handled: - + gbDomainSpecific @@ -161,14 +161,14 @@ To add a new policy, simply click on the <b>Add...</b> button and su MinimumExpanding - + 20 16 - + layout3 @@ -176,7 +176,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su unnamed - + pbNew @@ -184,7 +184,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su &New... - + pbChange @@ -192,7 +192,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su Chan&ge... - + pbDelete @@ -200,7 +200,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su D&elete - + pbDeleteAll @@ -254,7 +254,7 @@ List of sites for which you have set a specific cookie policy. Specific policies </qt> - + layout2 @@ -262,7 +262,7 @@ List of sites for which you have set a specific cookie policy. Specific policies unnamed - + tbClearSearchLine @@ -273,7 +273,7 @@ List of sites for which you have set a specific cookie policy. Specific policies Clear Search - + textLabel1 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 @@ KProxyDialogUI - + ProxyDlgUI @@ -28,7 +28,7 @@ If you are uncertain whether or not you need to use a proxy server to connect to 0 - + gbConfigure @@ -51,7 +51,7 @@ If you are uncertain whether or not you need to use a proxy server to connect to 0 - + rbNoProxy @@ -65,7 +65,7 @@ If you are uncertain whether or not you need to use a proxy server to connect to Connect to the Internet directly. - + rbAutoDiscover @@ -83,7 +83,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro </qt> - + rbAutoScript @@ -97,7 +97,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro Use the specified proxy script URL to configure the proxy settings. - + layout5 @@ -115,7 +115,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro Fixed - + 16 20 @@ -143,7 +143,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro - + layout7 @@ -151,7 +151,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro unnamed - + rbEnvVar @@ -176,7 +176,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX </qt> - + pbEnvSetup @@ -192,7 +192,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX - + layout6 @@ -200,7 +200,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX unnamed - + rbManual @@ -222,7 +222,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX Manually enter proxy server configuration information. - + pbManSetup @@ -240,7 +240,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX - + gbAuth @@ -254,7 +254,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX unnamed - + rbPrompt @@ -268,7 +268,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX Prompt for login information whenever it is required. - + rbPresetLogin @@ -282,7 +282,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX Use the information below to login into proxy servers as needed. - + layout5 @@ -300,7 +300,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX Fixed - + 16 20 @@ -332,7 +332,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX Login name. - + lbPassword @@ -346,7 +346,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX Login password. - + lbUsername @@ -364,7 +364,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX - + gbOptions @@ -378,7 +378,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX unnamed - + cbPersConn 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 @@ ManualProxyDlgUI - + ManualProxyDlgUI @@ -19,7 +19,7 @@ 0 - + gbServers @@ -30,7 +30,7 @@ unnamed - + lbFtp @@ -49,7 +49,7 @@ leFtp - + lbHttps @@ -68,7 +68,7 @@ leHttps - + lbHttp @@ -137,7 +137,7 @@ sbHttp - + 32767 32767 @@ -160,14 +160,14 @@ Minimum - + 51 20 - + cbSameProxy @@ -175,7 +175,7 @@ &Use the same proxy server for all protocols - + pbCopyDown @@ -185,7 +185,7 @@ - + gbExceptions @@ -196,7 +196,7 @@ unnamed - + cbReverseProxy @@ -209,7 +209,7 @@ Reverse the use of the exception list. Checking this box will result in the prox </qt> - + layout2 @@ -217,7 +217,7 @@ Reverse the use of the exception list. Checking this box will result in the prox unnamed - + pbDeleteAll @@ -231,7 +231,7 @@ Reverse the use of the exception list. Checking this box will result in the prox Remove all proxy exception addresses from the list. - + pbDelete @@ -245,7 +245,7 @@ Reverse the use of the exception list. Checking this box will result in the prox Remove the selected proxy exception address from the list. - + pbNew @@ -256,7 +256,7 @@ Reverse the use of the exception list. Checking this box will result in the prox Add new proxy exception address to the list. - + pbChange @@ -280,7 +280,7 @@ Reverse the use of the exception list. Checking this box will result in the prox Expanding - + 20 114 diff --git a/kcontrol/kio/policydlg.cpp b/kcontrol/kio/policydlg.cpp index 463806266..316fd7e80 100644 --- a/kcontrol/kio/policydlg.cpp +++ b/kcontrol/kio/policydlg.cpp @@ -30,7 +30,7 @@ #include "policydlg_ui.h" -class DomainLineValidator : public QValidator +class DomainLineValidator : public TQValidator { public: DomainLineValidator(TQObject *parent) @@ -63,14 +63,14 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent, m_dlgUI = new PolicyDlgUI (this); setMainWidget(m_dlgUI); - m_dlgUI->leDomain->setValidator(new DomainLineValidator(m_dlgUI->leDomain)); + m_dlgUI->leDomain->setValidator(new DomainLineValidator(TQT_TQOBJECT(m_dlgUI->leDomain))); m_dlgUI->cbPolicy->setMinimumWidth( m_dlgUI->cbPolicy->fontMetrics().maxWidth() * 25 ); enableButtonOK( false ); connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged(const TQString&))); - setFixedSize (sizeHint()); + setFixedSize (tqsizeHint()); m_dlgUI->leDomain->setFocus (); } diff --git a/kcontrol/kio/policydlg.h b/kcontrol/kio/policydlg.h index 2bf7a4c99..17616860f 100644 --- a/kcontrol/kio/policydlg.h +++ b/kcontrol/kio/policydlg.h @@ -52,11 +52,11 @@ public: if (advice.isEmpty()) return KCookieAdvice::Dunno; - if (advice.find (TQString::fromLatin1("accept"), 0, false) == 0) + if (advice.tqfind (TQString::tqfromLatin1("accept"), 0, false) == 0) return KCookieAdvice::Accept; - else if (advice.find (TQString::fromLatin1("reject"), 0, false) == 0) + else if (advice.tqfind (TQString::tqfromLatin1("reject"), 0, false) == 0) return KCookieAdvice::Reject; - else if (advice.find (TQString::fromLatin1("ask"), 0, false) == 0) + else if (advice.tqfind (TQString::tqfromLatin1("ask"), 0, false) == 0) return KCookieAdvice::Ask; return KCookieAdvice::Dunno; diff --git a/kcontrol/kio/policydlg_ui.ui b/kcontrol/kio/policydlg_ui.ui index 1bae63208..015359829 100644 --- a/kcontrol/kio/policydlg_ui.ui +++ b/kcontrol/kio/policydlg_ui.ui @@ -1,6 +1,6 @@ PolicyDlgUI - + PolicyDlgUI @@ -19,7 +19,7 @@ 0 - + lbDomain @@ -45,7 +45,7 @@ Enter the host or domain to which this policy applies, e.g. <b>www.kde.org </qt> - + lbPolicy diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp index 90dfd9170..e5337cbf2 100644 --- a/kcontrol/kio/smbrodlg.cpp +++ b/kcontrol/kio/smbrodlg.cpp @@ -101,7 +101,7 @@ void SMBRoOptions::load() // TQStringList _strList = KGlobal::charsets()->availableEncodingNames(); // TQString m_encoding = TQTextCodec::codecForLocale()->name(); -// m_encodingList->setCurrentItem( _strList.findIndex( cfg->readEntry( "Encoding", m_encoding.lower() ) ) ); +// m_encodingList->setCurrentItem( _strList.tqfindIndex( cfg->readEntry( "Encoding", m_encoding.lower() ) ) ); // unscramble TQString scrambled = cfg->readEntry( "Password" ); @@ -140,7 +140,7 @@ void SMBRoOptions::save() for (uint i=0; i> 10; unsigned int a2 = (num & 0x3E0) >> 5; unsigned int a3 = (num & 0x1F); diff --git a/kcontrol/kio/socksbase.ui b/kcontrol/kio/socksbase.ui index 5def84076..3065ab229 100644 --- a/kcontrol/kio/socksbase.ui +++ b/kcontrol/kio/socksbase.ui @@ -1,6 +1,6 @@ SocksBase - + SocksBase @@ -26,7 +26,7 @@ 0 - + _c_enableSocks @@ -37,7 +37,7 @@ Check this to enable SOCKS4 and SOCKS5 support in KDE applications and I/O subsystems. - + bg @@ -51,7 +51,7 @@ unnamed - + _c_detect @@ -65,7 +65,7 @@ If you select Autodetect, then KDE will automatically search for an implementation of SOCKS on your computer. - + _c_NEC @@ -79,7 +79,7 @@ This will force KDE to use NEC SOCKS if it can be found. - + _c_custom @@ -93,7 +93,7 @@ Select custom if you wish to use an unlisted SOCKS library. Please note that this may not always work as it depends on the API of the library which you specify (below). - + Layout6 @@ -101,7 +101,7 @@ unnamed - + _c_customLabel @@ -127,7 +127,7 @@ _c_customPath - + 0 20 @@ -139,7 +139,7 @@ - + _c_Dante @@ -155,7 +155,7 @@ - + _c_addPaths @@ -180,7 +180,7 @@ unnamed - + Path @@ -211,14 +211,14 @@ _c_newPath - + 0 25 - + Layout1 @@ -236,14 +236,14 @@ MinimumExpanding - + 20 20 - + _c_add @@ -251,7 +251,7 @@ &Add - + _c_remove @@ -263,7 +263,7 @@ - + Layout2 @@ -281,14 +281,14 @@ Expanding - + 20 0 - + _c_test diff --git a/kcontrol/kio/uagentproviderdlg.cpp b/kcontrol/kio/uagentproviderdlg.cpp index 9e945948d..adab4b611 100644 --- a/kcontrol/kio/uagentproviderdlg.cpp +++ b/kcontrol/kio/uagentproviderdlg.cpp @@ -47,7 +47,7 @@ void UALineEdit::keyPressEvent( TQKeyEvent* e ) TQString keycode = e->text(); if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period || (cursorPosition() > 0 && key == Qt::Key_Minus) || - (!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) ) + (!keycode.isEmpty() && keycode.tqunicode()->isLetterOrNumber()) ) { KLineEdit::keyPressEvent(e); return; @@ -121,7 +121,7 @@ void UAProviderDlg::setSiteName( const TQString& text ) void UAProviderDlg::setIdentity( const TQString& text ) { - int id = dlg->cbAlias->listBox()->index( dlg->cbAlias->listBox()->findItem(text) ); + int id = dlg->cbAlias->listBox()->index( dlg->cbAlias->listBox()->tqfindItem(text) ); dlg->cbAlias->setCurrentItem( id ); slotActivated( dlg->cbAlias->currentText() ); if ( !dlg->leSite->isEnabled() ) diff --git a/kcontrol/kio/uagentproviderdlg_ui.ui b/kcontrol/kio/uagentproviderdlg_ui.ui index 6f2a006ec..7bf590208 100644 --- a/kcontrol/kio/uagentproviderdlg_ui.ui +++ b/kcontrol/kio/uagentproviderdlg_ui.ui @@ -1,6 +1,6 @@ UAProviderDlgUI - + UAProviderDlgUI @@ -24,7 +24,7 @@ unnamed - + lbSite @@ -52,7 +52,7 @@ Enter the site or domain name where a fake browser identification should be used </qt> - + lbAlias @@ -78,7 +78,7 @@ Select the browser identification to use whenever contacting the site you specif </qt> - + lbIdentity @@ -117,14 +117,14 @@ The actual browser identification text that will be sent to the remote machine. MinimumExpanding - + 21 16 - + layout3 @@ -142,14 +142,14 @@ The actual browser identification text that will be sent to the remote machine. MinimumExpanding - + 29 20 - + pbOk @@ -160,7 +160,7 @@ The actual browser identification text that will be sent to the remote machine. &OK - + pbCancel diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp index c34d5cadc..26476d9a8 100644 --- a/kcontrol/kio/useragentdlg.cpp +++ b/kcontrol/kio/useragentdlg.cpp @@ -111,12 +111,12 @@ void UserAgentDlg::load() dlg->cbSendUAString->setChecked( b ); m_ua_keys = m_config->readEntry("UserAgentKeys", DEFAULT_USER_AGENT_KEYS).lower(); dlg->leDefaultId->setSqueezedText( KProtocolManager::defaultUserAgent( m_ua_keys ) ); - dlg->cbOS->setChecked( m_ua_keys.contains('o') ); - dlg->cbOSVersion->setChecked( m_ua_keys.contains('v') ); - dlg->cbOSVersion->setEnabled( m_ua_keys.contains('o') ); - dlg->cbPlatform->setChecked( m_ua_keys.contains('p') ); - dlg->cbProcessorType->setChecked( m_ua_keys.contains('m') ); - dlg->cbLanguage->setChecked( m_ua_keys.contains('l') ); + dlg->cbOS->setChecked( m_ua_keys.tqcontains('o') ); + dlg->cbOSVersion->setChecked( m_ua_keys.tqcontains('v') ); + dlg->cbOSVersion->setEnabled( m_ua_keys.tqcontains('o') ); + dlg->cbPlatform->setChecked( m_ua_keys.tqcontains('p') ); + dlg->cbProcessorType->setChecked( m_ua_keys.tqcontains('m') ); + dlg->cbLanguage->setChecked( m_ua_keys.tqcontains('l') ); updateButtons(); emit changed( false ); } @@ -135,12 +135,12 @@ void UserAgentDlg::defaults() dlg->lvDomainPolicyList->clear(); m_ua_keys = DEFAULT_USER_AGENT_KEYS; dlg->leDefaultId->setSqueezedText( KProtocolManager::defaultUserAgent(m_ua_keys) ); - dlg->cbOS->setChecked( m_ua_keys.contains('o') ); - dlg->cbOSVersion->setChecked( m_ua_keys.contains('v') ); - dlg->cbOSVersion->setEnabled( m_ua_keys.contains('o') ); - dlg->cbPlatform->setChecked( m_ua_keys.contains('p') ); - dlg->cbProcessorType->setChecked( m_ua_keys.contains('m') ); - dlg->cbLanguage->setChecked( m_ua_keys.contains('l') ); + dlg->cbOS->setChecked( m_ua_keys.tqcontains('o') ); + dlg->cbOSVersion->setChecked( m_ua_keys.tqcontains('v') ); + dlg->cbOSVersion->setEnabled( m_ua_keys.tqcontains('o') ); + dlg->cbPlatform->setChecked( m_ua_keys.tqcontains('p') ); + dlg->cbProcessorType->setChecked( m_ua_keys.tqcontains('m') ); + dlg->cbLanguage->setChecked( m_ua_keys.tqcontains('l') ); dlg->cbSendUAString->setChecked( true ); updateButtons(); configChanged(); @@ -351,7 +351,7 @@ void UserAgentDlg::changeDefaultUAModifiers( int ) if ( dlg->cbLanguage->isChecked() ) m_ua_keys += 'l'; - dlg->cbOSVersion->setEnabled(m_ua_keys.contains('o')); + dlg->cbOSVersion->setEnabled(m_ua_keys.tqcontains('o')); TQString modVal = KProtocolManager::defaultUserAgent( m_ua_keys ); if ( dlg->leDefaultId->text() != modVal ) diff --git a/kcontrol/kio/useragentdlg_ui.ui b/kcontrol/kio/useragentdlg_ui.ui index 0db2a2440..73b9dfd2e 100644 --- a/kcontrol/kio/useragentdlg_ui.ui +++ b/kcontrol/kio/useragentdlg_ui.ui @@ -1,6 +1,6 @@ UserAgentDlgUI - + UserAgentDlgUI @@ -25,7 +25,7 @@ To add a new site specific identification text, click the <code>New</co 0 - + cbSendUAString @@ -43,7 +43,7 @@ By default, only minimal identification information is sent to remote sites. The </qt> - + gbDefaultId @@ -88,7 +88,7 @@ By default, only minimal identification information is sent to remote sites. The The browser identification text sent to the sites you visit. You can customize it using the options provided below. - + cbOS @@ -99,7 +99,7 @@ By default, only minimal identification information is sent to remote sites. The Includes your operating system's name in the browser identification text. - + layout2 @@ -117,14 +117,14 @@ By default, only minimal identification information is sent to remote sites. The Fixed - + 16 20 - + cbOSVersion @@ -140,7 +140,7 @@ By default, only minimal identification information is sent to remote sites. The - + cbPlatform @@ -151,7 +151,7 @@ By default, only minimal identification information is sent to remote sites. The Includes your platform type in the browser identification text - + cbProcessorType @@ -162,7 +162,7 @@ By default, only minimal identification information is sent to remote sites. The Includes your machine's CPU type in the browser identification text. - + cbLanguage @@ -175,7 +175,7 @@ By default, only minimal identification information is sent to remote sites. The - + gbDomainPolicy @@ -248,7 +248,7 @@ By default, only minimal identification information is sent to remote sites. The List of sites for which the specified identification text will be used instead of the default one. - + layout1 @@ -256,7 +256,7 @@ By default, only minimal identification information is sent to remote sites. The unnamed - + pbNew @@ -267,7 +267,7 @@ By default, only minimal identification information is sent to remote sites. The Add new identification text for a site. - + pbChange @@ -278,7 +278,7 @@ By default, only minimal identification information is sent to remote sites. The Change the selected identifier text. - + pbDelete @@ -289,7 +289,7 @@ By default, only minimal identification information is sent to remote sites. The Delete the selected identifier text. - + pbDeleteAll @@ -310,7 +310,7 @@ By default, only minimal identification information is sent to remote sites. The Expanding - + 21 16 diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index edfa28e48..f229e7f24 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -298,7 +298,7 @@ void PlayerSettingsDialog::slotApply() save(); dataChanged = false; enableButton(Apply, false); - kapp->dcopClient()->send("knotify", "", "reconfigure()", ""); + kapp->dcopClient()->send("knotify", "", "reconfigure()", TQString("")); KDialogBase::slotApply(); } diff --git a/kcontrol/knotify/playersettings.ui b/kcontrol/knotify/playersettings.ui index f990fc995..9eaad64af 100644 --- a/kcontrol/knotify/playersettings.ui +++ b/kcontrol/knotify/playersettings.ui @@ -1,6 +1,6 @@ PlayerSettingsUI - + PlayerSettingsUI @@ -19,7 +19,7 @@ 0 - + textLabel1 @@ -41,7 +41,7 @@ Horizontal - + grpPlayers @@ -58,7 +58,7 @@ 0 - + cbNone @@ -66,7 +66,7 @@ &No audio output - + cbExternal @@ -84,14 +84,14 @@ Fixed - + 20 20 - + layout5 @@ -109,14 +109,14 @@ Expanding - + 20 20 - + layout4 @@ -140,14 +140,14 @@ Expanding - + 233 20 - + textLabel3 @@ -155,7 +155,7 @@ 100% - + textLabel2 @@ -163,7 +163,7 @@ 0% - + volumeSlider @@ -182,7 +182,7 @@ - + textLabel4 @@ -205,14 +205,14 @@ Fixed - + 20 20 - + cbArts @@ -223,7 +223,7 @@ true - + textLabel5 @@ -265,7 +265,7 @@ Expanding - + 20 16 diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index af6c12cc4..c68ac6681 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -58,7 +58,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget * winPixmap->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); winPixmap->setPixmap(TQPixmap(locate("data", "kcontrol/pics/onlyone.png"))); - winPixmap->setFixedSize( winPixmap->sizeHint() ); + winPixmap->setFixedSize( winPixmap->tqsizeHint() ); // ---- @@ -103,7 +103,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget * TQHBox *hboxpreview = new TQHBox(vbox); TQWidget* spacer = new TQWidget( hboxpreview ); spacer->setMinimumSize( 20, 0 ); - spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); + spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview ); connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index 98275995c..e7d333537 100644 --- a/kcontrol/konq/desktop.cpp +++ b/kcontrol/konq/desktop.cpp @@ -87,7 +87,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) // name group TQGroupBox *name_group = new TQGroupBox(i18n("Desktop &Names"), this); - name_group->setColumnLayout(4, Horizontal); + name_group->setColumnLayout(4, Qt::Horizontal); for(int i = 0; i < (maxDesktops/2); i++) { diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui index 6e614b022..12537d56a 100644 --- a/kcontrol/konq/desktopbehavior.ui +++ b/kcontrol/konq/desktopbehavior.ui @@ -1,6 +1,6 @@ DesktopBehaviorBase - + DesktopBehaviorBase @@ -22,11 +22,11 @@ 0 - + behaviorTab - + tab @@ -37,7 +37,7 @@ unnamed - + iconsEnabledBox @@ -56,7 +56,7 @@ Uncheck this option if you do not want to have icons on the desktop. Without icons the desktop will be somewhat faster but you will no longer be able to drag files to the desktop. - + layout1 @@ -74,14 +74,14 @@ Fixed - + 20 0 - + vrootBox @@ -97,7 +97,7 @@ - + toolTipBox @@ -105,7 +105,7 @@ Show &tooltips - + desktopMenuGroup @@ -116,7 +116,7 @@ unnamed - + radioButton1 @@ -127,7 +127,7 @@ If this option is selected, there is no menu bar at the top of the screen. - + radioButton1_2 @@ -138,7 +138,7 @@ If this option is selected, there is one menu bar at the top of the screen which shows the desktop menus. - + radioButton1_3 @@ -151,7 +151,7 @@ - + groupBox3 @@ -162,7 +162,7 @@ unnamed - + middleLabel @@ -170,7 +170,7 @@ Middle button: - + leftLabel @@ -178,7 +178,7 @@ Left button: - + rightLabel @@ -186,7 +186,7 @@ Right button: - + rightComboBox @@ -199,7 +199,7 @@ - + leftComboBox @@ -212,7 +212,7 @@ - + leftEditButton @@ -223,7 +223,7 @@ Edit... - + middleComboBox @@ -236,7 +236,7 @@ - + middleEditButton @@ -247,7 +247,7 @@ Edit... - + rightEditButton @@ -268,7 +268,7 @@ Expanding - + 191 80 @@ -287,7 +287,7 @@ Expanding - + 20 16 @@ -296,7 +296,7 @@ - + tab @@ -307,7 +307,7 @@ unnamed - + autoLineupIconsBox @@ -318,7 +318,7 @@ Check this option if you want to see your icons automatically aligned to the grid when you move them. - + showHiddenBox @@ -354,7 +354,7 @@ - + tab @@ -365,7 +365,7 @@ unnamed - + enableMediaBox diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 6b4aaadb0..ab84300d4 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -60,7 +60,7 @@ void DesktopBehaviorModule::changed() emit KCModule::changed( true ); } -class DesktopBehaviorPreviewItem : public QCheckListItem +class DesktopBehaviorPreviewItem : public TQCheckListItem { public: DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, TQListView *parent, @@ -90,7 +90,7 @@ private: }; -class DesktopBehaviorMediaItem : public QCheckListItem +class DesktopBehaviorMediaItem : public TQCheckListItem { public: DesktopBehaviorMediaItem(DesktopBehavior *rootOpts, TQListView *parent, @@ -124,7 +124,7 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * */ bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); - m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media")); + m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media")); connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed())); connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); @@ -144,8 +144,8 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * if ( leftHandedMouse ) { - qSwap(strMouseButton1, strMouseButton3); - qSwap(strButtonTxt1, strButtonTxt3); + tqSwap(strMouseButton1, strMouseButton3); + tqSwap(strButtonTxt1, strButtonTxt3); } leftLabel->setText( strMouseButton1 ); @@ -259,7 +259,7 @@ void DesktopBehavior::fillMediaListView() for (; it2 != mimetypes.end(); ++it2) { if ( ((*it2)->name().startsWith("media/")) ) { - bool ok=excludedMedia.contains((*it2)->name())==0; + bool ok=excludedMedia.tqcontains((*it2)->name())==0; new DesktopBehaviorMediaItem (this, mediaListView, (*it2)->comment(), (*it2)->name(),ok); } } @@ -309,8 +309,8 @@ void DesktopBehavior::load( bool useDefaults ) previewListView->clear(); TQStringList previews = g_pConfig->readListEntry("Preview"); for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) - new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName())); - new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/")); + new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.tqcontains((*it)->desktopEntryName())); + new DesktopBehaviorPreviewItem(this, previewListView, previews.tqcontains("audio/")); // g_pConfig->setGroup( "FMSettings" ); toolTipBox->setChecked(g_pConfig->readBoolEntry( "ShowFileTips", true ) ); diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index 98c804adc..07ee4663e 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -94,7 +94,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop, m_pNormalText = new KColorButton( normalTextColor, this ); label = new TQLabel( m_pNormalText, i18n("Normal te&xt color:"), this ); lay->addWidget(label,row,0); - lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,hAlign); + lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,(TQ_Alignment)hAlign); wtstr = i18n("This is the color used to display text in Konqueror windows."); TQWhatsThis::add( label, wtstr ); @@ -129,7 +129,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop, TQT_SLOT( slotTextBackgroundClicked() ) ); m_pTextBackground = new KColorButton( textBackgroundColor, this ); - lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,hAlign); + lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(TQ_Alignment)hAlign); wtstr = i18n("This is the color used behind the text for the icons on the desktop."); TQWhatsThis::add( label, wtstr ); @@ -179,7 +179,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop, } cbUnderline = new TQCheckBox(i18n("&Underline filenames"), this); - lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,hAlign); + lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign); connect(cbUnderline, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); TQWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames" @@ -192,7 +192,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop, row++; m_pSizeInBytes = new TQCheckBox(i18n("Display file sizes in b&ytes"), this); - lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,hAlign ); + lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign ); connect( m_pSizeInBytes, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()) ); TQWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes" diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index 0e3ea0861..cbe4d40a7 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -39,7 +39,7 @@ //----------------------------------------------------------------------------- -class PreviewCheckListItem : public QCheckListItem +class PreviewCheckListItem : public TQCheckListItem { public: PreviewCheckListItem( TQListView *parent, const TQString &text ) @@ -198,7 +198,7 @@ void KPreviewOptions::save() group.writeEntry( protocol, it.current()->isOn(), true, true ); } // config key is in bytes, numinput is in MB - group.writeEntry( "MaximumSize", qRound( m_maxSize->value() *1024*1024 ), true, true ); + group.writeEntry( "MaximumSize", tqRound( m_maxSize->value() *1024*1024 ), true, true ); group.writeEntry( "BoostSize", m_boostSize->isChecked(), true, true ); group.writeEntry( "UseFileThumbnails", m_useFileThumbnails->isChecked(), true, true ); group.sync(); diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index f4111cfda..4576433a9 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -286,7 +286,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt KIO::ListJob* job = KIO::listDir( src ); connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ), this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) ); - qApp->enter_loop(); + tqApp->enter_loop(); if (m_ok) { @@ -298,7 +298,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt KIO::Job * job = KIO::move( src, dest ); connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); // wait for job - qApp->enter_loop(); + tqApp->enter_loop(); } } kdDebug() << "DesktopPathConfig::slotResult returning " << m_ok << endl; @@ -325,9 +325,9 @@ void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& li KIO::Job * moveJob = KIO::move( file.url(), m_copyToDest ); connect( moveJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); - qApp->enter_loop(); + tqApp->enter_loop(); } - qApp->exit_loop(); + tqApp->exit_loop(); } void DesktopPathConfig::slotResult( KIO::Job * job ) @@ -341,7 +341,7 @@ void DesktopPathConfig::slotResult( KIO::Job * job ) job->showErrorDialog(this); } - qApp->exit_loop(); + tqApp->exit_loop(); } #include "rootopts.moc" diff --git a/kcontrol/konqhtml/advancedTabOptions.ui b/kcontrol/konqhtml/advancedTabOptions.ui index 7116bc1ee..5df531f10 100644 --- a/kcontrol/konqhtml/advancedTabOptions.ui +++ b/kcontrol/konqhtml/advancedTabOptions.ui @@ -1,6 +1,6 @@ advancedTabOptions - + advancedTabOptions @@ -19,7 +19,7 @@ 0 - + TextLabel3 @@ -41,7 +41,7 @@ Horizontal - + layout @@ -49,7 +49,7 @@ unnamed - + m_pNewTabsInBackground @@ -60,7 +60,7 @@ This will open a new tab in the background, instead of in the foreground. - + m_pOpenAfterCurrentPage @@ -71,7 +71,7 @@ This will open a new tab opened from a page after the current tab, instead of after the last tab. - + m_pTabConfirm @@ -82,7 +82,7 @@ This will ask you whether you are sure you want to close a window when it has multiple tabs opened in it. - + m_pPermanentCloseButton @@ -93,7 +93,7 @@ This will display close buttons inside each tab instead of websites' icons. - + m_pPopupsWithinTabs @@ -104,7 +104,7 @@ Whether or not JavaScript popups if allowed shall open in a new tab or in a new window. - + m_pTabCloseActivatePrevious @@ -115,7 +115,7 @@ When checking this the previous used or opened tab will be activated when you close the current active tab instead of the one right to the current tab. - + m_pKonquerorTabforExternalURL @@ -138,7 +138,7 @@ Expanding - + 20 0 diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index 0c15acebe..8c832e770 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -40,7 +40,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget int r = 0; int E = 0, M = 1, W = 3; //CT 3 (instead 2) allows smaller color buttons - TQGroupBox* gb = new TQGroupBox( 1, TQGroupBox::Horizontal, i18n("Font Si&ze"), this ); + TQGroupBox* gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Font Si&ze"), this ); lay->addMultiCellWidget(gb, r, r, E, W); TQWhatsThis::add( gb, i18n("This is the relative font size Konqueror uses to display web sites.") ); @@ -231,7 +231,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget TQFontDatabase db; - m_families = db.families(); + m_families = db.tqfamilies(); m_pFonts[0]->setFonts( m_families ); m_pFonts[1]->setFonts( m_families ); diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index 29dccb14b..a2c7ceb53 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -39,7 +39,7 @@ DomainListView::DomainListView(KConfig *config,const TQString &title, layout()->setSpacing(0); layout()->setMargin(0); TQGridLayout* thisLayout = new TQGridLayout(layout()); - thisLayout->setAlignment(Qt::AlignTop); + thisLayout->tqsetAlignment(Qt::AlignTop); thisLayout->setSpacing(KDialog::spacingHint()); thisLayout->setMargin(KDialog::marginHint()); @@ -163,7 +163,7 @@ void DomainListView::deletePressed() return; } - DomainPolicyMap::Iterator it = domainPolicies.find(index); + DomainPolicyMap::Iterator it = domainPolicies.tqfind(index); if (it != domainPolicies.end()) { delete it.data(); domainPolicies.remove(it); diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp index 79ab4d45a..c7bb2bdbd 100644 --- a/kcontrol/konqhtml/filteropts.cpp +++ b/kcontrol/konqhtml/filteropts.cpp @@ -55,7 +55,7 @@ KCMFilter::KCMFilter(KConfig *config, TQString group, mKillCheck = new TQCheckBox(i18n("Hide filtered images"), this); topLayout->addWidget( mKillCheck ); - TQGroupBox *topBox = new TQGroupBox( 1, Horizontal, i18n("URL Expressions to Filter"), this ); + TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("URL Expressions to Filter"), this ); topLayout->addWidget( topBox ); mListBox = new TQListBox( topBox ); @@ -189,7 +189,7 @@ void KCMFilter::importFilters() } } - if (!line.isEmpty() && mListBox->findItem(line, Qt::CaseSensitive|Qt::ExactMatch) == 0) + if (!line.isEmpty() && mListBox->tqfindItem(line, TQt::CaseSensitive|TQt::ExactMatch) == 0) paths.append(line); } f.close(); @@ -267,7 +267,7 @@ void KCMFilter::load( bool useDefaults ) for (int i=0; ilayout(), KDialog::spacingHint() ); + TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->tqlayout(), KDialog::spacingHint() ); m_pShowMMBInTabs = new TQCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing ); TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, " @@ -108,7 +108,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa TQVGroupBox *bgMouse = new TQVGroupBox( i18n("Mouse Beha&vior"), this ); m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse ); - TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change " + TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the tqshape of the cursor will change " "(usually to a hand) if it is moved over a hyperlink.") ); connect(m_cbCursor, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp index ae73fc686..e50224f53 100644 --- a/kcontrol/konqhtml/jsopts.cpp +++ b/kcontrol/konqhtml/jsopts.cpp @@ -45,7 +45,7 @@ KJavaScriptOptions::KJavaScriptOptions( KConfig* config, TQString group, TQWidge TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10, 5 ); // the global checkbox - TQGroupBox* globalGB = new TQGroupBox( 2, Vertical, i18n( "Global Settings" ), this ); + TQGroupBox* globalGB = new TQGroupBox( 2, Qt::Vertical, i18n( "Global Settings" ), this ); toplevel->addWidget( globalGB ); enableJavaScriptGloballyCB = new TQCheckBox( i18n( "Ena&ble JavaScript globally" ), globalGB ); diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp index 5196af8dd..eeedca18a 100644 --- a/kcontrol/konqhtml/jspolicies.cpp +++ b/kcontrol/konqhtml/jspolicies.cpp @@ -136,7 +136,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, layout()->setSpacing(0); layout()->setMargin(0); TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2); - this_layout->setAlignment(Qt::AlignTop); + this_layout->tqsetAlignment(Qt::AlignTop); this_layout->setSpacing(3); this_layout->setMargin(11); @@ -362,19 +362,19 @@ JSPoliciesFrame::~JSPoliciesFrame() { void JSPoliciesFrame::refresh() { TQRadioButton *button; - button = static_cast(js_popup->find( + button = static_cast(js_popup->tqfind( policies->window_open)); if (button != 0) button->setChecked(true); - button = static_cast(js_resize->find( + button = static_cast(js_resize->tqfind( policies->window_resize)); if (button != 0) button->setChecked(true); - button = static_cast(js_move->find( + button = static_cast(js_move->tqfind( policies->window_move)); if (button != 0) button->setChecked(true); - button = static_cast(js_focus->find( + button = static_cast(js_focus->tqfind( policies->window_focus)); if (button != 0) button->setChecked(true); - button = static_cast(js_statusbar->find( + button = static_cast(js_statusbar->tqfind( policies->window_status)); if (button != 0) button->setChecked(true); } diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui index d772595c2..23e4ac881 100644 --- a/kcontrol/konqhtml/nsconfigwidget.ui +++ b/kcontrol/konqhtml/nsconfigwidget.ui @@ -1,7 +1,7 @@ NSConfigWidget Stefan Schimanski <1Stein@gmx.de> - + NSConfigWidget @@ -28,11 +28,11 @@ 6 - + TabWidget2 - + tab @@ -43,7 +43,7 @@ unnamed - + Layout1 @@ -51,7 +51,7 @@ unnamed - + scanButton @@ -72,7 +72,7 @@ Expanding - + 20 20 @@ -81,7 +81,7 @@ - + scanAtStartup @@ -92,11 +92,11 @@ If this option is enabled, KDE will look for new Netscape plugins every time it starts up. This makes it easier for you if you often install new plugins, but it may also slow down KDE startup. You might want to disable this option, especially if you seldom install plugins. - + GroupBox1 - + 300 0 @@ -109,7 +109,7 @@ unnamed - + dirRemove @@ -120,7 +120,7 @@ &Remove - + dirNew @@ -139,7 +139,7 @@ 18 - + dirDown @@ -150,7 +150,7 @@ Do&wn - + dirUp @@ -184,7 +184,7 @@ Expanding - + 20 20 @@ -195,7 +195,7 @@ - + tab @@ -206,7 +206,7 @@ unnamed - + Information @@ -239,7 +239,7 @@ Here you can see a list of the Netscape plugins KDE has found. - + useArtsdsp @@ -264,7 +264,7 @@ - qwidget.h + tqwidget.h kurlrequester.h klineedit.h kpushbutton.h diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index d5cd4cc2b..8640a9991 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -61,8 +61,8 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren enablePluginsGloballyCB = new TQCheckBox( i18n( "&Enable plugins globally" ), globalGB ); enableHTTPOnly = new TQCheckBox( i18n( "Only allow &HTTP and HTTPS URLs for plugins" ), globalGB ); enableUserDemand = new TQCheckBox( i18n( "&Load plugins on demand only" ), globalGB ); - priorityLabel = new TQLabel(i18n("CPU priority for plugins: %1").arg(TQString::null), globalGB); - priority = new TQSlider(5, 100, 5, 100, Horizontal, globalGB); + priorityLabel = new TQLabel(i18n("CPU priority for plugins: %1").arg(TQString()), globalGB); + priority = new TQSlider(5, 100, 5, 100, Qt::Horizontal, globalGB); connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTogglePluginsEnabled() ) ); connect( enableHTTPOnly, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); @@ -72,14 +72,14 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren TQFrame *hrule = new TQFrame(globalGB); hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - hrule->setSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed); + hrule->tqsetSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed); /************************************************************************** ********************* Domain-specific Settings *************************** *************************************************************************/ TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"), globalGB); - domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + domainSpecPB->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg())); domainSpecificDlg = new KDialogBase(KDialogBase::Swallow, @@ -282,7 +282,7 @@ void KPluginOptions::scan() int ret = KMessageBox::warningYesNoCancel( this, i18n("Do you want to apply your changes " "before the scan? Otherwise the " - "changes will be lost."), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() ); + "changes will be lost."), TQString(), KStdGuiItem::save(), KStdGuiItem::discard() ); if ( ret==KMessageBox::Cancel ) { m_widget->scanButton->setEnabled(true); return; @@ -430,16 +430,16 @@ void KPluginOptions::dirSelect( TQListBoxItem *item ) unsigned cur = m_widget->dirList->index(m_widget->dirList->selectedItem()); m_widget->dirDown->setEnabled( item!=0 && curdirList->count()-1 ); m_widget->dirUp->setEnabled( item!=0 && cur>0 ); - m_widget->dirEdit->setURL( item!=0 ? item->text() : TQString::null ); + m_widget->dirEdit->setURL( item!=0 ? item->text() : TQString() ); } void KPluginOptions::dirNew() { - m_widget->dirList->insertItem( TQString::null, 0 ); + m_widget->dirList->insertItem( TQString(), 0 ); m_widget->dirList->setCurrentItem( 0 ); dirSelect( m_widget->dirList->selectedItem() ); - m_widget->dirEdit->setURL(TQString::null); + m_widget->dirEdit->setURL(TQString()); m_widget->dirEdit->setFocus(); change(); } @@ -447,7 +447,7 @@ void KPluginOptions::dirNew() void KPluginOptions::dirRemove() { - m_widget->dirEdit->setURL(TQString::null); + m_widget->dirEdit->setURL(TQString()); delete m_widget->dirList->selectedItem(); m_widget->dirRemove->setEnabled( false ); m_widget->dirUp->setEnabled( false ); diff --git a/kcontrol/konsole/kcmkonsoledialog.ui b/kcontrol/konsole/kcmkonsoledialog.ui index bb805ed4b..c6b5c04cb 100644 --- a/kcontrol/konsole/kcmkonsoledialog.ui +++ b/kcontrol/konsole/kcmkonsoledialog.ui @@ -1,6 +1,6 @@ KCMKonsoleDialog - + KCMKonsoleDialog @@ -23,7 +23,7 @@ 0 - + TabWidget2 @@ -34,7 +34,7 @@ - + tab @@ -55,14 +55,14 @@ Expanding - + 20 20 - + GroupBox3 @@ -73,7 +73,7 @@ unnamed - + TextLabel1_3 @@ -84,7 +84,7 @@ word_connectorLE - + word_connectorLE @@ -99,7 +99,7 @@ - + GroupBox2 @@ -110,7 +110,7 @@ unnamed - + terminalSizeHintCB @@ -118,7 +118,7 @@ Show terminal si&ze after resizing - + frameCB @@ -126,7 +126,7 @@ Show &frame - + warnCB @@ -134,7 +134,7 @@ &Confirm quit when closing more than one session - + blinkingCB @@ -142,7 +142,7 @@ &Blinking cursor - + ctrldragCB @@ -150,7 +150,7 @@ &Require Ctrl key for drag and drop - + cutToBeginningOfLineCB @@ -158,7 +158,7 @@ Triple click selects &only from the current word forward - + allowResizeCB @@ -166,7 +166,7 @@ Allow progr&ams to resize terminal window - + xonXoffCB @@ -184,14 +184,14 @@ Expanding - + 20 20 - + bidiCB @@ -199,7 +199,7 @@ Enable bidirectional text rendering - + SilenceLabel @@ -253,7 +253,7 @@ 8 - + TextLabel1_4 @@ -282,14 +282,14 @@ Expanding - + 20 20 - + matchTabWinTitleCB @@ -301,7 +301,7 @@ - + tab @@ -319,7 +319,7 @@ - + tab diff --git a/kcontrol/konsole/schemadialog.ui b/kcontrol/konsole/schemadialog.ui index 64fda6a49..d99678904 100644 --- a/kcontrol/konsole/schemadialog.ui +++ b/kcontrol/konsole/schemadialog.ui @@ -1,6 +1,6 @@ SchemaDialog - + SchemaDialog @@ -26,7 +26,7 @@ 0 - + Layout2 @@ -34,7 +34,7 @@ unnamed - + TextLabel1 @@ -45,7 +45,7 @@ titleLine - + titleLine @@ -60,7 +60,7 @@ - + GroupBox1 @@ -79,7 +79,7 @@ unnamed - + TextLabel8 @@ -90,7 +90,7 @@ colorCombo - + boldCheck @@ -108,7 +108,7 @@ Expanding - + 20 20 @@ -123,7 +123,7 @@ - + Custom @@ -158,14 +158,14 @@ Fixed - + 20 20 - + transparentCheck @@ -173,7 +173,7 @@ Trans&parent - + TextLabel1_2 @@ -184,7 +184,7 @@ typeCombo - + 0 - Foreground Color @@ -299,7 +299,7 @@ - + GroupBox2 @@ -310,12 +310,12 @@ unnamed - + schemaList - + defaultSchemaCB @@ -323,7 +323,7 @@ S&et as default schema - + Layout3 @@ -331,7 +331,7 @@ unnamed - + saveButton @@ -339,7 +339,7 @@ Sa&ve Schema... - + removeButton @@ -357,7 +357,7 @@ Expanding - + 20 20 @@ -368,7 +368,7 @@ - + GroupBox13 @@ -389,19 +389,19 @@ Fixed - + 20 20 - + backgndLine - + imageBrowse @@ -409,7 +409,7 @@ ... - + Tiled @@ -429,7 +429,7 @@ modeCombo - + TextLabel11 @@ -440,7 +440,7 @@ modeCombo - + TextLabel6 @@ -448,7 +448,7 @@ Min - + shadeSlide @@ -459,7 +459,7 @@ Horizontal - + TextLabel5 @@ -467,7 +467,7 @@ Max - + TextLabel3 @@ -486,7 +486,7 @@ - + previewPixmap @@ -498,13 +498,13 @@ 0 - + 180 120 - + 180 120 @@ -520,7 +520,7 @@ true - + transparencyCheck @@ -540,7 +540,7 @@ Expanding - + 20 20 diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp index 17eaadc3c..fc9ddee3d 100644 --- a/kcontrol/konsole/schemaeditor.cpp +++ b/kcontrol/konsole/schemaeditor.cpp @@ -44,7 +44,7 @@ #include // SchemaListBoxText is a list box text item with schema filename -class SchemaListBoxText : public QListBoxText +class SchemaListBoxText : public TQListBoxText { public: SchemaListBoxText(const TQString &title, const TQString &filename): TQListBoxText(title) @@ -241,7 +241,7 @@ void SchemaEditor::loadAllSchema(TQString currentFile) TQString title = readSchemaTitle(name); // Only insert new items so that local items override global - if (schemaList->findItem(title, ExactMatch) == 0) { + if (schemaList->tqfindItem(title, ExactMatch) == 0) { if (title.isNull() || title.isEmpty()) title=i18n("untitled"); @@ -594,7 +594,7 @@ void SchemaEditor::readSchema(int num) continue; TQString qline(line); - backgndLine->setText(locate("wallpaper", qline.mid( qline.find(" ",7)+1 ) )); + backgndLine->setText(locate("wallpaper", qline.mid( qline.tqfind(" ",7)+1 ) )); modeCombo->setCurrentItem(attr - 2); } @@ -666,7 +666,7 @@ void SchemaEditor::readSchema(int num) continue; if (!(0 <= bo && bo <= 1)) continue; - color[fi] = kapp->palette().active().text(); + color[fi] = kapp->tqpalette().active().text(); transparent[fi] = tr; bold[fi] = bo; type[fi] = 1; @@ -681,7 +681,7 @@ void SchemaEditor::readSchema(int num) continue; if (!(0 <= bo && bo <= 1)) continue; - color[fi] = kapp->palette().active().base(); + color[fi] = kapp->tqpalette().active().base(); transparent[fi] = tr; bold[fi] = bo; type[fi] = 2; diff --git a/kcontrol/konsole/sessiondialog.ui b/kcontrol/konsole/sessiondialog.ui index a86a74077..066c9c69a 100644 --- a/kcontrol/konsole/sessiondialog.ui +++ b/kcontrol/konsole/sessiondialog.ui @@ -1,6 +1,6 @@ SessionDialog - + SessionDialog @@ -26,7 +26,7 @@ 0 - + layout8 @@ -34,7 +34,7 @@ unnamed - + propertiesGroup @@ -45,7 +45,7 @@ unnamed - + Layout29 @@ -53,7 +53,7 @@ unnamed - + <Default> @@ -111,7 +111,7 @@ false - + termLine @@ -124,12 +124,12 @@ - + keytabCombo - + TextLabel5 @@ -140,12 +140,12 @@ fontCombo - + schemaCombo - + TextLabel7 @@ -156,7 +156,7 @@ schemaCombo - + TextLabel8 @@ -167,7 +167,7 @@ termLine - + TextLabel6 @@ -184,13 +184,13 @@ previewIcon - + 100 100 - + 100 100 @@ -200,7 +200,7 @@ - + TextLabel4 @@ -212,7 +212,7 @@ 0 - + 90 100 @@ -221,7 +221,7 @@ &Icon: - + AlignTop|AlignLeft @@ -230,7 +230,7 @@ - + sessionGroup @@ -241,12 +241,12 @@ unnamed - + sessionList - + Layout3 @@ -254,7 +254,7 @@ unnamed - + saveButton @@ -262,7 +262,7 @@ Sa&ve Session... - + removeButton @@ -280,7 +280,7 @@ Expanding - + 20 20 @@ -291,7 +291,7 @@ - + generalGroup @@ -310,7 +310,7 @@ unnamed - + layout6 @@ -318,7 +318,7 @@ unnamed - + layout5 @@ -326,7 +326,7 @@ unnamed - + TextLabel1 @@ -345,7 +345,7 @@ nameLine - + TextLabel2 @@ -356,7 +356,7 @@ executeLine - + TextLabel3 @@ -369,7 +369,7 @@ - + layout4 @@ -377,7 +377,7 @@ unnamed - + nameLine @@ -390,7 +390,7 @@ - + executeLine diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp index 5cb1c9746..e93084af1 100644 --- a/kcontrol/konsole/sessioneditor.cpp +++ b/kcontrol/konsole/sessioneditor.cpp @@ -35,7 +35,7 @@ #include // SessionListBoxText is a list box text item with session filename -class SessionListBoxText : public QListBoxText +class SessionListBoxText : public TQListBoxText { public: SessionListBoxText(const TQString &title, const TQString &filename): TQListBoxText(title) diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index ccb906301..582937b8c 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -80,7 +80,7 @@ static void applyGtkStyles(bool active, int version) TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc)); if (list.count() == 0) { - list.append(TQString::fromLatin1(sysGtkrc(version))); + list.append(TQString::tqfromLatin1(sysGtkrc(version))); list.append(TQDir::homeDirPath()+userGtkrc(version)); } list.remove(gtkkde); @@ -174,10 +174,10 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings ) // end it with.. So keep a TQMap to bool, specifying whether the path is KDE-specified.. TQString qversion = qVersion(); - if ( qversion.contains( '.' ) > 1 ) - qversion.truncate( qversion.findRev( '.' ) ); - if ( qversion.contains( '-' ) ) - qversion.truncate( qversion.findRev( '-' ) ); + if ( qversion.tqcontains( '.' ) > 1 ) + qversion.truncate( qversion.tqfindRev( '.' ) ); + if ( qversion.tqcontains( '-' ) ) + qversion.truncate( qversion.tqfindRev( '-' ) ); TQStringList kdeAdded = settings.readListEntry("/qt/KDE/kdeAddedLibraryPaths"); @@ -220,8 +220,8 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings ) pathDb[path]=true; - if(path.contains("/lib64/")) - path.replace("/lib64/","/lib/"); + if(path.tqcontains("/lib64/")) + path.tqreplace("/lib64/","/lib/"); pathDb[path]=true; } @@ -347,7 +347,7 @@ static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version "# Appearance & Themes -> Colors in the Control Center and disable the checkbox\n" "# \"Apply colors to non-KDE applications\"\n" "#\n" - "#\n").arg(TQDateTime::currentDateTime().toString()); + "#\n").arg(TQDateTime::tqcurrentDateTime().toString()); t << "style \"default\"" << endl; t << "{" << endl; @@ -590,7 +590,7 @@ void runRdb( uint flags ) // Qt-only apps without adversely affecting ourselves. // Cheat and use the current timestamp, since we just saved to qtrc. - TQDateTime settingsstamp = TQDateTime::currentDateTime(); + TQDateTime settingsstamp = TQDateTime::tqcurrentDateTime(); static Atom qt_settings_timestamp = 0; if (!qt_settings_timestamp) { diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index b78a354be..92859de6c 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -48,7 +48,7 @@ KTheme::KTheme( TQWidget *parent, const TQString & xmlFile ) { TQFile file( xmlFile ); file.open( IO_ReadOnly ); - m_dom.setContent( file.readAll() ); + m_dom.setContent( TQByteArray(file.readAll()) ); file.close(); //kdDebug() << m_dom.toString( 2 ) << endl; @@ -107,7 +107,7 @@ bool KTheme::load( const KURL & url ) // create the DOM TQFile file( location + m_name + ".xml" ); file.open( IO_ReadOnly ); - m_dom.setContent( file.readAll() ); + m_dom.setContent( TQByteArray(file.readAll()) ); file.close(); // remove the temp file @@ -441,7 +441,7 @@ void KTheme::apply() DCOPClient *client = kapp->dcopClient(); if ( !client->isAttached() ) client->attach(); - client->send("kdesktop", "KBackgroundIface", "configure()", ""); + client->send("kdesktop", "KBackgroundIface", "configure()", TQString("")); // FIXME Xinerama // 3. Icons @@ -469,14 +469,14 @@ void KTheme::apply() iconConf->setGroup( "ToolbarIcons" ); TQString iconName = iconSubElem.tagName(); - if ( iconName.contains( "Color" ) ) + if ( iconName.tqcontains( "Color" ) ) { TQColor iconColor = TQColor( iconSubElem.attribute( "rgb" ) ); iconConf->writeEntry( iconName, iconColor, true, true ); } - else if ( iconName.contains( "Value" ) || iconName == "Size" ) + else if ( iconName.tqcontains( "Value" ) || iconName == "Size" ) iconConf->writeEntry( iconName, iconSubElem.attribute( "value" ).toUInt(), true, true ); - else if ( iconName.contains( "Effect" ) ) + else if ( iconName.tqcontains( "Effect" ) ) iconConf->writeEntry( iconName, iconSubElem.attribute( "name" ), true, true ); else iconConf->writeEntry( iconName, static_cast( iconSubElem.attribute( "value" ).toUInt() ), true, true ); @@ -516,7 +516,7 @@ void KTheme::apply() soundConf.sync(); kwinSoundConf.sync(); - client->send("knotify", "", "reconfigure()", ""); + client->send("knotify", "", "reconfigure()", TQString("")); // TODO signal kwin sounds change? } @@ -593,7 +593,7 @@ void KTheme::apply() kwinConf.writeEntry( "BorderSize", getProperty( wmElem, "border", "size" ) ); kwinConf.sync(); - client->send( "kwin", "", "reconfigure()", "" ); + client->send( "kwin", "", "reconfigure()", TQString("") ); } // 8. Konqueror @@ -607,7 +607,7 @@ void KTheme::apply() konqConf.writeEntry( "BgColor", TQColor( getProperty( konqElem, "bgcolor", "rgb" ) ) ); konqConf.sync(); - client->send("konqueror*", "KonquerorIface", "reparseConfiguration()", ""); // FIXME seems not to work :( + client->send("konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("")); // FIXME seems not to work :( } // 9. Kicker @@ -635,7 +635,7 @@ void KTheme::apply() kickerConf.writeEntry( "ShowRightHideButton", static_cast( getProperty( panelElem, "showrighthidebutton", "value").toInt())); kickerConf.sync(); - client->send("kicker", "Panel", "configure()", ""); + client->send("kicker", "Panel", "configure()", TQString("")); } // 10. Widget style @@ -720,7 +720,7 @@ TQString KTheme::getProperty( TQDomElement parent, const TQString & tag, else { kdWarning() << TQString( "No such property found: %1->%2->%3" ) - .arg( parent.tagName() ).arg( tag ).arg( attr ) << endl; + .tqarg( parent.tagName() ).tqarg( tag ).tqarg( attr ) << endl; return TQString::null; } } @@ -738,18 +738,18 @@ void KTheme::createIconElems( const TQString & group, const TQString & object, << "DisabledColor" << "DisabledColor2" << "DisabledEffect" << "DisabledSemiTransparent" << "DisabledValue"; for ( TQStringList::ConstIterator it = elemNames.begin(); it != elemNames.end(); ++it ) { - if ( (*it).contains( "Color" ) ) + if ( (*it).tqcontains( "Color" ) ) createColorElem( *it, object, parent, cfg ); else { TQDomElement tmpCol = m_dom.createElement( *it ); tmpCol.setAttribute( "object", object ); - if ( (*it).contains( "Value" ) || *it == "Size" ) + if ( (*it).tqcontains( "Value" ) || *it == "Size" ) tmpCol.setAttribute( "value", cfg->readNumEntry( *it, 1 ) ); - else if ( (*it).contains( "DisabledEffect" ) ) + else if ( (*it).tqcontains( "DisabledEffect" ) ) tmpCol.setAttribute( "name", cfg->readEntry( *it, "togray" ) ); - else if ( (*it).contains( "Effect" ) ) + else if ( (*it).tqcontains( "Effect" ) ) tmpCol.setAttribute( "name", cfg->readEntry( *it, "none" ) ); else tmpCol.setAttribute( "value", cfg->readBoolEntry( *it, false ) ); @@ -832,7 +832,7 @@ TQString KTheme::processFilePath( const TQString & section, const TQString & pat TQString KTheme::unprocessFilePath( const TQString & section, TQString path ) { if ( path.startsWith( "theme:/" ) ) - return path.replace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" ); + return path.tqreplace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" ); if ( TQFile::exists( path ) ) return path; diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui index 4b46fdc26..9fa86c2c0 100644 --- a/kcontrol/kthememanager/kthemedlg.ui +++ b/kcontrol/kthememanager/kthemedlg.ui @@ -1,7 +1,7 @@ KThemeDlg Lukas Tinkl <lukas@kde.org> - + KThemeDlg @@ -28,7 +28,7 @@ 0 - + layout2 @@ -36,7 +36,7 @@ unnamed - + textLabel1 @@ -60,7 +60,7 @@ MinimumExpanding - + 170 20 @@ -86,7 +86,7 @@ - + layout1 @@ -94,7 +94,7 @@ unnamed - + lbPreview @@ -109,11 +109,11 @@ Box - + AlignCenter - + btnRemove @@ -121,7 +121,7 @@ &Remove Theme - + btnCreate @@ -129,7 +129,7 @@ Create &New Theme... - + btnInstall @@ -137,7 +137,7 @@ &Install New Theme... - + Theme @@ -183,7 +183,7 @@ Horizontal - + textLabel1_2 @@ -191,7 +191,7 @@ Customize your theme: - + layout4 @@ -199,7 +199,7 @@ unnamed - + btnBackground @@ -211,13 +211,13 @@ 0 - + 80 60 - + 32767 60 @@ -239,7 +239,7 @@ Customize the desktop background - + btnColors @@ -251,13 +251,13 @@ 0 - + 80 60 - + 32767 60 @@ -279,7 +279,7 @@ Customize colors - + btnStyle @@ -291,13 +291,13 @@ 0 - + 80 60 - + 32767 60 @@ -319,7 +319,7 @@ Customize the widget style - + btnIcons @@ -331,13 +331,13 @@ 0 - + 80 60 - + 32767 60 @@ -359,7 +359,7 @@ Customize the icon theme - + btnFonts @@ -371,13 +371,13 @@ 0 - + 80 60 - + 32767 60 @@ -399,7 +399,7 @@ Customize the font theme - + btnSaver @@ -411,13 +411,13 @@ 0 - + 80 60 - + 32767 60 @@ -502,15 +502,15 @@ kthemedlg.ui.h - - startKonqui( const QString & url ) + + startKonqui( const TQString & url ) startBackground() startColors() startStyle() startIcons() startFonts() startSaver() - + kurllabel.h diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 2668bd87c..111384bd5 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -136,7 +136,7 @@ void kthememanager::load(bool useDefaults) conf.setGroup( "General" ); TQString themeName = conf.readEntry( "CurrentTheme" ); - TQListViewItem * cur = dlg->lvThemes->findItem( themeName, 0 ); + TQListViewItem * cur = dlg->lvThemes->tqfindItem( themeName, 0 ); if ( cur ) { dlg->lvThemes->setSelected( cur, true ); @@ -264,7 +264,7 @@ void kthememanager::slotRemoveTheme() bool kthememanager::themeExist(const TQString &_themeName) { - return ( dlg->lvThemes->findItem( _themeName, 0 )!=0 ); + return ( dlg->lvThemes->tqfindItem( _themeName, 0 )!=0 ); } void kthememanager::slotCreateTheme() @@ -298,7 +298,7 @@ void kthememanager::slotCreateTheme() m_theme->setAuthor( dlg.getAuthor() ); m_theme->setEmail( dlg.getEmail() ); m_theme->setHomepage( dlg.getHomepage() ); - m_theme->setComment( dlg.getComment().replace( "\n", "" ) ); + m_theme->setComment( dlg.getComment().tqreplace( "\n", "" ) ); m_theme->setVersion( dlg.getVersion() ); TQString result = m_theme->createYourself( true ); @@ -407,7 +407,7 @@ void kthememanager::updatePreview( const TQString & pixFile ) TQImage preview( pixFile, "PNG" ); if (preview.width()>dlg->lbPreview->contentsRect().width() || preview.height()>dlg->lbPreview->contentsRect().height() ) - preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQImage::ScaleMin ); + preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQ_ScaleMin ); TQPixmap pix; pix.convertFromImage( preview ); dlg->lbPreview->setPixmap( pix ); diff --git a/kcontrol/kthememanager/newthemewidget.ui b/kcontrol/kthememanager/newthemewidget.ui index 905b0749a..1a56915aa 100644 --- a/kcontrol/kthememanager/newthemewidget.ui +++ b/kcontrol/kthememanager/newthemewidget.ui @@ -1,7 +1,7 @@ NewThemeWidget Lukas Tinkl <lukas@kde.org> - + NewThemeWidget @@ -17,7 +17,7 @@ unnamed - + textLabel1 @@ -28,7 +28,7 @@ leName - + textLabel2 @@ -39,7 +39,7 @@ leAuthor - + textLabel3 @@ -50,7 +50,7 @@ leEmail - + textLabel4 @@ -61,51 +61,51 @@ leHomepage - + leEmail - + leName - + leHomepage - + leAuthor - + textLabel5 Co&mment: - + AlignTop teComment - + teComment - + leVersion - + textLabel6 diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index baa127e2f..a192bf608 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -59,7 +59,7 @@ KLocaleConfig::KLocaleConfig(KLocale *locale, this, TQT_SLOT(changedCountry(const TQString &)) ); m_labLang = new TQLabel(this, I18N_NOOP("Languages:")); - m_labLang->setAlignment( AlignTop ); + m_labLang->tqsetAlignment( AlignTop ); m_languages = new TQListBox(this); connect(m_languages, TQT_SIGNAL(selectionChanged()), @@ -172,7 +172,7 @@ void KLocaleConfig::slotAddLanguage(const TQString & code) pos = 0; // If it's already in list, just move it (delete the old, then insert a new) - int oldPos = languageList.findIndex( code ); + int oldPos = languageList.tqfindIndex( code ); if ( oldPos != -1 ) languageList.remove( languageList.at(oldPos) ); @@ -270,7 +270,7 @@ void KLocaleConfig::loadLanguageList() it != first.end(); ++it ) { - TQString str = locate("locale", TQString::fromLatin1("%1/entry.desktop") + TQString str = locate("locale", TQString::tqfromLatin1("%1/entry.desktop") .arg(*it)); if (!str.isNull()) prilang << str; @@ -278,7 +278,7 @@ void KLocaleConfig::loadLanguageList() // add all languages to the list TQStringList alllang = KGlobal::dirs()->findAllResources("locale", - TQString::fromLatin1("*/entry.desktop"), + TQString::tqfromLatin1("*/entry.desktop"), false, true); TQStringList langlist = prilang; if (langlist.count() > 0) @@ -293,7 +293,7 @@ void KLocaleConfig::loadLanguageList() if ((*it).isNull()) { m_addLanguage->insertSeparator(); - submenu = TQString::fromLatin1("other"); + submenu = TQString::tqfromLatin1("other"); m_addLanguage->insertSubmenu(m_locale->translate("Other"), submenu, TQString::null, -1); menu_index = -2; // first entries should _not_ be sorted @@ -305,9 +305,9 @@ void KLocaleConfig::loadLanguageList() m_locale->translate("without name")); TQString tag = *it; - int index = tag.findRev('/'); + int index = tag.tqfindRev('/'); tag = tag.left(index); - index = tag.findRev('/'); + index = tag.tqfindRev('/'); tag = tag.mid(index + 1); m_addLanguage->insertItem(name, tag, submenu, menu_index); } @@ -322,13 +322,13 @@ void KLocaleConfig::loadCountryList() KLocale *lsave = KGlobal::_locale; KGlobal::_locale = m_locale; - TQString sub = TQString::fromLatin1("l10n/"); + TQString sub = TQString::tqfromLatin1("l10n/"); // clear the list m_comboCountry->clear(); TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", - sub + TQString::fromLatin1("*.desktop"), + sub + TQString::tqfromLatin1("*.desktop"), false, true ); for ( TQStringList::ConstIterator it = regionlist.begin(); @@ -338,11 +338,11 @@ void KLocaleConfig::loadCountryList() TQString tag = *it; int index; - index = tag.findRev('/'); + index = tag.tqfindRev('/'); if (index != -1) tag = tag.mid(index + 1); - index = tag.findRev('.'); + index = tag.tqfindRev('.'); if (index != -1) tag.truncate(index); @@ -352,7 +352,7 @@ void KLocaleConfig::loadCountryList() m_locale->translate("without name")); TQString map( locate( "locale", - TQString::fromLatin1( "l10n/%1.png" ) + TQString::tqfromLatin1( "l10n/%1.png" ) .arg(tag) ) ); TQIconSet icon; if ( !map.isNull() ) @@ -362,7 +362,7 @@ void KLocaleConfig::loadCountryList() // add all languages to the list TQStringList countrylist = KGlobal::dirs()->findAllResources - ("locale", sub + TQString::fromLatin1("*/entry.desktop"), false, true); + ("locale", sub + TQString::tqfromLatin1("*/entry.desktop"), false, true); for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) @@ -374,14 +374,14 @@ void KLocaleConfig::loadCountryList() TQString submenu = entry.readEntry("Region"); TQString tag = *it; - int index = tag.findRev('/'); + int index = tag.tqfindRev('/'); tag.truncate(index); - index = tag.findRev('/'); + index = tag.tqfindRev('/'); tag = tag.mid(index + 1); int menu_index = submenu.isEmpty() ? -1 : -2; TQString flag( locate( "locale", - TQString::fromLatin1( "l10n/%1/flag.png" ) + TQString::tqfromLatin1( "l10n/%1/flag.png" ) .arg(tag) ) ); TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) ); m_comboCountry->insertItem( icon, name, tag, submenu, menu_index ); @@ -399,7 +399,7 @@ void KLocaleConfig::readLocale(const TQString &path, TQString &name, KGlobal::_locale = m_locale; // read the name - TQString filepath = TQString::fromLatin1("%1%2/entry.desktop") + TQString filepath = TQString::tqfromLatin1("%1%2/entry.desktop") .arg(sub) .arg(path); @@ -419,7 +419,7 @@ void KLocaleConfig::save() config->writeEntry("Country", m_locale->country(), true, true); if ( m_locale->languageList().isEmpty() ) - config->writeEntry("Language", TQString::fromLatin1(""), true, true); + config->writeEntry("Language", TQString::tqfromLatin1(""), true, true); else config->writeEntry("Language", m_locale->languageList(), ':', true, true); @@ -502,7 +502,7 @@ void KLocaleConfig::slotTranslate() TQStringList KLocaleConfig::languageList() const { TQString fileName = locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())); KSimpleConfig entry(fileName); diff --git a/kcontrol/locale/kcmlocale.h b/kcontrol/locale/kcmlocale.h index c0d8e5f68..00691bfa4 100644 --- a/kcontrol/locale/kcmlocale.h +++ b/kcontrol/locale/kcmlocale.h @@ -37,7 +37,7 @@ class TQLabel; class TQListBox; class TQPushButton; -class KLocaleConfig : public QWidget +class KLocaleConfig : public TQWidget { Q_OBJECT diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp index bf4cc8b32..69c92abc7 100644 --- a/kcontrol/locale/klocalesample.cpp +++ b/kcontrol/locale/klocalesample.cpp @@ -45,7 +45,7 @@ KLocaleSample::KLocaleSample(KLocale *locale, lay->setAutoAdd(TRUE); // Whatever the color scheme is, we want black text - TQColorGroup a = palette().active(); + TQColorGroup a = tqpalette().active(); a.setColor(TQColorGroup::Foreground, Qt::black); TQPalette pal(a, a, a); @@ -88,21 +88,21 @@ KLocaleSample::~KLocaleSample() void KLocaleSample::slotUpdateTime() { - TQDateTime dt = TQDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); - m_dateSample->setText(m_locale->formatDate(dt.date(), false)); - m_dateShortSample->setText(m_locale->formatDate(dt.date(), true)); - m_timeSample->setText(m_locale->formatTime(dt.time(), true)); + m_dateSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), false)); + m_dateShortSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), true)); + m_timeSample->setText(m_locale->formatTime(TQT_TQTIME_OBJECT(dt.time()), true)); } void KLocaleSample::slotLocaleChanged() { m_numberSample->setText(m_locale->formatNumber(1234567.89) + - TQString::fromLatin1(" / ") + + TQString::tqfromLatin1(" / ") + m_locale->formatNumber(-1234567.89)); m_moneySample->setText(m_locale->formatMoney(123456789.00) + - TQString::fromLatin1(" / ") + + TQString::tqfromLatin1(" / ") + m_locale->formatMoney(-123456789.00)); slotUpdateTime(); diff --git a/kcontrol/locale/klocalesample.h b/kcontrol/locale/klocalesample.h index 2838a2cc3..1b8fb94e0 100644 --- a/kcontrol/locale/klocalesample.h +++ b/kcontrol/locale/klocalesample.h @@ -32,7 +32,7 @@ class TQResizeEvent; class KLocale; -class KLocaleSample : public QWidget +class KLocaleSample : public TQWidget { Q_OBJECT public: diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp index 9fa1ad708..2c2fa37c5 100644 --- a/kcontrol/locale/localemon.cpp +++ b/kcontrol/locale/localemon.cpp @@ -111,8 +111,8 @@ KLocaleConfigMoney::KLocaleConfigMoney(KLocale *locale, int i = 5; while (i--) { - m_cmbMonPosMonSignPos->insertItem(TQString::null); - m_cmbMonNegMonSignPos->insertItem(TQString::null); + m_cmbMonPosMonSignPos->insertItem(TQString()); + m_cmbMonNegMonSignPos->insertItem(TQString()); } lay->setColStretch(1, 1); @@ -131,7 +131,7 @@ void KLocaleConfigMoney::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); @@ -139,25 +139,25 @@ void KLocaleConfigMoney::save() int i; bool b; - str = ent.readEntry("CurrencySymbol", TQString::fromLatin1("$")); + str = ent.readEntry("CurrencySymbol", TQString::tqfromLatin1("$")); config->deleteEntry("CurrencySymbol", false, true); if (str != m_locale->currencySymbol()) config->writeEntry("CurrencySymbol", m_locale->currencySymbol(), true, true); - str = ent.readEntry("MonetaryDecimalSymbol", TQString::fromLatin1(".")); + str = ent.readEntry("MonetaryDecimalSymbol", TQString::tqfromLatin1(".")); config->deleteEntry("MonetaryDecimalSymbol", false, true); if (str != m_locale->monetaryDecimalSymbol()) config->writeEntry("MonetaryDecimalSymbol", m_locale->monetaryDecimalSymbol(), true, true); - str = ent.readEntry("MonetaryThousandsSeparator", TQString::fromLatin1(",")); - str.replace(TQString::fromLatin1("$0"), TQString::null); + str = ent.readEntry("MonetaryThousandsSeparator", TQString::tqfromLatin1(",")); + str.tqreplace(TQString::tqfromLatin1("$0"), TQString()); config->deleteEntry("MonetaryThousandsSeparator", false, true); if (str != m_locale->monetaryThousandsSeparator()) config->writeEntry("MonetaryThousandsSeparator", - TQString::fromLatin1("$0%1$0") - .arg(m_locale->monetaryThousandsSeparator()), + TQString::tqfromLatin1("$0%1$0") + .tqarg(m_locale->monetaryThousandsSeparator()), true, true); i = ent.readNumEntry("FracDigits", 2); @@ -260,8 +260,8 @@ void KLocaleConfigMoney::slotMonNegMonSignPosChanged(int i) void KLocaleConfigMoney::slotTranslate() { TQObjectList list; - list.append(m_cmbMonPosMonSignPos); - list.append(m_cmbMonNegMonSignPos); + list.append(TQT_TQOBJECT(m_cmbMonPosMonSignPos)); + list.append(TQT_TQOBJECT(m_cmbMonNegMonSignPos)); TQComboBox *wc; for (TQObjectListIt li(list) ; (wc = (TQComboBox *)li.current()) != 0; ++li) diff --git a/kcontrol/locale/localemon.h b/kcontrol/locale/localemon.h index e78032641..412236efe 100644 --- a/kcontrol/locale/localemon.h +++ b/kcontrol/locale/localemon.h @@ -35,7 +35,7 @@ class KIntNumInput; class KLocale; class KLanguageCombo; -class KLocaleConfigMoney : public QWidget +class KLocaleConfigMoney : public TQWidget { Q_OBJECT diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp index 537cc99ab..2095e1e9a 100644 --- a/kcontrol/locale/localenum.cpp +++ b/kcontrol/locale/localenum.cpp @@ -89,34 +89,34 @@ void KLocaleConfigNumber::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); TQString str; str = ent.readEntry("DecimalSymbol", - TQString::fromLatin1(".")); + TQString::tqfromLatin1(".")); config->deleteEntry("DecimalSymbol", false, true); if (str != m_locale->decimalSymbol()) config->writeEntry("DecimalSymbol", m_locale->decimalSymbol(), true, true); str = ent.readEntry("ThousandsSeparator", - TQString::fromLatin1(",")); + TQString::tqfromLatin1(",")); config->deleteEntry("ThousandsSeparator", false, true); - str.replace(TQString::fromLatin1("$0"), TQString::null); + str.tqreplace(TQString::tqfromLatin1("$0"), TQString()); if (str != m_locale->thousandsSeparator()) config->writeEntry("ThousandsSeparator", - TQString::fromLatin1("$0%1$0") - .arg(m_locale->thousandsSeparator()), true, true); + TQString::tqfromLatin1("$0%1$0") + .tqarg(m_locale->thousandsSeparator()), true, true); str = ent.readEntry("PositiveSign"); config->deleteEntry("PositiveSign", false, true); if (str != m_locale->positiveSign()) config->writeEntry("PositiveSign", m_locale->positiveSign(), true, true); - str = ent.readEntry("NegativeSign", TQString::fromLatin1("-")); + str = ent.readEntry("NegativeSign", TQString::tqfromLatin1("-")); config->deleteEntry("NegativeSign", false, true); if (str != m_locale->negativeSign()) config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true); diff --git a/kcontrol/locale/localenum.h b/kcontrol/locale/localenum.h index 1bca325a5..5c2702e7d 100644 --- a/kcontrol/locale/localenum.h +++ b/kcontrol/locale/localenum.h @@ -34,7 +34,7 @@ class TQLineEdit; class KLocale; class KLanguageCombo; -class KLocaleConfigNumber : public QWidget +class KLocaleConfigNumber : public TQWidget { Q_OBJECT diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp index 1cf6b949b..33b039c6e 100644 --- a/kcontrol/locale/localeother.cpp +++ b/kcontrol/locale/localeother.cpp @@ -80,7 +80,7 @@ void KLocaleConfigOther::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); diff --git a/kcontrol/locale/localeother.h b/kcontrol/locale/localeother.h index 8c0459c9e..4e000bec6 100644 --- a/kcontrol/locale/localeother.h +++ b/kcontrol/locale/localeother.h @@ -31,7 +31,7 @@ class TQComboBox; class KLocale; -class KLocaleConfigOther : public QWidget +class KLocaleConfigOther : public TQWidget { Q_OBJECT diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp index 2519ea794..4650e6a23 100644 --- a/kcontrol/locale/localetime.cpp +++ b/kcontrol/locale/localetime.cpp @@ -253,28 +253,28 @@ void KLocaleConfigTime::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); TQString str; - str = ent.readEntry("CalendarSystem", TQString::fromLatin1("gregorian")); + str = ent.readEntry("CalendarSystem", TQString::tqfromLatin1("gregorian")); config->deleteEntry("CalendarSystem", false, true); if (str != m_locale->calendarType()) config->writeEntry("CalendarSystem", m_locale->calendarType(), true, true); - str = ent.readEntry("TimeFormat", TQString::fromLatin1("%H:%M:%S")); + str = ent.readEntry("TimeFormat", TQString::tqfromLatin1("%H:%M:%S")); config->deleteEntry("TimeFormat", false, true); if (str != m_locale->timeFormat()) config->writeEntry("TimeFormat", m_locale->timeFormat(), true, true); - str = ent.readEntry("DateFormat", TQString::fromLatin1("%A %d %B %Y")); + str = ent.readEntry("DateFormat", TQString::tqfromLatin1("%A %d %B %Y")); config->deleteEntry("DateFormat", false, true); if (str != m_locale->dateFormat()) config->writeEntry("DateFormat", m_locale->dateFormat(), true, true); - str = ent.readEntry("DateFormatShort", TQString::fromLatin1("%Y-%m-%d")); + str = ent.readEntry("DateFormatShort", TQString::tqfromLatin1("%Y-%m-%d")); config->deleteEntry("DateFormatShort", false, true); if (str != m_locale->dateFormatShort()) config->writeEntry("DateFormatShort", @@ -345,7 +345,7 @@ void KLocaleConfigTime::slotLocaleChanged() TQString calendarType = m_locale->calendarType(); int calendarSystem = 0; - CalendarVector::iterator it = qFind(calendars.begin(), calendars.end(), + CalendarVector::iterator it = tqFind(calendars.begin(), calendars.end(), calendarType); if ( it != calendars.end() ) calendarSystem = it - calendars.begin(); @@ -371,7 +371,7 @@ calendarType); kdDebug(173) << storeToUser(timeMap(), m_locale->timeFormat()) << endl; kdDebug(173) << userToStore(timeMap(), - TQString::fromLatin1("HH:MM:SS AMPM test")) << endl; + TQString::tqfromLatin1("HH:MM:SS AMPM test")) << endl; } @@ -416,7 +416,7 @@ void KLocaleConfigTime::slotTranslate() { TQString str; - TQString sep = TQString::fromLatin1("\n"); + TQString sep = TQString::tqfromLatin1("\n"); TQString old; diff --git a/kcontrol/locale/localetime.h b/kcontrol/locale/localetime.h index 9563ea91a..b77de2af9 100644 --- a/kcontrol/locale/localetime.h +++ b/kcontrol/locale/localetime.h @@ -36,7 +36,7 @@ class KLanguageCombo; class StringPair; -class KLocaleConfigTime : public QWidget +class KLocaleConfigTime : public TQWidget { Q_OBJECT diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index de47ce661..523fa50ea 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -62,7 +62,7 @@ KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/, m_nullConfig = new KConfig(TQString::null, false, false); m_globalConfig = new KConfig(TQString::null, false, true); - m_locale = new KLocale(TQString::fromLatin1("kcmlocale"), m_nullConfig); + m_locale = new KLocale(TQString::tqfromLatin1("kcmlocale"), m_nullConfig); TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l->setAutoAdd(TRUE); @@ -162,7 +162,7 @@ void KLocaleApplication::load( bool useDefaults ) { m_globalConfig->setReadDefaults( useDefaults ); m_globalConfig->reparseConfiguration(); - *m_locale = KLocale(TQString::fromLatin1("kcmlocale"), m_globalConfig); + *m_locale = KLocale(TQString::tqfromLatin1("kcmlocale"), m_globalConfig); emit localeChanged(); emit languageChanged(); @@ -180,7 +180,7 @@ void KLocaleApplication::save() "language of all programs, you will have to " "logout first."), m_locale->translate("Applying Language Settings"), - TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); + TQString::tqfromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); // restore the old global locale KGlobal::_locale = lsave; diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp index 5bc340f7b..fb97278c7 100644 --- a/kcontrol/nics/nic.cpp +++ b/kcontrol/nics/nic.cpp @@ -298,21 +298,21 @@ TQString flags_tos (unsigned int flags) if (flags & IFF_BROADCAST) { if (tmp.length()) { - tmp += TQString::fromLatin1(", "); + tmp += TQString::tqfromLatin1(", "); } tmp += i18n("Broadcast"); } if (flags & IFF_MULTICAST) { if (tmp.length()) { - tmp += TQString::fromLatin1(", "); + tmp += TQString::tqfromLatin1(", "); } tmp += i18n("Multicast"); } if (flags & IFF_LOOPBACK) { if (tmp.length()) { - tmp += TQString::fromLatin1(", "); + tmp += TQString::tqfromLatin1(", "); } tmp += i18n("Loopback"); } diff --git a/kcontrol/performance/konqueror_ui.ui b/kcontrol/performance/konqueror_ui.ui index 3ace0b5db..d93cfec71 100644 --- a/kcontrol/performance/konqueror_ui.ui +++ b/kcontrol/performance/konqueror_ui.ui @@ -1,6 +1,6 @@ KCMPerformance::Konqueror_ui - + Konqueror_ui @@ -19,7 +19,7 @@ 0 - + reuse_group @@ -30,7 +30,7 @@ unnamed - + rb_never_reuse @@ -38,7 +38,7 @@ &Never - + rb_file_browsing_reuse @@ -46,7 +46,7 @@ For &file browsing only (recommended) - + rb_always_reuse @@ -56,7 +56,7 @@ - + groupBox1 @@ -67,7 +67,7 @@ unnamed - + layout2 @@ -75,7 +75,7 @@ unnamed - + lb_preload_count @@ -86,7 +86,7 @@ sb_preload_count - + sb_preload_count @@ -101,7 +101,7 @@ Expanding - + 40 20 @@ -110,7 +110,7 @@ - + cb_preload_on_startup @@ -118,7 +118,7 @@ Preload an instance after KDE startup - + cb_always_have_preloaded @@ -138,7 +138,7 @@ Expanding - + 20 160 diff --git a/kcontrol/performance/system_ui.ui b/kcontrol/performance/system_ui.ui index a8d0e7956..c0cbe7701 100644 --- a/kcontrol/performance/system_ui.ui +++ b/kcontrol/performance/system_ui.ui @@ -1,6 +1,6 @@ System_ui - + System_ui @@ -16,7 +16,7 @@ unnamed - + gb_ @@ -27,7 +27,7 @@ unnamed - + cb_disable_kbuildsycoca @@ -35,7 +35,7 @@ Disable &system configuration startup check - + label_kbuildsycoca @@ -55,7 +55,7 @@ Expanding - + 20 40 diff --git a/kcontrol/privacy/kcmprivacydialog.ui b/kcontrol/privacy/kcmprivacydialog.ui index df79e2ec1..003cf235f 100644 --- a/kcontrol/privacy/kcmprivacydialog.ui +++ b/kcontrol/privacy/kcmprivacydialog.ui @@ -1,7 +1,7 @@ KCMPrivacyDialog Ralf Hoelzer - + KCMPrivacyDialog @@ -43,7 +43,7 @@ 0 - + splitter1 @@ -79,13 +79,13 @@ 0 - + 0 50 - + 32767 200 @@ -102,7 +102,7 @@ - + layout1 @@ -110,17 +110,17 @@ unnamed - + selectAllButton - + 80 0 - + 32767 32767 @@ -130,17 +130,17 @@ Select All - + selectNoneButton - + 80 0 - + 32767 32767 @@ -160,14 +160,14 @@ Maximum - + 80 20 - + cleanupButton @@ -179,7 +179,7 @@ 0 - + 32767 32767 diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index bbf5e088a..6df0d04f9 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -75,12 +75,12 @@ bool KPrivacyManager::clearThumbnails() bool KPrivacyManager::clearRunCommandHistory() const { - return kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", "" ); + return kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") ); } bool KPrivacyManager::clearAllCookies() const { - return kapp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", "" ); + return kapp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") ); } bool KPrivacyManager::clearSavedClipboardContents() @@ -98,7 +98,7 @@ bool KPrivacyManager::clearSavedClipboardContents() return true; } - return kapp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", "" ); + return kapp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") ); } bool KPrivacyManager::clearFormCompletion() const @@ -123,7 +123,7 @@ bool KPrivacyManager::clearRecentDocuments() const bool KPrivacyManager::clearQuickStartMenu() const { - return kapp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", "" ); + return kapp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") ); } bool KPrivacyManager::clearWebHistory() @@ -138,7 +138,7 @@ bool KPrivacyManager::clearWebHistory() } return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", - "notifyClear(TQCString)", "" ); + "notifyClear(TQCString)", TQString("") ); } bool KPrivacyManager::clearFavIcons() @@ -161,7 +161,7 @@ bool KPrivacyManager::isApplicationRegistered(const TQString &appName) QCStringList regApps = kapp->dcopClient()->registeredApplications(); for ( QCStringList::Iterator it = regApps.begin(); it != regApps.end(); ++it ) - if((*it).find(appName.latin1()) != -1) return true; + if((*it).tqfind(appName.latin1()) != -1) return true; return false; } diff --git a/kcontrol/privacy/kprivacymanager.h b/kcontrol/privacy/kprivacymanager.h index 6d950c903..11d4941fe 100644 --- a/kcontrol/privacy/kprivacymanager.h +++ b/kcontrol/privacy/kprivacymanager.h @@ -27,7 +27,7 @@ @author Ralf Hoelzer */ -class KPrivacyManager : public QObject +class KPrivacyManager : public TQObject { Q_OBJECT public: diff --git a/kcontrol/privacy/kprivacysettings.ui b/kcontrol/privacy/kprivacysettings.ui index 93afe5dff..ddcc93ec9 100644 --- a/kcontrol/privacy/kprivacysettings.ui +++ b/kcontrol/privacy/kprivacysettings.ui @@ -5,7 +5,7 @@ Licensed under the terms of the LGPL. Derived from AT&T's Privacy Bird settings panel screenshot originally. George Staikos <staikos@kde.org> - + KPrivacySettings @@ -38,7 +38,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Horizontal - + textLabel1 @@ -49,7 +49,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. _privacyLevel - + Low @@ -82,7 +82,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. - + buttonGroup1_2 @@ -93,7 +93,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. unnamed - + textLabel2 @@ -101,7 +101,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Warn me when I visit a site that uses my financial or purchase information: - + _warnFinancialMarketeer @@ -109,7 +109,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. For marketing or advertising purposes - + _warnFinancialSpammer @@ -119,7 +119,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. - + buttonGroup1 @@ -130,7 +130,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. unnamed - + textLabel2_2 @@ -138,7 +138,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Warn me when I visit a site that uses my health or medical information: - + _warnHealthMarketeer @@ -146,7 +146,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. For marketing or advertising purposes - + _warnHealthSpammer @@ -156,7 +156,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. - + buttonGroup1_2_2 @@ -167,7 +167,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. unnamed - + textLabel2_3 @@ -175,7 +175,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Warn me when I visit a site that uses my non-personally identifiable information: - + _warnDemographicsBigBrother @@ -183,7 +183,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. To determine my interests, habits or general behavior - + _warnDemographicsSpammer @@ -193,7 +193,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. - + _warnSpammers @@ -201,7 +201,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Warn me when I visit a site that shares my personal information with other companies - + _warnShady @@ -209,7 +209,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Warn me when I visit a site that does not let me know what information they have about me - + buttonGroup4 @@ -220,7 +220,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. unnamed - + textLabel2_2_2 @@ -228,7 +228,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Warn me when I visit a site that may contact me about other products or services: - + textLabel2_2_2_2 @@ -236,7 +236,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Warn me when I visit a site that may use my personal information to: - + _warnPersonalHabits @@ -244,7 +244,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Determine my habits, interests or general behavior - + layout1 @@ -252,7 +252,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. unnamed - + _warnPersonalTelephone @@ -260,7 +260,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Via telephone - + _warnPersonalMail @@ -270,7 +270,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. - + layout3 @@ -278,7 +278,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. unnamed - + _warnPersonalEmail @@ -286,7 +286,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Via email - + _warnPersonalBigBrother diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index e97cf4836..f48d621cf 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -60,7 +60,7 @@ void ConfigDialog::show() { if ( !isVisible() ) { KWinModule module(0, KWinModule::INFO_DESKTOP); - TQSize s1 = sizeHint(); + TQSize s1 = tqsizeHint(); TQSize s2 = module.workArea().size(); int w = s1.width(); int h = s1.height(); diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h index 584237975..615d9a2f5 100644 --- a/kcontrol/randr/configdialog.h +++ b/kcontrol/randr/configdialog.h @@ -62,11 +62,11 @@ public: ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name ) : KListView( parent, name ), _configWidget( configWidget ), _regExpEditor(0L) {} - // TQListView has a weird idea of a sizeHint... - virtual TQSize sizeHint () const { - int w = minimumSizeHint().width(); + // TQListView has a weird idea of a tqsizeHint... + virtual TQSize tqsizeHint () const { + int w = tqminimumSizeHint().width(); int h = header()->height(); - h += viewport()->sizeHint().height(); + h += viewport()->tqsizeHint().height(); h += horizontalScrollBar()->height(); TQListViewItem *item = firstChild(); diff --git a/kcontrol/randr/krandrbindings.cpp b/kcontrol/randr/krandrbindings.cpp index 4857651a1..29b2b73c2 100644 --- a/kcontrol/randr/krandrbindings.cpp +++ b/kcontrol/randr/krandrbindings.cpp @@ -19,10 +19,10 @@ */ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString(), key3, key4 ) #endif #define WIN KKey::QtWIN diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp index 087585d3f..668b36ddb 100644 --- a/kcontrol/randr/krandrmodule.cpp +++ b/kcontrol/randr/krandrmodule.cpp @@ -92,7 +92,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis m_screenSelector = new KComboBox(screenBox); for (int s = 0; s < numScreens(); s++) { - m_screenSelector->insertItem(i18n("Screen %1").arg(s+1)); + m_screenSelector->insertItem(i18n("Screen %1").tqarg(s+1)); } m_screenSelector->setCurrentItem(currentScreenIndex()); @@ -171,7 +171,7 @@ void KRandRModule::slotScreenChanged(int screen) // Add new resolutions for (int i = 0; i < currentScreen()->numSizes(); i++) { - m_sizeCombo->insertItem(i18n("%1 x %2").arg(currentScreen()->pixelSize(i).width()).arg(currentScreen()->pixelSize(i).height())); + m_sizeCombo->insertItem(i18n("%1 x %2").tqarg(currentScreen()->pixelSize(i).width()).tqarg(currentScreen()->pixelSize(i).height())); // Aspect ratio /* , aspect ratio %5)*/ @@ -180,7 +180,7 @@ void KRandRModule::slotScreenChanged(int screen) // Clear rotations for (int i = m_rotationGroup->count() - 1; i >= 0; i--) - m_rotationGroup->remove(m_rotationGroup->find(i)); + m_rotationGroup->remove(m_rotationGroup->tqfind(i)); // Create rotations for (int i = 0; i < RandRScreen::OrientationCount; i++) @@ -195,21 +195,21 @@ void KRandRModule::slotScreenChanged(int screen) void KRandRModule::slotRotationChanged() { - if (m_rotationGroup->find(0)->isOn()) + if (m_rotationGroup->tqfind(0)->isOn()) currentScreen()->proposeRotation(RandRScreen::Rotate0); - else if (m_rotationGroup->find(1)->isOn()) + else if (m_rotationGroup->tqfind(1)->isOn()) currentScreen()->proposeRotation(RandRScreen::Rotate90); - else if (m_rotationGroup->find(2)->isOn()) + else if (m_rotationGroup->tqfind(2)->isOn()) currentScreen()->proposeRotation(RandRScreen::Rotate180); else { - Q_ASSERT(m_rotationGroup->find(3)->isOn()); + Q_ASSERT(m_rotationGroup->tqfind(3)->isOn()); currentScreen()->proposeRotation(RandRScreen::Rotate270); } - if (m_rotationGroup->find(4)->isOn()) + if (m_rotationGroup->tqfind(4)->isOn()) currentScreen()->proposeRotation(currentScreen()->proposedRotation() ^ RandRScreen::ReflectX); - if (m_rotationGroup->find(5)->isOn()) + if (m_rotationGroup->tqfind(5)->isOn()) currentScreen()->proposeRotation(currentScreen()->proposedRotation() ^ RandRScreen::ReflectY); setChanged(); @@ -353,8 +353,8 @@ void KRandRModule::update() Q_ASSERT(currentScreen()->proposedRotation() & RandRScreen::RotateMask); break; } - m_rotationGroup->find(4)->setDown(currentScreen()->proposedRotation() & RandRScreen::ReflectX); - m_rotationGroup->find(5)->setDown(currentScreen()->proposedRotation() & RandRScreen::ReflectY); + m_rotationGroup->tqfind(4)->setDown(currentScreen()->proposedRotation() & RandRScreen::ReflectX); + m_rotationGroup->tqfind(5)->setDown(currentScreen()->proposedRotation() & RandRScreen::ReflectY); m_rotationGroup->blockSignals(false); m_refreshRates->blockSignals(true); diff --git a/kcontrol/randr/krandrpassivepopup.cpp b/kcontrol/randr/krandrpassivepopup.cpp index 5cf6fa6b2..207dfac2e 100644 --- a/kcontrol/randr/krandrpassivepopup.cpp +++ b/kcontrol/randr/krandrpassivepopup.cpp @@ -60,7 +60,7 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P ) break; win = parent; - TQWidget* widget = TQWidget::find( win ); + TQWidget* widget = TQWidget::tqfind( win ); if( widget != NULL ) { widget->installEventFilter( this ); @@ -94,14 +94,14 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P ) bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e ) { if( e->type() == TQEvent::Move && o->isWidgetType() - && watched_widgets.contains( static_cast< TQWidget* >( o ))) + && watched_widgets.tqcontains( TQT_TQWIDGET( o ))) TQTimer::singleShot( 0, this, TQT_SLOT( slotPositionSelf())); return false; } bool KRandrPassivePopup::x11Event( XEvent* e ) { - if( e->type == ConfigureNotify && watched_windows.contains( e->xconfigure.window )) + if( e->type == ConfigureNotify && watched_windows.tqcontains( e->xconfigure.window )) { if( !update_timer.isActive()) update_timer.start( 10, true ); diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp index e35fba9d2..49e0c17af 100644 --- a/kcontrol/randr/krandrtray.cpp +++ b/kcontrol/randr/krandrtray.cpp @@ -54,13 +54,13 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) , m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection())) { setPixmap(KSystemTray::loadSizedIcon("randr", width())); - setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); + tqsetAlignment(Qt::AlignHCenter | Qt::AlignVCenter); connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit())); TQToolTip::add(this, i18n("Screen resize & rotate")); my_parent = parent; //printf("Reading configuration...\n\r"); - globalKeys = new KGlobalAccel(this); + globalKeys = new KGlobalAccel(TQT_TQOBJECT(this)); KGlobalAccel* keys = globalKeys; #include "krandrbindings.cpp" // the keys need to be read from kdeglobals, not kickerrc @@ -123,7 +123,7 @@ void KRandRSystemTray::resizeEvent ( TQResizeEvent * ) void KRandRSystemTray::mousePressEvent(TQMouseEvent* e) { // Popup the context menu with left-click - if (e->button() == LeftButton) { + if (e->button() == Qt::LeftButton) { contextMenuAboutToShow(contextMenu()); contextMenu()->popup(e->globalPos()); e->accept(); @@ -205,7 +205,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu) /*lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1)); menu->setItemEnabled(lastIndex, false);*/ } else { - KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").arg(s+1).latin1()); + KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").tqarg(s+1).latin1()); m_screenPopups.append(subMenu); populateMenu(subMenu); lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu); @@ -237,7 +237,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu) menu->insertTitle(SmallIcon("randr"), i18n("Global Configuation")); KAction *actColors = new KAction( i18n( "Configure Color Profiles..." ), - SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotColorConfig() ), + SmallIconSet( "configure" ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotColorConfig() ), actionCollection() ); actColors->plug( menu ); @@ -247,7 +247,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu) // actPrefs->plug( menu ); KAction *actSKeys = new KAction( i18n( "Configure Shortcut Keys..." ), - SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotSKeys() ), + SmallIconSet( "configure" ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ), actionCollection() ); actSKeys->plug( menu ); @@ -260,7 +260,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu) void KRandRSystemTray::slotScreenActivated() { - setCurrentScreen(m_screenPopups.find(static_cast(sender()))); + setCurrentScreen(m_screenPopups.tqfind(static_cast(sender()))); } void KRandRSystemTray::configChanged() diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp index 071088e9b..cd72859db 100644 --- a/kcontrol/randr/ktimerdialog.cpp +++ b/kcontrol/randr/ktimerdialog.cpp @@ -56,8 +56,8 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent, if ( buttonMask & Cancel ) buttonOnTimeout = Cancel; - connect( totalTimer, SIGNAL( timeout() ), SLOT( slotInternalTimeout() ) ); - connect( updateTimer, SIGNAL( timeout() ), SLOT( slotUpdateTime() ) ); + connect( totalTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotInternalTimeout() ) ); + connect( updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateTime() ) ); // create the widgets mainWidget = new QVBox( this, "mainWidget" ); @@ -95,7 +95,7 @@ void KTimerDialog::setMainWidget( QWidget *widget ) // yuck, here goes. QVBox *newWidget = new QVBox( this ); - if ( widget->parentWidget() != mainWidget ) { + if ( widget->tqparentWidget() != mainWidget ) { widget->reparent( newWidget, 0, QPoint(0,0) ); } else { newWidget->insertChild( widget ); diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp index fd31f7800..0c9a5d3fd 100644 --- a/kcontrol/samba/kcmsambaimports.cpp +++ b/kcontrol/samba/kcmsambaimports.cpp @@ -74,16 +74,16 @@ void ImportsView::updateList() if (e!=0) { s=buf; - if ((s.contains(" nfs ")) || (s.contains(" smbfs "))) + if ((s.tqcontains(" nfs ")) || (s.tqcontains(" smbfs "))) { - strSource=s.left(s.find(" on /")); - strMount=s.mid(s.find(" on /")+4,s.length()); - if ((s.contains(" nfs ")) || (s.contains("/remote on "))) + strSource=s.left(s.tqfind(" on /")); + strMount=s.mid(s.tqfind(" on /")+4,s.length()); + if ((s.tqcontains(" nfs ")) || (s.tqcontains("/remote on "))) strType="NFS"; - else if (s.contains(" smbfs ")) + else if (s.tqcontains(" smbfs ")) strType="SMB"; - int pos(strMount.find(" type ")); - if (pos==-1) pos=strMount.find(" read/"); + int pos(strMount.tqfind(" type ")); + if (pos==-1) pos=strMount.tqfind(" read/"); strMount=strMount.left(pos); new TQListViewItem(&list,strType,strSource,strMount); }; diff --git a/kcontrol/samba/kcmsambaimports.h b/kcontrol/samba/kcmsambaimports.h index 56ddb5f36..51b83bd3c 100644 --- a/kcontrol/samba/kcmsambaimports.h +++ b/kcontrol/samba/kcmsambaimports.h @@ -28,7 +28,7 @@ #include #include -class ImportsView: public QWidget +class ImportsView: public TQWidget { Q_OBJECT public: diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp index 224bc6fa2..8b56a9fe0 100644 --- a/kcontrol/samba/kcmsambalog.cpp +++ b/kcontrol/samba/kcmsambalog.cpp @@ -91,7 +91,7 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name) logFileName.setURL("/var/log/samba.log"); viewHistory.setAllColumnsShowFocus(TRUE); - viewHistory.setFocusPolicy(TQWidget::ClickFocus); + viewHistory.setFocusPolicy(TQ_ClickFocus); viewHistory.setShowSortIndicator(true); viewHistory.addColumn(i18n("Date & Time"),130); @@ -116,14 +116,14 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name) connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList())); emit contentsChanged(&viewHistory,0,0); - label.setMinimumSize(label.sizeHint()); - logFileName.setMinimumSize(250,logFileName.sizeHint().height()); + label.setMinimumSize(label.tqsizeHint()); + logFileName.setMinimumSize(250,logFileName.tqsizeHint().height()); viewHistory.setMinimumSize(425,200); - showConnOpen.setMinimumSize(showConnOpen.sizeHint()); - showConnClose.setMinimumSize(showConnClose.sizeHint()); - showFileOpen.setMinimumSize(showFileOpen.sizeHint()); - showFileClose.setMinimumSize(showFileClose.sizeHint()); - updateButton.setFixedSize(updateButton.sizeHint()); + showConnOpen.setMinimumSize(showConnOpen.tqsizeHint()); + showConnClose.setMinimumSize(showConnClose.tqsizeHint()); + showFileOpen.setMinimumSize(showFileOpen.tqsizeHint()); + showFileClose.setMinimumSize(showFileClose.tqsizeHint()); + updateButton.setFixedSize(updateButton.tqsizeHint()); } void LogView::loadSettings() @@ -161,7 +161,7 @@ void LogView::updateList() TQFile logFile(logFileName.url()); if (logFile.open(IO_ReadOnly)) { - TQApplication::setOverrideCursor(waitCursor); + TQApplication::setOverrideCursor(tqwaitCursor); viewHistory.clear(); filesCount=0; connectionsCount=0; diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h index d0b427d48..b7d236325 100644 --- a/kcontrol/samba/kcmsambalog.h +++ b/kcontrol/samba/kcmsambalog.h @@ -35,7 +35,7 @@ #define LOGGROUPNAME "SambaLogFileSettings" -class LogView: public QWidget +class LogView: public TQWidget { Q_OBJECT public: @@ -57,7 +57,7 @@ class LogView: public QWidget void contentsChanged(TQListView* list, int nrOfFiles, int nrOfConnections); }; -class QListViewItemX:public QListViewItem +class QListViewItemX:public TQListViewItem { public: //a faster constructor saves a lot time diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index f75fd72e5..0070e4723 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -60,7 +60,7 @@ StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *nam expandedUserCb = new TQCheckBox( i18n( "Show expanded host info" ), this ); viewStatistics->setAllColumnsShowFocus(TRUE); - viewStatistics->setFocusPolicy(TQWidget::ClickFocus); + viewStatistics->setFocusPolicy(TQ_ClickFocus); viewStatistics->setShowSortIndicator(true); viewStatistics->addColumn(i18n("Nr"),30); @@ -80,18 +80,18 @@ StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *nam hostLe->setText("*"); viewStatistics->setMinimumSize(375,200); - connectionsL->setMinimumSize(connectionsL->sizeHint()); - filesL->setMinimumSize(filesL->sizeHint()); - eventL->setMinimumSize(eventL->sizeHint()); - eventCb->setMinimumSize(eventCb->sizeHint()); - hostL->setMinimumSize(hostL->sizeHint()); - hostLe->setMinimumSize(120,hostLe->sizeHint().height()); - serviceL->setMinimumSize(serviceL->sizeHint()); - serviceLe->setMinimumSize(120,serviceLe->sizeHint().height()); - calcButton->setMinimumSize(calcButton->sizeHint()); - clearButton->setMinimumSize(clearButton->sizeHint()); - expandedInfoCb->setMinimumSize(expandedInfoCb->sizeHint()); - expandedUserCb->setMinimumSize(expandedUserCb->sizeHint()); + connectionsL->setMinimumSize(connectionsL->tqsizeHint()); + filesL->setMinimumSize(filesL->tqsizeHint()); + eventL->setMinimumSize(eventL->tqsizeHint()); + eventCb->setMinimumSize(eventCb->tqsizeHint()); + hostL->setMinimumSize(hostL->tqsizeHint()); + hostLe->setMinimumSize(120,hostLe->tqsizeHint().height()); + serviceL->setMinimumSize(serviceL->tqsizeHint()); + serviceLe->setMinimumSize(120,serviceLe->tqsizeHint().height()); + calcButton->setMinimumSize(calcButton->tqsizeHint()); + clearButton->setMinimumSize(clearButton->tqsizeHint()); + expandedInfoCb->setMinimumSize(expandedInfoCb->tqsizeHint()); + expandedUserCb->setMinimumSize(expandedUserCb->tqsizeHint()); TQVBoxLayout *topLayout=new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -134,7 +134,7 @@ void StatisticsView::setListInfo(TQListView *list, int nrOfFiles, int nrOfConnec void StatisticsView::calculate() { if (dataList==0) return; - TQApplication::setOverrideCursor(waitCursor); + TQApplication::setOverrideCursor(tqwaitCursor); int connCount(0); if (eventCb->currentText()==i18n("Connection")) connCount=1; @@ -150,8 +150,8 @@ void StatisticsView::calculate() { if (connCount) { - if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED"))) - && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).tqcontains(i18n("CONNECTION OPENED"))) + && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) { if (expandedInfoCb->isChecked()) item2=item->text(2); else item2=serviceLe->text(); @@ -163,8 +163,8 @@ void StatisticsView::calculate() } else { - if ((TQString(item->text(1)).contains(i18n("FILE OPENED"))) - && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).tqcontains(i18n("FILE OPENED"))) + && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) { if (expandedInfoCb->isChecked()) item2=item->text(2); else item2=serviceLe->text(); @@ -201,14 +201,14 @@ void StatisticsView::calculate() { if (connCount) { - if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED"))) - && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).tqcontains(i18n("CONNECTION OPENED"))) + && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) count++; } else { - if ((TQString(item->text(1)).contains(i18n("FILE OPENED"))) - && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).tqcontains(i18n("FILE OPENED"))) + && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) count++; }; item=item->nextSibling(); diff --git a/kcontrol/samba/kcmsambastatistics.h b/kcontrol/samba/kcmsambastatistics.h index 81af9131c..64c6026ad 100644 --- a/kcontrol/samba/kcmsambastatistics.h +++ b/kcontrol/samba/kcmsambastatistics.h @@ -75,7 +75,7 @@ class SambaLog LogItem* itemInList(TQString name); }; -class StatisticsView: public QWidget +class StatisticsView: public TQWidget { Q_OBJECT public: diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp index c94bc5129..b36d5325b 100644 --- a/kcontrol/samba/ksmbstatus.cpp +++ b/kcontrol/samba/ksmbstatus.cpp @@ -31,8 +31,8 @@ #include "ksmbstatus.moc" -#define Before(ttf,in) in.left(in.find(ttf)) -#define After(ttf,in) (in.contains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString("")) +#define Before(ttf,in) in.left(in.tqfind(ttf)) +#define After(ttf,in) (in.tqcontains(ttf)?TQString(in.mid(in.tqfind(ttf)+TQString(ttf).length())):TQString("")) NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name ) : TQWidget(parent, name) @@ -77,7 +77,7 @@ NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name ) void NetMon::processNFSLine(char *bufline, int) { TQCString line(bufline); - if (line.contains(":/")) + if (line.tqcontains(":/")) new TQListViewItem(list,"NFS",After(":",line),Before(":/",line)); } @@ -87,14 +87,14 @@ void NetMon::processSambaLine(char *bufline, int) rownumber++; if (rownumber == 2) version->setText(bufline); // second line = samba version - if ((readingpart==header) && line.contains("Service")) + if ((readingpart==header) && line.tqcontains("Service")) { - iUser=line.find("uid"); - iGroup=line.find("gid"); - iPid=line.find("pid"); - iMachine=line.find("machine"); + iUser=line.tqfind("uid"); + iGroup=line.tqfind("gid"); + iPid=line.tqfind("pid"); + iMachine=line.tqfind("machine"); } - else if ((readingpart==header) && (line.contains("---"))) + else if ((readingpart==header) && (line.tqcontains("---"))) { readingpart=connexions; } @@ -111,7 +111,7 @@ void NetMon::processSambaLine(char *bufline, int) } else if (readingpart==connexions) readingpart=locked_files; - else if ((readingpart==locked_files) && (line.find("No ")==0)) + else if ((readingpart==locked_files) && (line.tqfind("No ")==0)) readingpart=finished; else if (readingpart==locked_files) { diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h index 50caf64de..a38eca897 100644 --- a/kcontrol/samba/ksmbstatus.h +++ b/kcontrol/samba/ksmbstatus.h @@ -32,7 +32,7 @@ class TQListView; class TQListViewItem; class KProcess; -class NetMon : public QWidget +class NetMon : public TQWidget { Q_OBJECT public: diff --git a/kcontrol/screensaver/advanceddialogimpl.ui b/kcontrol/screensaver/advanceddialogimpl.ui index 814a3867c..6f03509b9 100644 --- a/kcontrol/screensaver/advanceddialogimpl.ui +++ b/kcontrol/screensaver/advanceddialogimpl.ui @@ -1,6 +1,6 @@ AdvancedDialogImpl - + Form1 @@ -19,7 +19,7 @@ 0 - + qgbPriority @@ -36,7 +36,7 @@ unnamed - + Low @@ -69,7 +69,7 @@ Expanding - + 31 20 @@ -78,7 +78,7 @@ - + groupBox1 @@ -89,7 +89,7 @@ unnamed - + qlMonitorLabel @@ -97,7 +97,7 @@ - + layout8 @@ -105,7 +105,7 @@ unnamed - + layout1 @@ -113,7 +113,7 @@ unnamed - + qlTopLeft @@ -121,7 +121,7 @@ Top left: - + No Action @@ -153,14 +153,14 @@ Expanding - + 41 20 - + layout3 @@ -168,7 +168,7 @@ unnamed - + qlTopRight @@ -176,7 +176,7 @@ Top right: - + No Action @@ -200,7 +200,7 @@ - + layout9 @@ -208,7 +208,7 @@ unnamed - + layout4 @@ -216,7 +216,7 @@ unnamed - + qlBottomLeft @@ -224,7 +224,7 @@ Bottom left: - + No Action @@ -256,14 +256,14 @@ Expanding - + 20 20 - + layout2 @@ -271,7 +271,7 @@ unnamed - + qlBottomRight @@ -279,7 +279,7 @@ Bottom right: - + No Action @@ -303,7 +303,7 @@ - + layout10 @@ -321,14 +321,14 @@ Expanding - + 21 20 - + monitorLabel @@ -346,7 +346,7 @@ Expanding - + 31 20 @@ -365,7 +365,7 @@ Expanding - + 20 20 @@ -382,7 +382,7 @@ Expanding - + 20 20 diff --git a/kcontrol/screensaver/kswidget.cpp b/kcontrol/screensaver/kswidget.cpp index d13d131dc..66ba882d0 100644 --- a/kcontrol/screensaver/kswidget.cpp +++ b/kcontrol/screensaver/kswidget.cpp @@ -8,7 +8,7 @@ #endif KSWidget::KSWidget( TQWidget* parent, const char* name, int f ) - : QXEmbed( parent, name, f ), colormap( None ) + : QXEmbed( parent, name, (WFlags)f ), colormap( None ) { // use visual with support for double-buffering, for opengl // this code is duplicated in kdebase/kdesktop/lock/ @@ -54,7 +54,7 @@ KSWidget::KSWidget( TQWidget* parent, const char* name, int f ) } } } - Window w = XCreateWindow( x11Display(), parentWidget() ? parentWidget()->winId() : RootWindow( x11Display(), x11Screen()), + Window w = XCreateWindow( x11Display(), tqparentWidget() ? tqparentWidget()->winId() : RootWindow( x11Display(), x11Screen()), x(), y(), width(), height(), 0, x11Depth(), InputOutput, visual, flags, &attrs ); create( w ); #endif diff --git a/kcontrol/screensaver/saverconfig.cpp b/kcontrol/screensaver/saverconfig.cpp index bf8cdc54a..a7185135e 100644 --- a/kcontrol/screensaver/saverconfig.cpp +++ b/kcontrol/screensaver/saverconfig.cpp @@ -29,7 +29,7 @@ bool SaverConfig::read(const TQString &file) mSaver = config.readPathEntry("Exec"); } - int indx = file.findRev('/'); + int indx = file.tqfindRev('/'); if (indx >= 0) { mFile = file.mid(indx+1); } diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index f80cc19e9..7582aea53 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -133,12 +133,12 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mSaverGroup->setColumnLayout( 0, Qt::Horizontal ); vLayout->addWidget(mSaverGroup); vLayout->setStretchFactor( mSaverGroup, 10 ); - TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(), + TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->tqlayout(), KDialog::spacingHint() ); mSaverListView = new TQListView( mSaverGroup ); mSaverListView->setMinimumHeight( 120 ); - mSaverListView->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + mSaverListView->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); mSaverListView->addColumn(""); mSaverListView->header()->hide(); mSelected = -1; @@ -162,7 +162,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mSettingsGroup = new TQGroupBox( i18n("Settings"), this ); mSettingsGroup->setColumnLayout( 0, Qt::Vertical ); leftColumnLayout->addWidget( mSettingsGroup ); - groupLayout = new TQVBoxLayout( mSettingsGroup->layout(), + groupLayout = new TQVBoxLayout( mSettingsGroup->tqlayout(), KDialog::spacingHint() ); mEnabledCheckBox = new TQCheckBox(i18n( @@ -221,14 +221,14 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mWaitLockEdit->setSuffix(i18n(" sec")); mWaitLockEdit->setValue(mLockTimeout/1000); mWaitLockEdit->setEnabled(mEnabled && mLock); - if ( mWaitLockEdit->sizeHint().width() < - mWaitEdit->sizeHint().width() ) { - mWaitLockEdit->setFixedWidth( mWaitEdit->sizeHint().width() ); - mWaitEdit->setFixedWidth( mWaitEdit->sizeHint().width() ); + if ( mWaitLockEdit->tqsizeHint().width() < + mWaitEdit->tqsizeHint().width() ) { + mWaitLockEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() ); + mWaitEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() ); } else { - mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); - mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); + mWaitEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() ); + mWaitLockEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() ); } connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLockTimeoutChanged(int))); @@ -246,7 +246,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis new TQVBoxLayout(topLayout, KDialog::spacingHint()); mMonitorLabel = new TQLabel( this ); - mMonitorLabel->setAlignment( AlignCenter ); + mMonitorLabel->tqsetAlignment( AlignCenter ); mMonitorLabel->setPixmap( TQPixmap(locate("data", "kcontrol/pics/monitor.png"))); rightColumnLayout->addWidget(mMonitorLabel, 0); @@ -256,7 +256,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis advancedLayout->addWidget( new TQWidget( this ) ); TQPushButton* advancedBt = new TQPushButton( i18n( "Advanced &Options" ), this, "advancedBtn" ); - advancedBt->setSizePolicy( TQSizePolicy( + advancedBt->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); connect( advancedBt, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdvanced() ) ); @@ -360,7 +360,7 @@ void KScreenSaver::load( bool useDefaults ) for (SaverConfig* saver = mSaverList.first(); saver != 0; saver = mSaverList.next()) { if (saver->file() == mSaver) { - selectedItem = mSaverListView->findItem ( saver->name(), 0 ); + selectedItem = mSaverListView->tqfindItem ( saver->name(), 0 ); if (selectedItem) { mSelected = i; break; @@ -454,7 +454,7 @@ void KScreenSaver::save() // on exit. I don't know why yet. DCOPClient *client = kapp->dcopClient(); - client->send("kdesktop", "KScreensaverIface", "configure()", ""); + client->send("kdesktop", "KScreensaverIface", "configure()", TQString("")); mChanged = false; emit changed(false); @@ -503,7 +503,7 @@ void KScreenSaver::findSavers() item = new TQListViewItem ( mSaverListView, s->name(), "2" + s->name() ); else { - TQListViewItem *categoryItem = mSaverListView->findItem( s->category(), 0 ); + TQListViewItem *categoryItem = mSaverListView->tqfindItem( s->category(), 0 ); if ( !categoryItem ) { categoryItem = new TQListViewItem ( mSaverListView, s->category(), "1" + s->category() ); categoryItem->setPixmap ( 0, SmallIcon ( "kscreensaver" ) ); @@ -639,9 +639,9 @@ void KScreenSaver::slotScreenSaver(TQListViewItem *item) int i = 0, indx = -1; for (SaverConfig* saver = mSaverList.first(); saver != 0; saver = mSaverList.next()) { - if ( item->parent() ) + if ( item->tqparent() ) { - if ( item->parent()->text( 0 ) == saver->category() && saver->name() == item->text (0)) + if ( item->tqparent()->text( 0 ) == saver->category() && saver->name() == item->text (0)) { indx = i; break; @@ -739,7 +739,7 @@ void KScreenSaver::slotSetup() // void KScreenSaver::slotAdvanced() { - KScreenSaverAdvancedDialog dlg( topLevelWidget() ); + KScreenSaverAdvancedDialog dlg( tqtopLevelWidget() ); if ( dlg.exec() ) { mChanged = true; emit changed(true); diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h index b03bd878b..9dcf7f46e 100644 --- a/kcontrol/screensaver/scrnsave.h +++ b/kcontrol/screensaver/scrnsave.h @@ -81,7 +81,7 @@ protected: TQPushButton *mSetupBt; TQPushButton *mTestBt; TQListView *mSaverListView; - QSpinBox *mWaitEdit; + TQSpinBox *mWaitEdit; TQSpinBox *mWaitLockEdit; TQCheckBox *mLockCheckBox; TQCheckBox *mStarsCheckBox; diff --git a/kcontrol/screensaver/testwin.cpp b/kcontrol/screensaver/testwin.cpp index a5d316be5..3676c0db7 100644 --- a/kcontrol/screensaver/testwin.cpp +++ b/kcontrol/screensaver/testwin.cpp @@ -6,7 +6,7 @@ class QXEmbed; TestWin::TestWin() : KSWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM ) { - setFocusPolicy(StrongFocus); + setFocusPolicy(TQ_StrongFocus); KWin::setState( winId(), NET::StaysOnTop ); } diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui index fe8c4fa06..2620af0b5 100644 --- a/kcontrol/smartcard/nosmartcardbase.ui +++ b/kcontrol/smartcard/nosmartcardbase.ui @@ -23,7 +23,7 @@ <b>Unable to contact the KDE smartcard service.</b> - + WordBreak|AlignVCenter @@ -48,7 +48,7 @@ 2) You don't appear to have smartcard support in the KDE libraries. You will need to recompile the kdelibs package with libpcsclite installed. - + WordBreak|AlignVCenter @@ -64,7 +64,7 @@ Expanding - + 20 20 diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui index b5dda006b..df12f9deb 100644 --- a/kcontrol/smartcard/smartcardbase.ui +++ b/kcontrol/smartcard/smartcardbase.ui @@ -74,7 +74,7 @@ Fixed - + 15 20 @@ -118,7 +118,7 @@ Expanding - + 20 20 @@ -250,7 +250,7 @@ To add new readers you have to modify /etc/readers.conf file and re-start pcscd - + WordBreak|AlignVCenter diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui index 518052675..5090fca0b 100644 --- a/kcontrol/smserver/smserverconfigdlg.ui +++ b/kcontrol/smserver/smserverconfigdlg.ui @@ -1,6 +1,6 @@ SMServerConfigDlg - + SMServerConfigDlg @@ -24,7 +24,7 @@ 0 - + topBox @@ -43,7 +43,7 @@ unnamed - + confirmLogoutCheck @@ -54,7 +54,7 @@ Check this option if you want the session manager to display a logout confirmation dialog box. - + offerShutdownCheck @@ -64,7 +64,7 @@ - + loginGroup @@ -82,7 +82,7 @@ unnamed - + previousSessionRadio @@ -90,7 +90,7 @@ Restore &previous session - + savedSessionRadio @@ -98,7 +98,7 @@ Restore &manually saved session - + emptySessionRadio @@ -108,7 +108,7 @@ - + sdGroup @@ -122,7 +122,7 @@ unnamed - + logoutRadio @@ -130,7 +130,7 @@ &End current session - + haltRadio @@ -138,7 +138,7 @@ &Turn off computer - + rebootRadio @@ -148,7 +148,7 @@ - + advancedGroup @@ -159,7 +159,7 @@ unnamed - + textLabel1 @@ -190,7 +190,7 @@ Expanding - + 20 130 diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index f351d3f2c..41d775ba5 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -160,8 +160,8 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) gbWidgetStyle->layout()->setMargin( KDialog::marginHint() ); gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() ); - gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() ); - gbWidgetStyleLayout->setAlignment( Qt::AlignTop ); + gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->tqlayout() ); + gbWidgetStyleLayout->tqsetAlignment( Qt::AlignTop ); hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" ); cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" ); @@ -169,14 +169,14 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) hbLayout->addWidget( cbStyle ); pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle ); - pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum ); + pbConfigStyle->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum ); pbConfigStyle->setEnabled( FALSE ); hbLayout->addWidget( pbConfigStyle ); gbWidgetStyleLayout->addLayout( hbLayout ); lblStyleDesc = new TQLabel( gbWidgetStyle ); - lblStyleDesc->setTextFormat(Qt::RichText); + lblStyleDesc->setTextFormat(TQt::RichText); gbWidgetStyleLayout->addWidget( lblStyleDesc ); cbIconsOnButtons = new TQCheckBox( i18n("Sho&w icons on buttons"), gbWidgetStyle ); @@ -187,13 +187,13 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) gbWidgetStyleLayout->addWidget( cbTearOffHandles ); cbTearOffHandles->hide(); // reenable when the corresponding Qt method is virtual and properly reimplemented - TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 ); - gbPreview->setColumnLayout( 0, Vertical ); + TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 ); + gbPreview->setColumnLayout( 0, Qt::Vertical ); gbPreview->layout()->setMargin( 0 ); gbPreview->layout()->setSpacing( KDialog::spacingHint() ); gbPreview->setFlat( true ); stylePreview = new StylePreview( gbPreview ); - gbPreview->layout()->add( stylePreview ); + gbPreview->tqlayout()->add( stylePreview ); page1Layout->addWidget( gbWidgetStyle ); page1Layout->addWidget( gbPreview ); @@ -294,16 +294,16 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) box1->setSpacing( KDialog::spacingHint() ); box1->setMargin( 0 ); TQLabel* lbl = new TQLabel( i18n("0%"), box1 ); - lbl->setAlignment( AlignLeft ); + lbl->tqsetAlignment( AlignLeft ); lbl = new TQLabel( i18n("50%"), box1 ); - lbl->setAlignment( AlignHCenter ); + lbl->tqsetAlignment( AlignHCenter ); lbl = new TQLabel( i18n("100%"), box1 ); - lbl->setAlignment( AlignRight ); + lbl->tqsetAlignment( AlignRight ); lblMenuEffectType = new TQLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer ); - lblMenuEffectType->setAlignment( AlignBottom | AlignLeft ); + lblMenuEffectType->tqsetAlignment( AlignBottom | AlignLeft ); lblMenuOpacity = new TQLabel( slOpacity, i18n("Menu &opacity:"), menuContainer ); - lblMenuOpacity->setAlignment( AlignBottom | AlignLeft ); + lblMenuOpacity->tqsetAlignment( AlignBottom | AlignLeft ); menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 ); menuContainerLayout->addWidget( comboMenuEffectType, 1, 0 ); @@ -642,7 +642,7 @@ void KCMStyle::save() if (m_bEffectsDirty) { KIPC::sendMessageAll(KIPC::SettingsChanged); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } //update kicker to re-used tooltips kicker parameter otherwise, it overwritted //by style tooltips parameters. @@ -659,7 +659,7 @@ void KCMStyle::save() bool KCMStyle::findStyle( const TQString& str, int& combobox_item ) { - StyleEntry* se = styleEntries.find(str.lower()); + StyleEntry* se = styleEntries.tqfind(str.lower()); TQString name = se ? se->name : str; @@ -754,7 +754,7 @@ void KCMStyle::loadStyle( KConfig& config ) { TQString id = (*it).lower(); // Find the entry. - if ( (entry = styleEntries.find(id)) != 0 ) + if ( (entry = styleEntries.tqfind(id)) != 0 ) { // Do not add hidden entries if (entry->hidden) @@ -795,9 +795,9 @@ void KCMStyle::loadStyle( KConfig& config ) item = i; if ( id == cfgStyle ) // ExactMatch break; - else if ( id.contains( cfgStyle ) ) + else if ( id.tqcontains( cfgStyle ) ) break; - else if ( id.contains( TQApplication::style().className() ) ) + else if ( id.tqcontains( TQApplication::tqstyle().className() ) ) break; item = 0; } @@ -823,7 +823,7 @@ void KCMStyle::styleChanged() void KCMStyle::switchStyle(const TQString& styleName, bool force) { // Don't flicker the preview if the same style is chosen in the cb - if (!force && appliedStyle && appliedStyle->name() == styleName) + if (!force && appliedStyle && TQT_TQOBJECT(appliedStyle)->name() == styleName) return; // Create an instance of the new style... @@ -837,13 +837,13 @@ void KCMStyle::switchStyle(const TQString& styleName, bool force) setStyleRecursive( stylePreview, style ); // this flickers, but reliably draws the widgets correctly. - stylePreview->resize( stylePreview->sizeHint() ); + stylePreview->resize( stylePreview->tqsizeHint() ); delete appliedStyle; appliedStyle = style; // Set the correct style description - StyleEntry* entry = styleEntries.find( styleName ); + StyleEntry* entry = styleEntries.tqfind( styleName ); TQString desc; desc = i18n("Description: %1").arg( entry ? entry->desc : i18n("No description available.") ); lblStyleDesc->setText( desc ); @@ -863,12 +863,12 @@ void KCMStyle::setStyleRecursive(TQWidget* w, TQStyle* s) w->setStyle(s); // Recursively update all children. - const TQObjectList *children = w->children(); - if (!children) + const TQObjectList children = w->childrenListObject(); + if (children.isEmpty()) return; // Apply the style to each child widget. - TQPtrListIterator childit(*children); + TQPtrListIterator childit(children); TQObject *child; while ((child = childit.current()) != 0) { diff --git a/kcontrol/style/keramik/keramikconf.h b/kcontrol/style/keramik/keramikconf.h index de1c58dfd..6de7edb10 100644 --- a/kcontrol/style/keramik/keramikconf.h +++ b/kcontrol/style/keramik/keramikconf.h @@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE. class TQCheckBox; -class KeramikStyleConfig: public QWidget +class KeramikStyleConfig: public TQWidget { Q_OBJECT public: diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp index 112f2c241..51d5aad5f 100644 --- a/kcontrol/style/menupreview.cpp +++ b/kcontrol/style/menupreview.cpp @@ -30,11 +30,11 @@ MenuPreview::MenuPreview( TQWidget* parent, int opacity, PreviewMode pvm ) - : TQWidget( parent, 0, WStyle_Customize | WRepaintNoErase ), + : TQWidget( parent, 0, (WFlags)(WStyle_Customize | WRepaintNoErase) ), pixBackground(NULL), pixOverlay(NULL), pixBlended(NULL) { setFixedSize(150, 150); - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); mode = pvm; if (opacity < 0) opacity = 0; @@ -68,7 +68,7 @@ void MenuPreview::createPixmaps() if (pixBlended) pixBlended->resize( w, h ); - TQColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); TQColor c1 = cg.background(); TQColor c2 = cg.mid(); @@ -96,7 +96,7 @@ void MenuPreview::createPixmaps() void MenuPreview::blendPixmaps() { - // Rebuild pixmaps, and repaint + // Rebuild pixmaps, and tqrepaint if (pixBlended && pixBackground) { if (mode == Blend && pixOverlay) { @@ -105,7 +105,7 @@ void MenuPreview::blendPixmaps() KImageEffect::blend(src, dst, menuOpacity); pixBlended->convertFromImage( dst ); } else if (mode == Tint) { - TQColor clr = colorGroup().button(); + TQColor clr = tqcolorGroup().button(); TQImage dst = pixBackground->convertToImage(); KImageEffect::blend(clr, dst, menuOpacity); pixBlended->convertFromImage( dst ); @@ -121,7 +121,7 @@ void MenuPreview::setOpacity( int opacity ) if ((int)(menuOpacity*100) != opacity) { menuOpacity = opacity/100.0; blendPixmaps(); - repaint( false ); + tqrepaint( false ); } } @@ -130,14 +130,14 @@ void MenuPreview::setPreviewMode( PreviewMode pvm ) if (mode != pvm) { mode = pvm; blendPixmaps(); - repaint( false ); + tqrepaint( false ); } } void MenuPreview::paintEvent( TQPaintEvent* /* pe */ ) { // Paint the frame and blended pixmap - TQColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); int x2 = width()-1; int y2 = height()-1; diff --git a/kcontrol/style/menupreview.h b/kcontrol/style/menupreview.h index ad22e77af..e82b88f18 100644 --- a/kcontrol/style/menupreview.h +++ b/kcontrol/style/menupreview.h @@ -24,7 +24,7 @@ class KPixmap; -class MenuPreview : public QWidget +class MenuPreview : public TQWidget { Q_OBJECT diff --git a/kcontrol/style/stylepreview.ui b/kcontrol/style/stylepreview.ui index fbb4929f2..d438c0ad8 100644 --- a/kcontrol/style/stylepreview.ui +++ b/kcontrol/style/stylepreview.ui @@ -1,6 +1,6 @@ StylePreview - + StylePreview @@ -29,14 +29,14 @@ Expanding - + 20 50 - + TabWidget2 @@ -51,7 +51,7 @@ 2 - + tab @@ -62,7 +62,7 @@ unnamed - + ButtonGroup1 @@ -73,7 +73,7 @@ unnamed - + RadioButton1 @@ -84,7 +84,7 @@ true - + RadioButton2 @@ -106,7 +106,7 @@ Horizontal - + CheckBox1 @@ -122,7 +122,7 @@ - + ScrollBar1 @@ -133,7 +133,7 @@ Vertical - + Combobox @@ -143,7 +143,7 @@ ComboBox1 - + ProgressBar1 @@ -151,7 +151,7 @@ 70 - + Slider1 @@ -159,7 +159,7 @@ Horizontal - + layout3 @@ -177,14 +177,14 @@ Expanding - + 40 20 - + SpinBox1 @@ -196,13 +196,13 @@ 0 - + 0 0 - + 200 32767 @@ -212,7 +212,7 @@ 999999 - + PushButton1 @@ -224,13 +224,13 @@ 0 - + 0 0 - + 200 32767 @@ -250,7 +250,7 @@ Expanding - + 30 20 @@ -261,7 +261,7 @@ - + tab @@ -276,10 +276,10 @@ kdialog.h stylepreview.ui.h - + init() - eventFilter( QObject *, QEvent * ev ) - + eventFilter( TQObject *, TQEvent * ev ) + diff --git a/kcontrol/style/stylepreview.ui.h b/kcontrol/style/stylepreview.ui.h index 076197955..9f5188afe 100644 --- a/kcontrol/style/stylepreview.ui.h +++ b/kcontrol/style/stylepreview.ui.h @@ -40,7 +40,7 @@ void StylePreview::init() { ++it; obj->installEventFilter(this); - ((TQWidget*)obj)->setFocusPolicy(NoFocus); + ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus); } delete l; } diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui index d234683ca..6802dd226 100644 --- a/kcontrol/taskbar/kcmtaskbarui.ui +++ b/kcontrol/taskbar/kcmtaskbarui.ui @@ -1,6 +1,6 @@ TaskbarConfigUI - + TaskbarConfigUI @@ -24,7 +24,7 @@ 0 - + taskbarGroup @@ -39,7 +39,7 @@ unnamed - + kcfg_SortByDesktop @@ -55,7 +55,7 @@ By default this option is selected. - + kcfg_ShowAllWindows @@ -71,7 +71,7 @@ By default this option is selected. By default, this option is selected and all windows are shown. - + kcfg_ShowWindowListBtn @@ -85,7 +85,7 @@ By default, this option is selected and all windows are shown. Selecting this option causes the taskbar to display a button that, when clicked, shows a list of all windows in a popup menu. - + kcfg_GroupTasks @@ -105,7 +105,7 @@ You can set the taskbar to <strong>Never</strong> group windows, to By default the taskbar groups windows when it is full. - + groupTasksLabel @@ -116,7 +116,7 @@ By default the taskbar groups windows when it is full. kcfg_GroupTasks - + kcfg_ShowOnlyIconified @@ -129,7 +129,7 @@ By default the taskbar groups windows when it is full. By default, this option is not selected and the taskbar will show all windows. - + kcfg_ShowIcon @@ -145,7 +145,7 @@ By default, this option is not selected and the taskbar will show all windows. - + showAllScreens @@ -161,12 +161,12 @@ By default this option is selected. By default, this option is selected and all windows are shown. - + appearance - + textLabel1 @@ -177,7 +177,7 @@ By default, this option is selected and all windows are shown. appearance - + kcfg_UseCustomColors @@ -191,7 +191,7 @@ By default, this option is selected and all windows are shown. true - + layout9 @@ -209,7 +209,7 @@ By default, this option is selected and all windows are shown. Expanding - + 191 20 @@ -234,7 +234,7 @@ By default, this option is selected and all windows are shown. Expanding - + 191 20 @@ -249,7 +249,7 @@ By default, this option is selected and all windows are shown. - + taskBackgroundColorLabel @@ -268,7 +268,7 @@ By default, this option is selected and all windows are shown. - + inactiveTaskTextColorLabel @@ -279,7 +279,7 @@ By default, this option is selected and all windows are shown. kcfg_InactiveTaskTextColor - + activeTaskTextColorLabel @@ -300,7 +300,7 @@ By default, this option is selected and all windows are shown. Expanding - + 191 20 @@ -319,14 +319,14 @@ By default, this option is selected and all windows are shown. Fixed - + 20 20 - + kcfg_SortByApp @@ -339,7 +339,7 @@ By default, this option is selected and all windows are shown. - + GroupBox1 @@ -350,7 +350,7 @@ By default, this option is selected and all windows are shown. unnamed - + leftButtonLabel @@ -361,7 +361,7 @@ By default, this option is selected and all windows are shown. kcfg_LeftButtonAction - + middleButtonLabel @@ -372,7 +372,7 @@ By default, this option is selected and all windows are shown. kcfg_MiddleButtonAction - + rightButtonLabel @@ -383,7 +383,7 @@ By default, this option is selected and all windows are shown. kcfg_RightButtonAction - + kcfg_LeftButtonAction @@ -396,7 +396,7 @@ By default, this option is selected and all windows are shown. - + kcfg_MiddleButtonAction @@ -409,7 +409,7 @@ By default, this option is selected and all windows are shown. - + kcfg_RightButtonAction @@ -434,7 +434,7 @@ By default, this option is selected and all windows are shown. Expanding - + 20 20 diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp index f3a5a85df..8d85b2fb5 100644 --- a/kcontrol/usbview/kcmusb.cpp +++ b/kcontrol/usbview/kcmusb.cpp @@ -39,7 +39,7 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &) gbox->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(gbox); - TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint()); + TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->tqlayout(), KDialog::spacingHint()); TQSplitter *splitter = new TQSplitter(gbox); vvbox->addWidget(splitter); @@ -87,12 +87,12 @@ void USBViewer::load() refresh(); } -static Q_UINT32 key( USBDevice &dev ) +static TQ_UINT32 key( USBDevice &dev ) { return dev.bus()*256 + dev.device(); } -static Q_UINT32 key_parent( USBDevice &dev ) +static TQ_UINT32 key_parent( USBDevice &dev ) { return dev.bus()*256 + dev.parent(); } @@ -104,7 +104,7 @@ static void delete_recursive( TQListViewItem *item, const TQIntDicttext(1).toUInt())) { + if (!new_items.tqfind(it.current()->text(1).toUInt())) { delete_recursive( it.current()->firstChild(), new_items); delete it.current(); } @@ -130,10 +130,10 @@ void USBViewer::refresh() for ( ; it.current(); ++it) if (it.current()->level() == level) { - Q_UINT32 k = key(*it.current()); + TQ_UINT32 k = key(*it.current()); if (level == 0) { - TQListViewItem *item = _items.find(k); + TQListViewItem *item = _items.tqfind(k); if (!item) { item = new TQListViewItem(_devices, it.current()->product(), @@ -144,10 +144,10 @@ void USBViewer::refresh() } else { - TQListViewItem *parent = new_items.find(key_parent(*it.current())); + TQListViewItem *parent = new_items.tqfind(key_parent(*it.current())); if (parent) { - TQListViewItem *item = _items.find(k); + TQListViewItem *item = _items.tqfind(k); if (!item) { item = new TQListViewItem(parent, @@ -178,7 +178,7 @@ void USBViewer::selectionChanged(TQListViewItem *item) { if (item) { - Q_UINT32 busdev = item->text(1).toUInt(); + TQ_UINT32 busdev = item->text(1).toUInt(); USBDevice *dev = USBDevice::find(busdev>>8, busdev&255); if (dev) { diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp index 466fd9a98..63a049742 100644 --- a/kcontrol/usbview/usbdevices.cpp +++ b/kcontrol/usbview/usbdevices.cpp @@ -103,7 +103,7 @@ void USBDevice::parseSysDir(int bus, int parent, int level, TQString dname) TQStringList list = dir.entryList(); for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - if ((*it).contains(':')) + if ((*it).tqcontains(':')) continue; USBDevice* dev = new USBDevice(); @@ -277,8 +277,8 @@ bool USBDevice::parse(TQString fname) // read in the device infos USBDevice *device = 0; int start=0, end; - result.replace(TQRegExp("^\n"),""); - while ((end = result.find('\n', start)) > 0) + result.tqreplace(TQRegExp("^\n"),""); + while ((end = result.tqfind('\n', start)) > 0) { TQString line = result.mid(start, end-start); @@ -332,10 +332,10 @@ void USBDevice::collectData( int fd, int level, usb_device_info &di, int parent) _bus = di.udi_bus; _device = di.udi_addr; - _product = TQString::fromLatin1(di.udi_product); + _product = TQString::tqfromLatin1(di.udi_product); if ( _device == 1 ) _product += " " + TQString::number( _bus ); - _manufacturer = TQString::fromLatin1(di.udi_vendor); + _manufacturer = TQString::tqfromLatin1(di.udi_vendor); _prodID = di.udi_productNo; _vendorID = di.udi_vendorNo; _class = di.udi_class; diff --git a/kcontrol/view1394/view1394widget.ui b/kcontrol/view1394/view1394widget.ui index 5b6ba13e8..a249fb195 100644 --- a/kcontrol/view1394/view1394widget.ui +++ b/kcontrol/view1394/view1394widget.ui @@ -163,7 +163,7 @@ Expanding - + 40 20 diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index df9cbb6a6..d7219e17e 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -177,7 +177,7 @@ void KCMXinerama::save() { if (!kapp->dcopClient()->isAttached()) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin", "", "reconfigure()", TQString("")); ksplashrc->setGroup("Xinerama"); ksplashrc->writeEntry("KSplashScreen", xw->_enableXinerama->isChecked() ? xw->_ksplashDisplay->currentItem() : -2 /* ignore Xinerama */); @@ -216,17 +216,17 @@ void KCMXinerama::windowIndicator(int dpy) { } TQWidget *KCMXinerama::indicator(int dpy) { - TQLabel *si = new TQLabel(TQString::number(dpy+1), 0, "Screen Indicator", WX11BypassWM ); + TQLabel *si = new TQLabel(TQString::number(dpy+1), 0, "Screen Indicator", (WFlags)WX11BypassWM ); TQFont fnt = KGlobalSettings::generalFont(); fnt.setPixelSize(100); si->setFont(fnt); si->setFrameStyle(TQFrame::Panel); si->setFrameShadow(TQFrame::Plain); - si->setAlignment(Qt::AlignCenter); + si->tqsetAlignment(Qt::AlignCenter); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(dpy).center()); - TQRect targetGeometry(TQPoint(0,0), si->sizeHint()); + TQRect targetGeometry(TQPoint(0,0), si->tqsizeHint()); targetGeometry.moveCenter(screenCenter); si->setGeometry(targetGeometry); si->show(); diff --git a/kcontrol/xinerama/xineramawidget.ui b/kcontrol/xinerama/xineramawidget.ui index cab732afd..d01495fdc 100644 --- a/kcontrol/xinerama/xineramawidget.ui +++ b/kcontrol/xinerama/xineramawidget.ui @@ -1,6 +1,6 @@ XineramaWidget - + XineramaWidget @@ -16,7 +16,7 @@ unnamed - + X Coordinate @@ -73,7 +73,7 @@ FollowStyle - + ButtonGroup1 @@ -84,7 +84,7 @@ unnamed - + _enableXinerama @@ -92,7 +92,7 @@ Enable multiple monitor virtual desktop support - + _enableResistance @@ -103,7 +103,7 @@ Enable multiple monitor window resistance support - + _enablePlacement @@ -114,7 +114,7 @@ Enable multiple monitor window placement support - + _enableMaximize @@ -125,7 +125,7 @@ Enable multiple monitor window maximize support - + _enableFullscreen @@ -138,7 +138,7 @@ - + _identify @@ -156,14 +156,14 @@ Expanding - + 431 21 - + layout2 @@ -171,7 +171,7 @@ unnamed - + TextLabel2 @@ -185,7 +185,7 @@ _unmanagedDisplay - + _ksplashDisplay @@ -193,7 +193,7 @@ false - + TextLabel2_2 @@ -207,7 +207,7 @@ _unmanagedDisplay - + _unmanagedDisplay @@ -315,12 +315,12 @@ kdialog.h xineramawidget.ui.h - + configChanged() - - + + emitConfigChanged() - + diff --git a/kdcop/kdcoplistview.cpp b/kdcop/kdcoplistview.cpp index cc727072b..7348fbc01 100644 --- a/kdcop/kdcoplistview.cpp +++ b/kdcop/kdcoplistview.cpp @@ -62,7 +62,7 @@ TQString KDCOPListView::encode(TQListViewItem *theCode) TQString unNormalisedSignature(function); - int s = unNormalisedSignature.find(' '); + int s = unNormalisedSignature.tqfind(' '); if ( s < 0 ) s = 0; @@ -71,8 +71,8 @@ TQString KDCOPListView::encode(TQListViewItem *theCode) unNormalisedSignature = unNormalisedSignature.mid(s); - int left = unNormalisedSignature.find('('); - int right = unNormalisedSignature.findRev(')'); + int left = unNormalisedSignature.tqfind('('); + int right = unNormalisedSignature.tqfindRev(')'); if (-1 == left) { @@ -86,7 +86,7 @@ TQString KDCOPListView::encode(TQListViewItem *theCode) for (TQStringList::Iterator it = types.begin(); it != types.end(); ++it) { (*it) = (*it).stripWhiteSpace(); - int s = (*it).find(' '); + int s = (*it).tqfind(' '); if (-1 != s) { names.append((*it).mid(s + 1)); diff --git a/kdcop/kdcoplistview.h b/kdcop/kdcoplistview.h index b104e95cf..9cb549f7f 100644 --- a/kdcop/kdcoplistview.h +++ b/kdcop/kdcoplistview.h @@ -28,7 +28,7 @@ class KDCOPListView : public KListView }; -class DCOPBrowserItem : public QListViewItem +class DCOPBrowserItem : public TQListViewItem { public: diff --git a/kdcop/kdcopview.ui b/kdcop/kdcopview.ui index 5d1de7a93..7491da6cb 100644 --- a/kdcop/kdcopview.ui +++ b/kdcop/kdcopview.ui @@ -1,7 +1,7 @@ kdcopview Ian Reinhart Geiser geiseri@kde.org - + kdcopview @@ -25,7 +25,7 @@ kListViewSearchLine1 - + textLabel1 @@ -36,7 +36,7 @@ kListViewSearchLine1 - + splitter8 @@ -48,7 +48,7 @@ lv - + layout18 @@ -56,7 +56,7 @@ unnamed - + l_replyType @@ -86,7 +86,7 @@ lb_replyData - + TextLabel1 @@ -98,7 +98,7 @@ 0 - + 0 0 diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp index b7b21bd7f..78db79f3e 100644 --- a/kdcop/kdcopwindow.cpp +++ b/kdcop/kdcopwindow.cpp @@ -60,7 +60,7 @@ class DCOPBrowserFunctionItem; //------------------------------ -class KMultiIntEdit : public QVBox +class KMultiIntEdit : public TQVBox { public: KMultiIntEdit(TQWidget *parent , const char * name=0) : TQVBox(parent,name) {} @@ -70,7 +70,7 @@ public: new TQLabel(caption + ": ", l); KLineEdit* e = new KLineEdit( l ); m_widgets.insert(key, e ) ; - e->setValidator( new TQIntValidator( e ) ); + e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) ); } int field(int key) { @@ -114,7 +114,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem { setExpandable(true); setText(0, TQString::fromUtf8(app_)); - setPixmap(0, KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), KIcon::Small )); + setPixmap(0, KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "exec" ), KIcon::Small )); /* Get the icon: we use the icon from a mainwindow in that class. @@ -157,7 +157,7 @@ DCOPBrowserApplicationItem::setOpen(bool o) void DCOPBrowserApplicationItem::populate() { - KApplication::setOverrideCursor(waitCursor); + KApplication::setOverrideCursor(tqwaitCursor); bool ok = false; bool isDefault = false; @@ -202,7 +202,7 @@ void DCOPBrowserApplicationItem::retreiveIcon(int /*callId*/,const TQCString& /* TQPixmap returnQPixmap; reply >> returnQPixmap; if(!returnQPixmap.isNull()) - setPixmap(0, TQPixmap(returnQPixmap.convertToImage().smoothScale(16,16)) ); + setPixmap(0, TQPixmap(TQImage(returnQPixmap.convertToImage()).smoothScale(16,16)) ); else kdDebug() << "Unable to retreive the icon" << endl; } @@ -240,7 +240,7 @@ DCOPBrowserInterfaceItem::setOpen(bool o) void DCOPBrowserInterfaceItem::populate() { - KApplication::setOverrideCursor(waitCursor); + KApplication::setOverrideCursor(tqwaitCursor); bool ok = false; @@ -312,12 +312,12 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name) // set up the actions - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); - KStdAction::copy( this, TQT_SLOT( slotCopy()), actionCollection() ); + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy()), actionCollection() ); KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); - (void) new KAction( i18n( "&Reload" ), "reload", KStdAccel::shortcut(KStdAccel::Reload), this, TQT_SLOT( slotReload() ), actionCollection(), "reload" ); + (void) new KAction( i18n( "&Reload" ), "reload", KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" ); exeaction = new KAction @@ -325,7 +325,7 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name) i18n("&Execute"), "exec", CTRL + Key_E, - this, + TQT_TQOBJECT(this), TQT_SLOT(slotCallFunction()), actionCollection(), "execute" @@ -336,7 +336,7 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name) langmode = new KSelectAction ( i18n("Language Mode"), CTRL + Key_M, - this, + TQT_TQOBJECT(this), TQT_SLOT(slotMode()), actionCollection(), "langmode"); @@ -424,7 +424,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) TQString::null, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ); mydialog.setCaption - ( i18n("Call Function %1").arg( fitem->function() ) ); + ( i18n("Call Function %1").arg( static_cast(fitem->function()) ) ); TQFrame *frame = mydialog.makeMainWidget(); @@ -464,10 +464,10 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) KLineEdit* e = new KLineEdit( frame ); grid->addWidget( e, i, 2 ); wl.append( e ); - e->setValidator( new TQIntValidator( e ) ); + e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) ); } else if ( type == "unsigned" || type == "uint" || type == "unsigned int" - || type == "Q_UINT32" ) + || type == "TQ_UINT32" ) { TQLabel* n = new TQLabel( name, frame ); grid->addWidget( n, i, 0 ); @@ -477,7 +477,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) grid->addWidget( e, i, 2 ); wl.append( e ); - TQIntValidator* iv = new TQIntValidator( e ); + TQIntValidator* iv = new TQIntValidator( TQT_TQOBJECT(e) ); iv->setBottom( 0 ); e->setValidator( iv ); } @@ -490,10 +490,10 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) KLineEdit* e = new KLineEdit( frame ); grid->addWidget( e, i, 2 ); wl.append( e ); - e->setValidator( new TQIntValidator( e ) ); + e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) ); } else if ( type == "ulong" || type == "unsigned long" || type == "unsigned long int" - || type == "Q_UINT64" ) + || type == "TQ_UINT64" ) { TQLabel* n = new TQLabel( name, frame ); grid->addWidget( n, i, 0 ); @@ -502,7 +502,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) KLineEdit* e = new KLineEdit( frame ); grid->addWidget( e, i, 2 ); wl.append( e ); - e->setValidator( new TQIntValidator( e ) ); + e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) ); } else if ( type == "short" || type == "short int" ) { @@ -513,7 +513,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) KLineEdit* e = new KLineEdit( frame ); grid->addWidget( e, i, 2 ); wl.append( e ); - e->setValidator( new TQIntValidator( e ) ); + e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) ); } else if ( type == "ushort" || type == "unsigned short" || type == "unsigned short int" ) { @@ -524,7 +524,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) KLineEdit* e = new KLineEdit( frame ); grid->addWidget( e, i, 2 ); wl.append( e ); - e->setValidator( new TQIntValidator( e ) ); + e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) ); } else if ( type == "float" ) { @@ -535,7 +535,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) KLineEdit* e = new KLineEdit( frame ); grid->addWidget( e, i, 2 ); wl.append( e ); - e->setValidator( new TQDoubleValidator( e ) ); + e->setValidator( new TQDoubleValidator( TQT_TQOBJECT(e) ) ); } else if ( type == "double" ) { @@ -546,7 +546,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) KLineEdit* e = new KLineEdit( frame ); grid->addWidget( e, i, 2 ); wl.append( e ); - e->setValidator( new TQDoubleValidator( e ) ); + e->setValidator( new TQDoubleValidator( TQT_TQOBJECT(e) ) ); } else if ( type == "bool" ) { @@ -697,7 +697,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) arg << e->text().toInt(); } else if ( type == "unsigned" || type == "uint" || type == "unsigned int" - || type == "Q_UINT32" ) + || type == "TQ_UINT32" ) { KLineEdit* e = (KLineEdit*)wl.at( i ); arg << e->text().toUInt(); @@ -722,7 +722,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) KLineEdit* e = (KLineEdit*)wl.at( i ); arg << e->text().toUShort(); } - else if ( type == "Q_UINT64" ) + else if ( type == "TQ_UINT64" ) { KLineEdit* e = ( KLineEdit* )wl.at( i ); arg << e->text().toULongLong(); @@ -902,7 +902,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) void KDCOPWindow::slotFillApplications() { - KApplication::setOverrideCursor(waitCursor); + KApplication::setOverrideCursor(tqwaitCursor); QCStringList apps = dcopClient->registeredApplications(); TQCString appId = dcopClient->appId(); @@ -924,7 +924,7 @@ bool KDCOPWindow::demarshal ( TQCString & replyType, TQDataStream & reply, - QListBox *theList + TQListBox *theList ) { TQStringList ret; @@ -936,7 +936,7 @@ bool KDCOPWindow::demarshal if ( replyType == "TQVariant" ) { // read data type from stream - Q_INT32 type; + TQ_INT32 type; reply >> type; // change replyType to real typename @@ -952,7 +952,7 @@ bool KDCOPWindow::demarshal ret << TQString::number(i); } else if ( replyType == "uint" || replyType == "unsigned int" - || replyType == "Q_UINT32" ) + || replyType == "TQ_UINT32" ) { uint i; reply >> i; @@ -970,9 +970,9 @@ bool KDCOPWindow::demarshal reply >> l; ret << TQString::number(l); } - else if ( replyType == "Q_UINT64" ) + else if ( replyType == "TQ_UINT64" ) { - Q_UINT64 i; + TQ_UINT64 i; reply >> i; ret << TQString::number(i); } @@ -1053,7 +1053,7 @@ bool KDCOPWindow::demarshal TQCursor r; reply >> r; //theList->insertItem(r, 1); - ret << "Cursor #" + TQString::number(r.shape()); + ret << "Cursor #" + TQString::number(r.tqshape()); } else if (replyType == "TQPixmap") { @@ -1093,7 +1093,7 @@ bool KDCOPWindow::demarshal DCOPRef r; reply >> r; if (!r.app().isEmpty() && !r.obj().isEmpty()) - ret << TQString("DCOPRef(%1, %2)").arg(r.app(), r.obj()); + ret << TQString("DCOPRef(%1, %2)").arg(static_cast(r.app()), static_cast(r.obj())); } else { @@ -1158,7 +1158,7 @@ KDCOPWindow::getParameters { TQString unNormalisedSignature(_unNormalisedSignature); - int s = unNormalisedSignature.find(' '); + int s = unNormalisedSignature.tqfind(' '); if ( s < 0 ) s = 0; @@ -1167,8 +1167,8 @@ KDCOPWindow::getParameters unNormalisedSignature = unNormalisedSignature.mid(s); - int left = unNormalisedSignature.find('('); - int right = unNormalisedSignature.findRev(')'); + int left = unNormalisedSignature.tqfind('('); + int right = unNormalisedSignature.tqfindRev(')'); if (-1 == left) { @@ -1189,9 +1189,9 @@ KDCOPWindow::getParameters { (*it) = (*it).simplifyWhiteSpace(); - int s = (*it).findRev(' '); + int s = (*it).tqfindRev(' '); - if (-1 != s && !intTypes.contains((*it).mid(s + 1))) + if (-1 != s && !intTypes.tqcontains((*it).mid(s + 1))) { names.append((*it).mid(s + 1)); diff --git a/kdebugdialog/kabstractdebugdialog.cpp b/kdebugdialog/kabstractdebugdialog.cpp index bdf267dd1..43d6699dd 100644 --- a/kdebugdialog/kabstractdebugdialog.cpp +++ b/kdebugdialog/kabstractdebugdialog.cpp @@ -52,11 +52,11 @@ void KAbstractDebugDialog::buildButtons( TQVBoxLayout * topLayout ) pCancelButton = new KPushButton( KStdGuiItem::cancel(), this ); hbox->addWidget( pCancelButton ); - int w1 = pHelpButton->sizeHint().width(); - int w2 = pOKButton->sizeHint().width(); - int w3 = pCancelButton->sizeHint().width(); + int w1 = pHelpButton->tqsizeHint().width(); + int w2 = pOKButton->tqsizeHint().width(); + int w3 = pCancelButton->tqsizeHint().width(); int w4 = QMAX( w1, QMAX( w2, w3 ) ); - int w5 = pApplyButton->sizeHint().width(); + int w5 = pApplyButton->tqsizeHint().width(); w4 = QMAX(w4, w5); pHelpButton->setFixedWidth( w4 ); diff --git a/kdebugdialog/kdebugdialog.cpp b/kdebugdialog/kdebugdialog.cpp index 2660356fc..32ac341ac 100644 --- a/kdebugdialog/kdebugdialog.cpp +++ b/kdebugdialog/kdebugdialog.cpp @@ -54,13 +54,13 @@ KDebugDialog::KDebugDialog( TQStringList areaList, TQWidget *parent, const char // Build combo of debug areas pDebugAreas = new TQComboBox( false, this ); - pDebugAreas->setFixedHeight( pDebugAreas->sizeHint().height() ); + pDebugAreas->setFixedHeight( pDebugAreas->tqsizeHint().height() ); pDebugAreas->insertStringList( areaList ); topLayout->addWidget( pDebugAreas ); TQGridLayout *gbox = new TQGridLayout( 2, 2, KDialog::marginHint() ); if( gbox == 0 ) { return; } - topLayout->addLayout( gbox ); + topLayout->addLayout( TQT_TQLAYOUT(gbox) ); TQStringList destList; destList.append( i18n("File") ); @@ -200,7 +200,7 @@ void KDebugDialog::slotDebugAreaChanged( const TQString & text ) save(); TQString data = text.simplifyWhiteSpace(); - int space = data.find(" "); + int space = data.tqfind(" "); if (space == -1) kdError() << "No space:" << data << endl; diff --git a/kdebugdialog/klistdebugdialog.cpp b/kdebugdialog/klistdebugdialog.cpp index 7ddb2b559..1f358e35a 100644 --- a/kdebugdialog/klistdebugdialog.cpp +++ b/kdebugdialog/klistdebugdialog.cpp @@ -83,9 +83,9 @@ void KListDebugDialog::generateCheckBoxes( const TQString& filter ) for ( ; it != m_areaList.end() ; ++it ) { TQString data = (*it).simplifyWhiteSpace(); - if ( filter.isEmpty() || data.lower().contains( filter.lower() ) ) + if ( filter.isEmpty() || data.lower().tqcontains( filter.lower() ) ) { - int space = data.find(" "); + int space = data.tqfind(" "); if (space == -1) kdError() << "No space:" << data << endl; @@ -129,7 +129,7 @@ void KListDebugDialog::load() int setting = pConfig->readNumEntry( "InfoOutput", 2 ); // override setting if in m_changes - if( m_changes.find( (*it)->name() ) != m_changes.end() ) { + if( m_changes.tqfind( (*it)->name() ) != m_changes.end() ) { setting = m_changes[ (*it)->name() ]; } @@ -182,7 +182,7 @@ void KListDebugDialog::activateArea( TQCString area, bool activate ) for ( ; it.current() ; ++it ) { if ( area == (*it)->name() // debug area code = cb's name - || (*it)->text().find( TQString::fromLatin1(area) ) != -1 ) // area name included in cb text + || (*it)->text().tqfind( TQString::tqfromLatin1(area) ) != -1 ) // area name included in cb text { (*it)->setChecked( activate ); return; diff --git a/kdebugdialog/main.cpp b/kdebugdialog/main.cpp index 61d977ee8..4434d8e4f 100644 --- a/kdebugdialog/main.cpp +++ b/kdebugdialog/main.cpp @@ -50,7 +50,7 @@ TQStringList readAreaList() while (!ts->eof()) { data = ts->readLine().simplifyWhiteSpace(); - int pos = data.find("#"); + int pos = data.tqfind("#"); if ( pos != -1 ) data.truncate( pos ); diff --git a/kdepasswd/kcm/chfacedlg.cpp b/kdepasswd/kcm/chfacedlg.cpp index c5f700338..8344164db 100644 --- a/kdepasswd/kcm/chfacedlg.cpp +++ b/kdepasswd/kcm/chfacedlg.cpp @@ -128,7 +128,7 @@ void ChFaceDlg::addCustomPixmap( TQString imPath, bool saveCopy ) } if ( (pix.width() > KCFGUserAccount::faceSize()) || (pix.height() > KCFGUserAccount::faceSize()) ) - pix = pix.scale( KCFGUserAccount::faceSize(), KCFGUserAccount::faceSize(), TQImage::ScaleMin );// Should be no bigger than certain size. + pix = pix.scale( KCFGUserAccount::faceSize(), KCFGUserAccount::faceSize(), TQ_ScaleMin );// Should be no bigger than certain size. if ( saveCopy ) { diff --git a/kdepasswd/kcm/chfnprocess.cpp b/kdepasswd/kcm/chfnprocess.cpp index 4f6af0add..76d5209ea 100644 --- a/kdepasswd/kcm/chfnprocess.cpp +++ b/kdepasswd/kcm/chfnprocess.cpp @@ -60,7 +60,7 @@ int ChfnProcess::ConverseChfn(const char *pass) if ( line.isEmpty() ) continue;// discard line - if ( line.contains( "Password: " )/*isPrompt( line, "password" )*/ ) + if ( line.tqcontains( "Password: " )/*isPrompt( line, "password" )*/ ) { WaitSlave(); write(m_Fd, pass, strlen(pass)); @@ -69,11 +69,11 @@ int ChfnProcess::ConverseChfn(const char *pass) line = readLine(); // Let's see what the outcome was - if ( line.contains( "Changing finger info" ) ) + if ( line.tqcontains( "Changing finger info" ) ) { // do nothing } - else if ( line.contains( "information changed" ) ) + else if ( line.tqcontains( "information changed" ) ) { status=0; break; @@ -83,7 +83,7 @@ int ChfnProcess::ConverseChfn(const char *pass) status=0; break; } - else if ( line.contains( "Password error" ) || line.contains("Incorrect password") ) + else if ( line.tqcontains( "Password error" ) || line.tqcontains("Incorrect password") ) { status=PasswordError; break; diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp index a3a25c0f3..8a6a520bb 100644 --- a/kdepasswd/kcm/main.cpp +++ b/kdepasswd/kcm/main.cpp @@ -150,11 +150,11 @@ void KCMUserAccount::load() KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces/"; TQString fs = KCFGUserAccount::faceSource(); - if (fs == TQString::fromLatin1("UserOnly")) + if (fs == TQString::tqfromLatin1("UserOnly")) _facePerm = userOnly; - else if (fs == TQString::fromLatin1("PreferUser")) + else if (fs == TQString::tqfromLatin1("PreferUser")) _facePerm = userFirst; - else if (fs == TQString::fromLatin1("PreferAdmin")) + else if (fs == TQString::tqfromLatin1("PreferAdmin")) _facePerm = adminFirst; else _facePerm = adminOnly; // Admin Only @@ -231,7 +231,7 @@ void KCMUserAccount::save() { KMessageBox::sorry( this, i18n("An error occurred and your password has " "probably not been changed. The error " - "message was:\n%1").arg(proc->error())); + "message was:\n%1").arg(static_cast(proc->error()))); kdDebug() << "ChfnProcess->exec() failed. Error code: " << ret << "\nOutput:" << proc->error() << endl; } diff --git a/kdepasswd/kcm/main_widget.ui b/kdepasswd/kcm/main_widget.ui index 29adb0835..bb5a57b94 100644 --- a/kdepasswd/kcm/main_widget.ui +++ b/kdepasswd/kcm/main_widget.ui @@ -1,7 +1,7 @@ MainWidget Frans Englich <frans.englich@telia.com> - + MainWidget @@ -32,13 +32,13 @@ 0 - + 74 74 - + 74 74 @@ -51,7 +51,7 @@ - + grpUserInformation @@ -62,7 +62,7 @@ unnamed - + lblOrganisation @@ -73,12 +73,12 @@ leOrganization - + leRealname - + lblRealName @@ -89,12 +89,12 @@ leRealname - + leOrganization - + lblEmail @@ -105,12 +105,12 @@ leEmail - + leEmail - + textLabel3 @@ -121,12 +121,12 @@ leSMTP - + leSMTP - + lblUIDTell @@ -134,7 +134,7 @@ User ID: - + lblUID @@ -154,14 +154,14 @@ Expanding - + 20 16 - + layout1 @@ -169,7 +169,7 @@ unnamed - + lblUsername @@ -182,18 +182,18 @@ - + AlignVCenter - + lblClickButtonInfo <i>(Click the button to change your image)</i> - + AlignVCenter @@ -217,14 +217,14 @@ Expanding - + 111 20 - + kcfg_EchoMode @@ -247,7 +247,7 @@ unnamed - + rdbOneStar @@ -255,7 +255,7 @@ Show one star for each letter - + rdbThreeStars @@ -263,7 +263,7 @@ Show three stars for each letter - + rdbShowPassword diff --git a/kdepasswd/passwd.cpp b/kdepasswd/passwd.cpp index 89bbbdf82..6e3bb223f 100644 --- a/kdepasswd/passwd.cpp +++ b/kdepasswd/passwd.cpp @@ -158,7 +158,7 @@ int PasswdProcess::ConversePasswd(const char *oldpass, const char *newpass, case 2: m_Error = ""; - if( line.contains("again")) + if( line.tqcontains("again")) { m_Error = line; kill(m_Pid, SIGKILL); @@ -278,7 +278,7 @@ bool PasswdProcess::isPrompt(TQCString line, const char *word) return false; if (word == 0L) return true; - return line.contains(word, false); + return line.tqcontains(word, false); } diff --git a/kdepasswd/passwddlg.cpp b/kdepasswd/passwddlg.cpp index c6764a4e9..edfdd8b8b 100644 --- a/kdepasswd/passwddlg.cpp +++ b/kdepasswd/passwddlg.cpp @@ -88,7 +88,7 @@ KDEpasswd2Dialog::KDEpasswd2Dialog(const char *oldpass, TQCString user) if (m_User.isEmpty()) setPrompt(i18n("Please enter your new password:")); else - setPrompt(i18n("Please enter the new password for user %1:").arg(m_User)); + setPrompt(i18n("Please enter the new password for user %1:").arg(static_cast(m_User))); } diff --git a/kdeprint/descriptions/sortthem.cpp b/kdeprint/descriptions/sortthem.cpp index 9adc284b1..1e1a37d93 100644 --- a/kdeprint/descriptions/sortthem.cpp +++ b/kdeprint/descriptions/sortthem.cpp @@ -15,7 +15,7 @@ char buf[1024]; while (!feof(stdin)) { char *cline = fgets(buf, 1000, stdin); if (!cline) break; - if (!have.contains(cline)) { + if (!have.tqcontains(cline)) { have << cline; fprintf(stdout, "%s", cline); } diff --git a/kdeprint/kdeprint_part/printpart.cpp b/kdeprint/kdeprint_part/printpart.cpp index c8d6ccb15..93876d24d 100644 --- a/kdeprint/kdeprint_part/printpart.cpp +++ b/kdeprint/kdeprint_part/printpart.cpp @@ -33,7 +33,7 @@ typedef KParts::GenericFactory PrintPartFactory; K_EXPORT_COMPONENT_FACTORY( libkdeprint_part, PrintPartFactory ) -PrintPart::PrintPart(TQWidget *parentWidget, const char * /*widgetName*/ , +PrintPart::PrintPart(TQWidget *tqparentWidget, const char * /*widgetName*/ , TQObject *parent, const char *name, const TQStringList & /*args*/ ) : KParts::ReadOnlyPart(parent, name) @@ -42,8 +42,8 @@ PrintPart::PrintPart(TQWidget *parentWidget, const char * /*widgetName*/ , instance()->iconLoader()->addAppDir("kdeprint"); m_extension = new PrintPartExtension(this); - m_view = new KMMainView(parentWidget, "MainView", actionCollection()); - m_view->setFocusPolicy(TQWidget::ClickFocus); + m_view = new KMMainView(tqparentWidget, "MainView", actionCollection()); + m_view->setFocusPolicy(TQ_ClickFocus); m_view->enableToolbar(false); setWidget(m_view); diff --git a/kdeprint/kdeprint_part/printpart.h b/kdeprint/kdeprint_part/printpart.h index c84fed1cc..f89a3574b 100644 --- a/kdeprint/kdeprint_part/printpart.h +++ b/kdeprint/kdeprint_part/printpart.h @@ -31,7 +31,7 @@ class PrintPart : public KParts::ReadOnlyPart { Q_OBJECT public: - PrintPart(TQWidget *parentWidget, const char *widgetName, + PrintPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList & ); virtual ~PrintPart(); diff --git a/kdeprint/kdeprintfax/conffax.cpp b/kdeprint/kdeprintfax/conffax.cpp index 2351c9c69..ca6b0d180 100644 --- a/kdeprint/kdeprintfax/conffax.cpp +++ b/kdeprint/kdeprintfax/conffax.cpp @@ -45,12 +45,12 @@ ConfFax::ConfFax(TQWidget *parent, const char *name) m_pagesize->insertItem(i18n("A4")); m_pagesize->insertItem(i18n("Letter")); m_pagesize->insertItem(i18n("Legal")); - QLabel *m_resolutionlabel = new TQLabel(i18n("&Resolution:"), this); + TQLabel *m_resolutionlabel = new TQLabel(i18n("&Resolution:"), this); m_resolutionlabel->setBuddy(m_resolution); - QLabel *m_pagesizelabel = new TQLabel(i18n("&Paper size:"), this); + TQLabel *m_pagesizelabel = new TQLabel(i18n("&Paper size:"), this); m_pagesizelabel->setBuddy(m_pagesize); - QGridLayout *l0 = new TQGridLayout(this, 3, 2, 10, 10); + TQGridLayout *l0 = new TQGridLayout(this, 3, 2, 10, 10); l0->setColStretch(1, 1); l0->setRowStretch(2, 1); l0->addWidget(m_resolutionlabel, 0, 0); @@ -63,7 +63,7 @@ void ConfFax::load() { KConfig *conf = KGlobal::config(); conf->setGroup("Fax"); - QString v = conf->readEntry("Page", KGlobal::locale()->pageSize() == TQPrinter::A4 ? "a4" : "letter"); + TQString v = conf->readEntry("Page", KGlobal::locale()->pageSize() == TQPrinter::A4 ? "a4" : "letter"); if (v == "letter") m_pagesize->setCurrentItem(1); else if (v == "legal") m_pagesize->setCurrentItem(2); else m_pagesize->setCurrentItem(0); diff --git a/kdeprint/kdeprintfax/conffax.h b/kdeprint/kdeprintfax/conffax.h index 8429ac40e..bf31c2990 100644 --- a/kdeprint/kdeprintfax/conffax.h +++ b/kdeprint/kdeprintfax/conffax.h @@ -25,7 +25,7 @@ class TQComboBox; -class ConfFax : public QWidget +class ConfFax : public TQWidget { public: ConfFax(TQWidget *parent = 0, const char *name = 0); @@ -34,7 +34,7 @@ public: void save(); private: - QComboBox *m_resolution, *m_pagesize; + TQComboBox *m_resolution, *m_pagesize; }; #endif diff --git a/kdeprint/kdeprintfax/conffilters.cpp b/kdeprint/kdeprintfax/conffilters.cpp index fc33f88b1..388cd1ab2 100644 --- a/kdeprint/kdeprintfax/conffilters.cpp +++ b/kdeprint/kdeprintfax/conffilters.cpp @@ -68,8 +68,8 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name) TQToolTip::add(m_up, i18n("Move filter up")); TQToolTip::add(m_down, i18n("Move filter down")); - QHBoxLayout *l0 = new TQHBoxLayout(this, 10, 10); - QVBoxLayout *l1 = new TQVBoxLayout(0, 0, 0); + TQHBoxLayout *l0 = new TQHBoxLayout(this, 10, 10); + TQVBoxLayout *l1 = new TQVBoxLayout(0, 0, 0); l0->addWidget(m_filters, 1); l0->addLayout(l1, 0); l1->addWidget(m_add); @@ -85,19 +85,19 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name) void ConfFilters::load() { - QFile f(locate("data","kdeprintfax/faxfilters")); + TQFile f(locate("data","kdeprintfax/faxfilters")); if (f.exists() && f.open(IO_ReadOnly)) { - QTextStream t(&f); - QString line; + TQTextStream t(&f); + TQString line; int p(-1); - QListViewItem *item(0); + TQListViewItem *item(0); while (!t.eof()) { line = t.readLine().stripWhiteSpace(); - if ((p=line.find(TQRegExp("\\s"))) != -1) + if ((p=line.tqfind(TQRegExp("\\s"))) != -1) { - QString mime(line.left(p)), cmd(line.right(line.length()-p-1).stripWhiteSpace()); + TQString mime(line.left(p)), cmd(line.right(line.length()-p-1).stripWhiteSpace()); if (!mime.isEmpty() && !cmd.isEmpty()) item = new TQListViewItem(m_filters, item, mime, cmd); } @@ -107,11 +107,11 @@ void ConfFilters::load() void ConfFilters::save() { - QListViewItem *item = m_filters->firstChild(); - QFile f(locateLocal("data","kdeprintfax/faxfilters")); + TQListViewItem *item = m_filters->firstChild(); + TQFile f(locateLocal("data","kdeprintfax/faxfilters")); if (f.open(IO_WriteOnly)) { - QTextStream t(&f); + TQTextStream t(&f); while (item) { t << item->text(0) << ' ' << item->text(1) << endl; @@ -122,7 +122,7 @@ void ConfFilters::save() void ConfFilters::slotAdd() { - QString mime, cmd; + TQString mime, cmd; if (FilterDlg::doIt(this, &mime, &cmd)) if (!mime.isEmpty() && !cmd.isEmpty()) { @@ -135,7 +135,7 @@ void ConfFilters::slotAdd() void ConfFilters::slotRemove() { - QListViewItem *item = m_filters->currentItem(); + TQListViewItem *item = m_filters->currentItem(); if (item) delete item; updateButton(); @@ -143,10 +143,10 @@ void ConfFilters::slotRemove() void ConfFilters::slotChange() { - QListViewItem *item = m_filters->currentItem(); + TQListViewItem *item = m_filters->currentItem(); if (item) { - QString mime(item->text(0)), cmd(item->text(1)); + TQString mime(item->text(0)), cmd(item->text(1)); if (FilterDlg::doIt(this, &mime, &cmd)) { item->setText(0, mime); @@ -157,7 +157,7 @@ void ConfFilters::slotChange() void ConfFilters::slotUp() { - QListViewItem *item = m_filters->currentItem(); + TQListViewItem *item = m_filters->currentItem(); if (item && item->itemAbove()) { m_filters->moveItem(item, 0, item->itemAbove()->itemAbove()); @@ -168,7 +168,7 @@ void ConfFilters::slotUp() void ConfFilters::slotDown() { - QListViewItem *item = m_filters->currentItem(); + TQListViewItem *item = m_filters->currentItem(); if (item && item->itemBelow()) { m_filters->moveItem(item, 0, item->itemBelow()); @@ -179,7 +179,7 @@ void ConfFilters::slotDown() void ConfFilters::updateButton() { - QListViewItem *item = m_filters->currentItem(); + TQListViewItem *item = m_filters->currentItem(); bool state=item && item->itemBelow(); m_remove->setEnabled(item); diff --git a/kdeprint/kdeprintfax/conffilters.h b/kdeprint/kdeprintfax/conffilters.h index ce3d64156..c4eb1f5c2 100644 --- a/kdeprint/kdeprintfax/conffilters.h +++ b/kdeprint/kdeprintfax/conffilters.h @@ -25,7 +25,7 @@ #include class KListView; -class ConfFilters : public QWidget +class ConfFilters : public TQWidget { Q_OBJECT public: @@ -42,7 +42,7 @@ protected slots: void updateButton(); private: KListView *m_filters; - QPushButton *m_add,*m_remove,*m_up,*m_down,*m_change; + TQPushButton *m_add,*m_remove,*m_up,*m_down,*m_change; }; #endif diff --git a/kdeprint/kdeprintfax/confgeneral.cpp b/kdeprint/kdeprintfax/confgeneral.cpp index 757c54af7..a7d8ac3e7 100644 --- a/kdeprint/kdeprintfax/confgeneral.cpp +++ b/kdeprint/kdeprintfax/confgeneral.cpp @@ -38,11 +38,11 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name) m_name = new TQLineEdit(this); m_company = new TQLineEdit(this); m_number = new TQLineEdit(this); - QLabel *m_namelabel = new TQLabel(i18n("&Name:"), this); + TQLabel *m_namelabel = new TQLabel(i18n("&Name:"), this); m_namelabel->setBuddy(m_name); - QLabel *m_companylabel = new TQLabel(i18n("&Company:"), this); + TQLabel *m_companylabel = new TQLabel(i18n("&Company:"), this); m_companylabel->setBuddy(m_company); - QLabel *m_numberlabel = new TQLabel(i18n("N&umber:"), this); + TQLabel *m_numberlabel = new TQLabel(i18n("N&umber:"), this); m_numberlabel->setBuddy(m_number); KSeparator *sep = new KSeparator( this ); m_replace_int_char = new TQCheckBox( i18n( "Replace international prefix '+' with:" ), this ); @@ -51,7 +51,7 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name) connect( m_replace_int_char, TQT_SIGNAL( toggled( bool ) ), m_replace_int_char_val, TQT_SLOT( setEnabled( bool ) ) ); - QGridLayout *l0 = new TQGridLayout(this, 6, 2, 10, 10); + TQGridLayout *l0 = new TQGridLayout(this, 6, 2, 10, 10); l0->setColStretch(1, 1); l0->setRowStretch(5, 1); l0->addWidget(m_namelabel, 0, 0); diff --git a/kdeprint/kdeprintfax/confgeneral.h b/kdeprint/kdeprintfax/confgeneral.h index 5a3ee6ca9..e94ac7422 100644 --- a/kdeprint/kdeprintfax/confgeneral.h +++ b/kdeprint/kdeprintfax/confgeneral.h @@ -26,7 +26,7 @@ class TQLineEdit; class TQCheckBox; -class ConfGeneral : public QWidget +class ConfGeneral : public TQWidget { public: ConfGeneral(TQWidget *parent = 0, const char *name = 0); @@ -35,7 +35,7 @@ public: void save(); private: - QLineEdit *m_name, *m_company, *m_number; + TQLineEdit *m_name, *m_company, *m_number; TQCheckBox *m_replace_int_char; TQLineEdit *m_replace_int_char_val; }; diff --git a/kdeprint/kdeprintfax/configdlg.cpp b/kdeprint/kdeprintfax/configdlg.cpp index 3ede8cab7..a3616cf54 100644 --- a/kdeprint/kdeprintfax/configdlg.cpp +++ b/kdeprint/kdeprintfax/configdlg.cpp @@ -31,16 +31,16 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name) : KDialogBase(IconList, i18n("Configuration"), Ok|Cancel, Ok, parent, name, true) { - QVBox *page1 = addVBoxPage(i18n("Personal"), i18n("Personal Settings"), DesktopIcon("kdmconfig")); + TQVBox *page1 = addVBoxPage(i18n("Personal"), i18n("Personal Settings"), DesktopIcon("kdmconfig")); m_general = new ConfGeneral(page1, "Personal"); - QVBox *page2 = addVBoxPage(i18n("Page setup"), i18n("Page Setup"), DesktopIcon("editcopy")); + TQVBox *page2 = addVBoxPage(i18n("Page setup"), i18n("Page Setup"), DesktopIcon("editcopy")); m_fax = new ConfFax(page2, "Fax"); - QVBox *page3 = addVBoxPage(i18n("System"), i18n("Fax System Selection"), DesktopIcon("kdeprintfax")); + TQVBox *page3 = addVBoxPage(i18n("System"), i18n("Fax System Selection"), DesktopIcon("kdeprintfax")); m_system = new ConfSystem(page3, "System"); - QVBox *page4 = addVBoxPage(i18n("Filters"), i18n("Filters Configuration"), DesktopIcon("filter")); + TQVBox *page4 = addVBoxPage(i18n("Filters"), i18n("Filters Configuration"), DesktopIcon("filter")); m_filters = new ConfFilters(page4, "Filters"); resize(450, 300); diff --git a/kdeprint/kdeprintfax/confsystem.cpp b/kdeprint/kdeprintfax/confsystem.cpp index 51ea326c8..e67a6b1e9 100644 --- a/kdeprint/kdeprintfax/confsystem.cpp +++ b/kdeprint/kdeprintfax/confsystem.cpp @@ -47,24 +47,24 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name) m_system->insertItem("Mgetty-sendfax"); m_system->insertItem( "Other" ); m_command = new TQLineEdit(this); - QLabel *syslabel = new TQLabel(i18n("F&ax system:"), this); - QLabel *cmdlabel = new TQLabel(i18n("Co&mmand:"), this); + TQLabel *syslabel = new TQLabel(i18n("F&ax system:"), this); + TQLabel *cmdlabel = new TQLabel(i18n("Co&mmand:"), this); syslabel->setBuddy(m_system); cmdlabel->setBuddy(m_command); connect(m_system, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSystemChanged(int))); m_current = 0; m_system->setCurrentItem(m_current); - QWidget *m_dummy1 = new TQWidget(this), *m_dummy2 = new TQWidget(this); + TQWidget *m_dummy1 = new TQWidget(this), *m_dummy2 = new TQWidget(this); m_server = new TQLineEdit(m_dummy1); m_device = new TQComboBox(m_dummy2); - QLabel *srvlabel = new TQLabel(i18n("Fax &server (if any):"), m_dummy1); - QLabel *devlabel = new TQLabel(i18n("&Fax/Modem device:"), m_dummy2); + TQLabel *srvlabel = new TQLabel(i18n("Fax &server (if any):"), m_dummy1); + TQLabel *devlabel = new TQLabel(i18n("&Fax/Modem device:"), m_dummy2); srvlabel->setBuddy(m_server); devlabel->setBuddy(m_device); m_device->insertItem(i18n("Standard Modem Port")); for (int i=0; i<10; i++) - m_device->insertItem(i18n("Serial Port #%1").arg(i)); + m_device->insertItem(TQString(i18n("Serial Port #%1").arg(i))); m_device->insertItem( i18n( "Other" ) ); connect( m_device, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotDeviceChanged( int ) ) ); m_device_edit = new TQLineEdit( m_dummy2 ); @@ -73,9 +73,9 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name) KSeparator *sep = new KSeparator(this); sep->setMinimumHeight(10); - QVBoxLayout *l0 = new TQVBoxLayout(this, 10, 10); - QGridLayout *l1 = new TQGridLayout(0, 2, 2, 0, 10); - l0->addLayout(l1); + TQVBoxLayout *l0 = new TQVBoxLayout(this, 10, 10); + TQGridLayout *l1 = new TQGridLayout(0, 2, 2, 0, 10); + l0->addLayout(TQT_TQLAYOUT(l1)); l1->setColStretch(1, 1); l1->addWidget(syslabel, 0, 0); l1->addWidget(cmdlabel, 1, 0); @@ -85,10 +85,10 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name) l0->addWidget(m_dummy1); l0->addWidget(m_dummy2); l0->addStretch(1); - QHBoxLayout *l4 = new TQHBoxLayout(m_dummy1, 0, 10); + TQHBoxLayout *l4 = new TQHBoxLayout(m_dummy1, 0, 10); l4->addWidget(srvlabel, 0); l4->addWidget(m_server, 1); - QGridLayout *l5 = new TQGridLayout( m_dummy2, 2, 2, 0, 10 ); + TQGridLayout *l5 = new TQGridLayout( m_dummy2, 2, 2, 0, 10 ); l5->setColStretch( 1, 1 ); l5->addWidget(devlabel, 0, 0); l5->addWidget(m_device, 0, 1); @@ -103,7 +103,7 @@ void ConfSystem::load() m_commands << conf->readPathEntry("HylaFax", defaultCommand(hylafax_default_cmd)); m_commands << conf->readPathEntry("Mgetty", defaultCommand(mgetty_default_cmd)); m_commands << conf->readPathEntry( "Other", TQString::null ); - QString v = conf->readEntry("System", "efax"); + TQString v = conf->readEntry("System", "efax"); if (v == "mgetty") m_current = MGETTY_ID; else if (v == "hylafax") m_current = HYLAFAX_ID; else if ( v == "other" ) m_current = OTHER_ID; @@ -158,7 +158,7 @@ void ConfSystem::save() } conf->setGroup("Fax"); if ( m_device->currentItem() != ( m_device->count()-1 ) ) - conf->writeEntry("Device", m_device->currentItem() == 0 ? TQString("modem") : TQString("ttyS%1").arg(m_device->currentItem()-1)); + conf->writeEntry("Device", m_device->currentItem() == 0 ? TQString("modem") : TQString(TQString("ttyS%1").arg(m_device->currentItem()-1))); else { TQString dev = m_device_edit->text(); @@ -178,13 +178,13 @@ void ConfSystem::slotSystemChanged(int ID) m_commands[m_current] = m_command->text(); m_current = ID; if (ID == EFAX_ID) - m_device->parentWidget()->show(); + m_device->tqparentWidget()->show(); else - m_device->parentWidget()->hide(); + m_device->tqparentWidget()->hide(); if (ID == HYLAFAX_ID) - m_server->parentWidget()->show(); + m_server->tqparentWidget()->show(); else - m_server->parentWidget()->hide(); + m_server->tqparentWidget()->hide(); m_command->setText(m_commands[m_current]); } diff --git a/kdeprint/kdeprintfax/confsystem.h b/kdeprint/kdeprintfax/confsystem.h index 6a2d00c12..9306df9f3 100644 --- a/kdeprint/kdeprintfax/confsystem.h +++ b/kdeprint/kdeprintfax/confsystem.h @@ -27,7 +27,7 @@ class TQLineEdit; class TQComboBox; -class ConfSystem : public QWidget +class ConfSystem : public TQWidget { Q_OBJECT public: @@ -41,9 +41,9 @@ protected slots: void slotDeviceChanged(int); private: - QComboBox *m_system, *m_device; - QLineEdit *m_command, *m_server, *m_device_edit; - QStringList m_commands; + TQComboBox *m_system, *m_device; + TQLineEdit *m_command, *m_server, *m_device_edit; + TQStringList m_commands; int m_current; }; diff --git a/kdeprint/kdeprintfax/defcmds.cpp b/kdeprint/kdeprintfax/defcmds.cpp index 09631b51d..7dacc787a 100644 --- a/kdeprint/kdeprintfax/defcmds.cpp +++ b/kdeprint/kdeprintfax/defcmds.cpp @@ -24,15 +24,15 @@ TQString defaultCommand(const TQString& cmd) { - QString str(cmd); - QRegExp r("%exe_(\\w+)"); + TQString str(cmd); + TQRegExp r("%exe_(\\w+)"); int p(-1); if ((p=r.search(str)) != -1) { - QString exe = KStandardDirs::findExe(r.cap(1)); + TQString exe = KStandardDirs::findExe(r.cap(1)); if (exe.isEmpty()) exe = "/usr/bin/"+r.cap(1); - str.replace(p, r.matchedLength(), exe); + str.tqreplace(p, r.matchedLength(), exe); } return str; } diff --git a/kdeprint/kdeprintfax/faxab.cpp b/kdeprint/kdeprintfax/faxab.cpp index ebd6b9cb2..403caee04 100644 --- a/kdeprint/kdeprintfax/faxab.cpp +++ b/kdeprint/kdeprintfax/faxab.cpp @@ -41,19 +41,19 @@ FaxAB::FaxAB(TQWidget *parent, const char *name) m_list->addColumn( i18n( "Name" ) ); m_list->addColumn( i18n( "Fax Number" ) ); m_list->header()->setStretchEnabled( true, 0 ); - QLabel *m_listlabel = new TQLabel(i18n("Entries:"), this); + TQLabel *m_listlabel = new TQLabel(i18n("Entries:"), this); m_ok = new KPushButton(KStdGuiItem::ok(), this); - QPushButton *m_cancel = new KPushButton(KStdGuiItem::cancel(), this); - QPushButton *m_ab = new KPushButton(KGuiItem(i18n("&Edit Addressbook"), "contents"), this); + TQPushButton *m_cancel = new KPushButton(KStdGuiItem::cancel(), this); + TQPushButton *m_ab = new KPushButton(KGuiItem(i18n("&Edit Addressbook"), "contents"), this); connect(m_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); connect(m_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); connect(m_ab, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditAb())); m_ok->setDefault(true); - QVBoxLayout *l0 = new TQVBoxLayout(this, 10, 10); + TQVBoxLayout *l0 = new TQVBoxLayout(this, 10, 10); l0->addWidget( m_listlabel ); l0->addWidget( m_list ); - QHBoxLayout *l2 = new TQHBoxLayout(0, 0, 10); + TQHBoxLayout *l2 = new TQHBoxLayout(0, 0, 10); l0->addLayout(l2, 0); l2->addWidget(m_ab, 0); l2->addStretch(1); @@ -163,7 +163,7 @@ bool FaxAB::getEntry(TQStringList& number, TQStringList& name, TQStringList& ent /* number = kab.m_fax->currentText(); name = kab.m_name->currentText(); - if (kab.m_entries.contains(name)) + if (kab.m_entries.tqcontains(name)) { enterprise = kab.m_entries[name][0]; } @@ -180,7 +180,7 @@ bool FaxAB::getEntryByNumber(const TQString& number, TQString& name, TQString& e for (KABC::AddressBook::Iterator it=bk->begin(); it!=bk->end(); ++it) { KABC::PhoneNumber::List numbers = (*it).phoneNumbers(); - QStringList filteredNumbers; + TQStringList filteredNumbers; for (TQValueList::Iterator nit=numbers.begin(); nit!=numbers.end(); ++nit) { if (((*nit).type() & KABC::PhoneNumber::Fax) ) diff --git a/kdeprint/kdeprintfax/faxctrl.cpp b/kdeprint/kdeprintfax/faxctrl.cpp index 1d1cd1fa5..f88d7ace5 100644 --- a/kdeprint/kdeprintfax/faxctrl.cpp +++ b/kdeprint/kdeprintfax/faxctrl.cpp @@ -87,9 +87,9 @@ static TQString stripNumber( const TQString& s ) // removes any non-numeric character, except ('+','*','#') (hope it's supported by faxing tools) TQString strip_s = s; - strip_s.replace( TQRegExp( "[^\\d+*#]" ), "" ); - if ( strip_s.find( '+' ) != -1 && conf->readBoolEntry( "ReplaceIntChar", false ) ) - strip_s.replace( "+", conf->readEntry( "ReplaceIntCharVal" ) ); + strip_s.tqreplace( TQRegExp( "[^\\d+*#]" ), "" ); + if ( strip_s.tqfind( '+' ) != -1 && conf->readBoolEntry( "ReplaceIntChar", false ) ) + strip_s.tqreplace( "+", conf->readEntry( "ReplaceIntCharVal" ) ); return strip_s; } @@ -133,11 +133,11 @@ static TQString tagList( int n, ... ) static TQString processTag( const TQString& match, bool value) { TQString v; - int p = match.find( '_' ); + int p = match.tqfind( '_' ); if ( p != -1 && match[ p+1 ] == '{' ) { // Find the ?? that separates the iftrue from the iffalse parts. - int q = match.find( "?\?", p+2 ); + int q = match.tqfind( "?\?", p+2 ); if ( q == -1 ) { // No iffalse part @@ -162,7 +162,7 @@ static TQString processTag( const TQString& match, bool value) static TQString processTag( const TQString& match, const TQString& value ) { TQString v; - int p = match.find( '_' ); + int p = match.tqfind( '_' ); if ( p != -1 ) { if ( value.isEmpty() ) @@ -172,7 +172,7 @@ static TQString processTag( const TQString& match, const TQString& value ) if ( match[ p+1 ] == '{' ) { v = match.mid( p+2, match.length()-p-3 ); - v.replace( "@@", quote( value ) ); + v.tqreplace( "@@", quote( value ) ); } else v = ( "-" + match.mid( p+1 ) + " " + quote( value ) ); @@ -291,7 +291,7 @@ static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFa if (v.isEmpty()) v = getenv("FAXSERVER"); if (v.isEmpty()) - v = TQString::fromLatin1("localhost"); + v = TQString::tqfromLatin1("localhost"); v = processTag( match, v ); } else if (isTag( match, "%page" )) @@ -392,7 +392,7 @@ bool FaxCtrl::send(KdeprintFax *f) void FaxCtrl::slotReceivedStdout(KProcess*, char *buffer, int len) { - QCString str(buffer, len); + TQCString str(buffer, len); kdDebug() << "Received stdout: " << str << endl; addLog(TQString(str)); } @@ -428,7 +428,7 @@ TQString FaxCtrl::faxCommand() { KConfig *conf = KGlobal::config(); conf->setGroup("System"); - QString sys = conf->readPathEntry("System", "efax"); + TQString sys = conf->readPathEntry("System", "efax"); TQString cmd; if (sys == "hylafax") cmd = conf->readPathEntry("HylaFax", hylafax_default_cmd); @@ -445,13 +445,13 @@ TQString FaxCtrl::faxCommand() void FaxCtrl::sendFax() { - if ( m_command.find( "%files" ) != -1 ) + if ( m_command.tqfind( "%files" ) != -1 ) { // replace %files tag - QString filestr; + TQString filestr; for (TQStringList::ConstIterator it=m_filteredfiles.begin(); it!=m_filteredfiles.end(); ++it) filestr += (quote(*it)+" "); - m_command.replace("%files", filestr); + m_command.tqreplace("%files", filestr); } if ( !m_faxlist.isEmpty() ) @@ -476,7 +476,7 @@ void FaxCtrl::filter() { if (m_files.count() > 0) { - QString mimeType = KMimeType::findByURL(KURL(m_files[0]), 0, true)->name(); + TQString mimeType = KMimeType::findByURL(KURL(m_files[0]), 0, true)->name(); if (mimeType == "application/postscript" || mimeType == "image/tiff") { emit message(i18n("Skipping %1...").arg(m_files[0])); @@ -486,12 +486,12 @@ void FaxCtrl::filter() } else { - QString tmp = locateLocal("tmp","kdeprintfax_") + kapp->randomString(8); + TQString tmp = locateLocal("tmp","kdeprintfax_") + kapp->randomString(8); m_filteredfiles.prepend(tmp); m_tempfiles.append(tmp); m_process->clearArguments(); *m_process << locate("data","kdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","kdeprintfax/faxfilters")) - << TQString::fromLatin1("--mime=%1").arg(mimeType) + << TQString::tqfromLatin1("--mime=%1").arg(mimeType) << "-p" << pageSize() << KProcess::quote(m_files[0]) << KProcess::quote(tmp); if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput)) @@ -518,15 +518,15 @@ void FaxCtrl::viewLog(TQWidget *) { if (!m_logview) { - QWidget *topView = new TQWidget(0, "LogView", WType_TopLevel|WStyle_DialogBorder|WDestructiveClose); + TQWidget *topView = new TQWidget(0, "LogView", (WFlags)(WType_TopLevel|WStyle_DialogBorder|WDestructiveClose)); m_logview = new KTextEdit(topView); - m_logview->setTextFormat( Qt::LogText ); + m_logview->setTextFormat( TQt::LogText ); m_logview->setWordWrap( TQTextEdit::WidgetWidth ); m_logview->setPaper( Qt::white ); //m_logview->setReadOnly(true); //m_logview->setWordWrap(TQTextEdit::NoWrap); - QPushButton *m_clear = new KPushButton(KStdGuiItem::clear(), topView); - QPushButton *m_close = new KPushButton(KStdGuiItem::close(), topView); + TQPushButton *m_clear = new KPushButton(KStdGuiItem::clear(), topView); + TQPushButton *m_close = new KPushButton(KStdGuiItem::close(), topView); TQPushButton *m_print = new KPushButton( KStdGuiItem::print(), topView ); TQPushButton *m_save = new KPushButton( KStdGuiItem::saveAs(), topView ); m_close->setDefault(true); @@ -536,9 +536,9 @@ void FaxCtrl::viewLog(TQWidget *) connect( m_print, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPrintLog() ) ); connect( m_save, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSaveLog() ) ); - QVBoxLayout *l0 = new TQVBoxLayout(topView, 10, 10); + TQVBoxLayout *l0 = new TQVBoxLayout(topView, 10, 10); l0->addWidget(m_logview); - QHBoxLayout *l1 = new TQHBoxLayout(0, 0, 10); + TQHBoxLayout *l1 = new TQHBoxLayout(0, 0, 10); l0->addLayout(l1); l1->addStretch(1); l1->addWidget( m_save ); @@ -553,7 +553,7 @@ void FaxCtrl::viewLog(TQWidget *) } else { - KWin::activateWindow(m_logview->parentWidget()->winId()); + KWin::activateWindow(m_logview->tqparentWidget()->winId()); } } @@ -578,7 +578,7 @@ TQString FaxCtrl::faxSystem() { KConfig *conf = KGlobal::config(); conf->setGroup("System"); - QString s = conf->readEntry("System", "efax"); + TQString s = conf->readEntry("System", "efax"); s[0] = s[0].upper(); return s; } @@ -599,13 +599,13 @@ void FaxCtrl::slotClearLog() void FaxCtrl::slotCloseLog() { - const QObject *obj = sender(); + const TQObject *obj = TQT_TQOBJECT_CONST(sender()); if (m_logview) { - QTextEdit *view = m_logview; + TQTextEdit *view = m_logview; m_logview = 0; if (obj && obj->inherits("QPushButton")) - delete view->parentWidget(); + delete view->tqparentWidget(); kdDebug() << "slotClose()" << endl; } } @@ -617,7 +617,7 @@ void FaxCtrl::slotPrintLog() KPrinter printer; printer.setDocName( i18n( "Fax log" ) ); printer.setDocFileName( "faxlog" ); - if ( printer.setup( m_logview->topLevelWidget(), i18n( "Fax Log" ) ) ) + if ( printer.setup( m_logview->tqtopLevelWidget(), i18n( "Fax Log" ) ) ) { TQPainter painter( &printer ); TQPaintDeviceMetrics metric( &printer ); @@ -625,7 +625,7 @@ void FaxCtrl::slotPrintLog() //TQString txt = m_logview->text(); TQString txt = m_log; - txt.replace( '\n', "
    " ); + txt.tqreplace( '\n', "
    " ); txt.prepend( "

    " + i18n( "KDEPrint Fax Tool Log" ) + "

    " ); kdDebug() << "Log: " << txt << endl; @@ -634,7 +634,7 @@ void FaxCtrl::slotPrintLog() richText.setWidth( &painter, body.width() ); do { - richText.draw( &painter, body.left(), body.top(), view, m_logview->colorGroup() ); + richText.draw( &painter, body.left(), body.top(), view, m_logview->tqcolorGroup() ); view.moveBy( 0, body.height() ); painter.translate( 0, -body.height() ); if ( view.top() >= richText.height() ) diff --git a/kdeprint/kdeprintfax/faxctrl.h b/kdeprint/kdeprintfax/faxctrl.h index 04ad8ecc2..accbd6556 100644 --- a/kdeprint/kdeprintfax/faxctrl.h +++ b/kdeprint/kdeprintfax/faxctrl.h @@ -30,7 +30,7 @@ class KProcess; class TQTextEdit; -class FaxCtrl : public QObject +class FaxCtrl : public TQObject { Q_OBJECT public: @@ -64,9 +64,9 @@ protected: private: KProcess *m_process; - QString m_log, m_command; - QStringList m_files, m_filteredfiles, m_tempfiles; - QTextEdit *m_logview; + TQString m_log, m_command; + TQStringList m_files, m_filteredfiles, m_tempfiles; + TQTextEdit *m_logview; KdeprintFax::FaxItemList m_faxlist; }; diff --git a/kdeprint/kdeprintfax/filterdlg.cpp b/kdeprint/kdeprintfax/filterdlg.cpp index ea9a88ce9..5e6f018a1 100644 --- a/kdeprint/kdeprintfax/filterdlg.cpp +++ b/kdeprint/kdeprintfax/filterdlg.cpp @@ -30,14 +30,14 @@ FilterDlg::FilterDlg(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Filter Parameters"), Ok|Cancel, Ok) { - QWidget *w = new TQWidget(this); + TQWidget *w = new TQWidget(this); m_mime = new TQLineEdit(w); m_cmd = new TQLineEdit(w); - QLabel *m_mimelabel = new TQLabel(i18n("MIME type:"), w); - QLabel *m_cmdlabel = new TQLabel(i18n("Command:"), w); + TQLabel *m_mimelabel = new TQLabel(i18n("MIME type:"), w); + TQLabel *m_cmdlabel = new TQLabel(i18n("Command:"), w); - QGridLayout *l0 = new TQGridLayout(w, 2, 2, 10, 5); + TQGridLayout *l0 = new TQGridLayout(w, 2, 2, 10, 5); l0->setColStretch(1, 1); l0->addWidget(m_mimelabel, 0, 0); l0->addWidget(m_cmdlabel, 1, 0); diff --git a/kdeprint/kdeprintfax/filterdlg.h b/kdeprint/kdeprintfax/filterdlg.h index 859815607..f0736bc88 100644 --- a/kdeprint/kdeprintfax/filterdlg.h +++ b/kdeprint/kdeprintfax/filterdlg.h @@ -35,7 +35,7 @@ public: protected slots: void slotTextFilterChanged(); private: - QLineEdit *m_mime, *m_cmd; + TQLineEdit *m_mime, *m_cmd; }; #endif diff --git a/kdeprint/kdeprintfax/kdeprintfax.cpp b/kdeprint/kdeprintfax/kdeprintfax.cpp index a5f66992b..e8daf8c89 100644 --- a/kdeprint/kdeprintfax/kdeprintfax.cpp +++ b/kdeprint/kdeprintfax/kdeprintfax.cpp @@ -65,7 +65,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) connect(m_faxctrl, TQT_SIGNAL(message(const TQString&)), TQT_SLOT(slotMessage(const TQString&))); connect(m_faxctrl, TQT_SIGNAL(faxSent(bool)), TQT_SLOT(slotFaxSent(bool))); - QWidget *mainw = new TQWidget(this); + TQWidget *mainw = new TQWidget(this); setCentralWidget(mainw); m_files = new KListBox(mainw); connect( m_files, TQT_SIGNAL( currentChanged( TQListBoxItem* ) ), TQT_SLOT( slotCurrentChanged() ) ); @@ -79,7 +79,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) TQToolTip::add( m_downbtn, i18n( "Move down" ) ); connect( m_downbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveDown() ) ); m_downbtn->setEnabled( false ); - QLabel *m_filelabel = new TQLabel(i18n("F&iles:"), mainw); + TQLabel *m_filelabel = new TQLabel(i18n("F&iles:"), mainw); m_filelabel->setBuddy(m_files); KSeparator*m_line = new KSeparator( KSeparator::HLine, mainw); KSeparator *m_line2 = new KSeparator( KSeparator::HLine, mainw ); @@ -104,7 +104,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) TQToolTip::add( m_delbtn, i18n( "Remove fax number" ) ); m_delbtn->setEnabled( false ); connect( m_delbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxRemove() ) ); - QLabel *m_commentlabel = new TQLabel(i18n("&Comment:"), mainw); + TQLabel *m_commentlabel = new TQLabel(i18n("&Comment:"), mainw); KSystemTray *m_tray = new KSystemTray(this); m_tray->setPixmap(SmallIcon("kdeprintfax")); m_tray->show(); @@ -115,13 +115,13 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) // m_comment->setWordWrap(TQTextEdit::NoWrap); m_comment->setLineWidth(1); m_commentlabel->setBuddy(m_comment); - QLabel *m_timelabel = new TQLabel(i18n("Sched&ule:"), mainw); + TQLabel *m_timelabel = new TQLabel(i18n("Sched&ule:"), mainw); m_timecombo = new TQComboBox(mainw); m_timecombo->insertItem(i18n("Now")); m_timecombo->insertItem(i18n("At Specified Time")); m_timecombo->setCurrentItem(0); m_timelabel->setBuddy(m_timecombo); - m_time = new QTimeEdit(mainw); + m_time = new TQTimeEdit(mainw); m_time->setTime(TQTime::currentTime()); m_time->setEnabled(false); connect(m_timecombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTimeComboActivated(int))); @@ -131,7 +131,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) TQLabel *m_subjectlabel = new TQLabel( i18n( "Su&bject:" ), mainw ); m_subjectlabel->setBuddy( m_subject ); - QGridLayout *l0 = new TQGridLayout(mainw, 10, 2, 10, 5); + TQGridLayout *l0 = new TQGridLayout(mainw, 10, 2, 10, 5); l0->setColStretch(1,1); l0->addWidget(m_filelabel, 0, 0, Qt::AlignLeft|Qt::AlignTop); TQHBoxLayout *l2 = new TQHBoxLayout( 0, 0, 10 ); @@ -162,7 +162,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) l0->addWidget(m_commentlabel, 8, 0, Qt::AlignTop|Qt::AlignLeft); l0->addWidget(m_comment, 8, 1); l0->addWidget(m_timelabel, 9, 0); - QHBoxLayout *l1 = new TQHBoxLayout(0, 0, 5); + TQHBoxLayout *l1 = new TQHBoxLayout(0, 0, 5); l0->addLayout(l1, 9, 1); l1->addWidget(m_timecombo, 1); l1->addWidget(m_time, 0); @@ -178,7 +178,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) updateState(); resize(550,500); - QWidget *d = kapp->desktop(); + TQWidget *d = TQT_TQWIDGET(kapp->desktop()); move((d->width()-width())/2, (d->height()-height())/2); } @@ -188,19 +188,19 @@ KdeprintFax::~KdeprintFax() void KdeprintFax::initActions() { - new KAction(i18n("&Add File..."), "filenew", Qt::Key_Insert, this, TQT_SLOT(slotAdd()), actionCollection(), "file_add"); - new KAction(i18n("&Remove File"), "remove", Qt::Key_Delete, this, TQT_SLOT(slotRemove()), actionCollection(), "file_remove"); - new KAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, this, TQT_SLOT(slotFax()), actionCollection(), "fax_send"); - new KAction(i18n("A&bort"), "stop", Qt::Key_Escape, this, TQT_SLOT(slotAbort()), actionCollection(), "fax_stop"); - new KAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, this, TQT_SLOT(slotKab()), actionCollection(), "fax_ab"); - new KAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, this, TQT_SLOT(slotViewLog()), actionCollection(), "fax_log"); - new KAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, this, TQT_SLOT(slotView()), actionCollection(), "file_view"); - new KAction( i18n( "&New Fax Recipient..." ), "edit", Qt::CTRL+Qt::Key_N, this, TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" ); + new KAction(i18n("&Add File..."), "filenew", Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add"); + new KAction(i18n("&Remove File"), "remove", Qt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove"); + new KAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send"); + new KAction(i18n("A&bort"), "stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop"); + new KAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotKab()), actionCollection(), "fax_ab"); + new KAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "fax_log"); + new KAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "file_view"); + new KAction( i18n( "&New Fax Recipient..." ), "edit", Qt::CTRL+Qt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" ); - KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); setStandardToolBarMenuEnabled(true); - KStdAction::showMenubar(this, TQT_SLOT(slotToggleMenuBar()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection()); + KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleMenuBar()), actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection()); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); actionCollection()->action("fax_stop")->setEnabled(false); @@ -263,7 +263,7 @@ void KdeprintFax::slotAbort() void KdeprintFax::slotKab() { - QStringList number, name, enterprise; + TQStringList number, name, enterprise; if (FaxAB::getEntry(number, name, enterprise, this)) { for ( unsigned int i = 0; iinsertItem(KMimeType::pixmapForURL(url,0,KIcon::Small),target); @@ -314,7 +314,7 @@ void KdeprintFax::dropEvent(TQDropEvent *e) TQStringList KdeprintFax::files() { - QStringList l; + TQStringList l; for (uint i=0; icount(); i++) l.append(m_files->text(i)); return l; @@ -424,25 +424,25 @@ void KdeprintFax::slotConfigure() void KdeprintFax::updateState() { - QString cmd = m_faxctrl->faxCommand(); - m_cover->setEnabled(cmd.find("%cover") != -1); + TQString cmd = m_faxctrl->faxCommand(); + m_cover->setEnabled(cmd.tqfind("%cover") != -1); if ( !m_cover->isEnabled() ) m_cover->setChecked(false); - m_comment->setEnabled(cmd.find("%comment") != -1 && m_cover->isChecked()); - //m_comment->setPaper(m_comment->isEnabled() ? colorGroup().brush(TQColorGroup::Base) : colorGroup().brush(TQColorGroup::Background)); + m_comment->setEnabled(cmd.tqfind("%comment") != -1 && m_cover->isChecked()); + //m_comment->setPaper(m_comment->isEnabled() ? tqcolorGroup().brush(TQColorGroup::Base) : tqcolorGroup().brush(TQColorGroup::Background)); if (!m_comment->isEnabled()) { m_comment->setText(""); - m_comment->setPaper( colorGroup().background() ); + m_comment->setPaper( tqcolorGroup().background() ); } else - m_comment->setPaper( colorGroup().base() ); + m_comment->setPaper( tqcolorGroup().base() ); /* - m_enterprise->setEnabled(cmd.find("%enterprise") != -1); + m_enterprise->setEnabled(cmd.tqfind("%enterprise") != -1); if (!m_enterprise->isEnabled()) m_enterprise->setText(""); */ - if (cmd.find("%time") == -1) + if (cmd.tqfind("%time") == -1) { m_timecombo->setCurrentItem(0); m_timecombo->setEnabled(false); @@ -450,8 +450,8 @@ void KdeprintFax::updateState() } else m_timecombo->setEnabled( true ); - /*m_name->setEnabled( cmd.find( "%name" ) != -1 );*/ - m_subject->setEnabled( cmd.find( "%subject" ) != -1 && m_cover->isChecked() ); + /*m_name->setEnabled( cmd.tqfind( "%name" ) != -1 );*/ + m_subject->setEnabled( cmd.tqfind( "%subject" ) != -1 && m_cover->isChecked() ); statusBar()->changeItem(m_faxctrl->faxSystem(), 2); } diff --git a/kdeprint/kdeprintfax/kdeprintfax.h b/kdeprint/kdeprintfax/kdeprintfax.h index e68ddfa67..ac54d8b61 100644 --- a/kdeprint/kdeprintfax/kdeprintfax.h +++ b/kdeprint/kdeprintfax/kdeprintfax.h @@ -31,7 +31,7 @@ class TQTextEdit; class FaxCtrl; class TQCheckBox; class TQLabel; -class QTimeEdit; +class TQTimeEdit; class TQComboBox; class TQPushButton; class TQListViewItem; @@ -100,13 +100,13 @@ protected: private: KListBox *m_files; KListView *m_numbers; - QLineEdit *m_subject; - QTextEdit *m_comment; + TQLineEdit *m_subject; + TQTextEdit *m_comment; FaxCtrl *m_faxctrl; - QCheckBox *m_cover; - QLabel *m_msglabel; - QTimeEdit *m_time; - QComboBox *m_timecombo; + TQCheckBox *m_cover; + TQLabel *m_msglabel; + TQTimeEdit *m_time; + TQComboBox *m_timecombo; TQPushButton *m_upbtn, *m_downbtn; TQPushButton *m_newbtn, *m_abbtn, *m_delbtn; bool m_quitAfterSend; diff --git a/kdeprint/kjobviewer/kjobviewer.cpp b/kdeprint/kjobviewer/kjobviewer.cpp index 6039da9a0..a8f5ac26c 100644 --- a/kdeprint/kjobviewer/kjobviewer.cpp +++ b/kdeprint/kjobviewer/kjobviewer.cpp @@ -141,10 +141,10 @@ void KJobViewerApp::initialize() } - view = m_views.find(prname); + view = m_views.tqfind(prname); if (!view) { - kdDebug() << "creating new view: " << prname << endl; + kdDebug() << "creating new view: " << TQString(prname) << endl; view = new KMJobViewer(); connect(view, TQT_SIGNAL(jobsShown(KMJobViewer*,bool)), TQT_SLOT(slotJobsShown(KMJobViewer*,bool))); connect(view, TQT_SIGNAL(printerChanged(KMJobViewer*,const TQString&)), TQT_SLOT(slotPrinterChanged(KMJobViewer*,const TQString&))); @@ -200,7 +200,7 @@ void KJobViewerApp::slotTimer() void KJobViewerApp::slotPrinterChanged(KMJobViewer *view, const TQString& prname) { - KMJobViewer *other = m_views.find(prname); + KMJobViewer *other = m_views.tqfind(prname); if (other) { if (other->isVisible()) diff --git a/kdeprint/kprinter/printwrapper.cpp b/kdeprint/kprinter/printwrapper.cpp index f5e67f96e..f8fe1a46d 100644 --- a/kdeprint/kprinter/printwrapper.cpp +++ b/kdeprint/kprinter/printwrapper.cpp @@ -66,7 +66,7 @@ void showmsgdialog(const TQString& msg, int type = 0) void showmsgconsole(const TQString& msg, int type = 0) { - QString errmsg = TQString::fromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error")))); + TQString errmsg = TQString::tqfromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error")))); kdDebug() << errmsg << msg << endl; } @@ -142,15 +142,15 @@ void PrintWrapper::slotPrint() #endif /* HAVE_SIGACTION && !HAVE_SIGSET*/ // read variables from command line - QString printer = args->getOption("d"); - QString title = args->getOption("t"); + TQString printer = args->getOption("d"); + TQString title = args->getOption("t"); int ncopies = TQString(args->getOption("n")).toInt(); - QString job_mode = args->getOption("j"); - QString system = args->getOption("system"); + TQString job_mode = args->getOption("j"); + TQString system = args->getOption("system"); QCStringList optlist = args->getOptionList("o"); TQMap opts; KURL::List files; - QStringList filestoprint; + TQStringList filestoprint; force_stdin = args->isSet("stdin"); docopy = args->isSet( "c" ); bool nodialog = !(args->isSet("dialog")); @@ -164,7 +164,7 @@ void PrintWrapper::slotPrint() // parse options for (QCStringList::ConstIterator it=optlist.begin(); it!=optlist.end(); ++it) { - QStringList l = TQStringList::split('=',TQString(*it),false); + TQStringList l = TQStringList::split('=',TQString(*it),false); if (l.count() >= 1) opts[l[0]] = (l.count() == 2 ? l[1] : TQString::null); } @@ -265,7 +265,7 @@ void PrintWrapper::slotPrint() connect(dlg, TQT_SIGNAL(printRequested(KPrinter*)), TQT_SLOT(slotPrintRequested(KPrinter*))); if( check_stdin ) { - notif = new TQSocketNotifier( 0, TQSocketNotifier::Read, this ); + notif = new TQSocketNotifier( 0, TQSocketNotifier::Read, TQT_TQOBJECT(this) ); connect( notif, TQT_SIGNAL( activated( int )), this, TQT_SLOT( slotGotStdin())); kdDebug( 500 ) << "waiting for input on stdin" << endl; } @@ -300,10 +300,10 @@ void PrintWrapper::slotPrintRequested(KPrinter *kprinter) kprinter->setDocName(TQString::null); // download files if needed - QStringList files = TQStringList::split("@@", kprinter->option("kde-filelist"), false), filestoprint; + TQStringList files = TQStringList::split("@@", kprinter->option("kde-filelist"), false), filestoprint; for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) { - QString tmpFile; + TQString tmpFile; KURL url = KURL::fromPathOrURL(*it); kdDebug( 500 ) << url.url() << endl; if (KIO::NetAccess::download(url, tmpFile, this)) diff --git a/kdeprint/kprinter/printwrapper.h b/kdeprint/kprinter/printwrapper.h index 381cfa717..55ddcdf75 100644 --- a/kdeprint/kprinter/printwrapper.h +++ b/kdeprint/kprinter/printwrapper.h @@ -26,7 +26,7 @@ class KPrinter; class KPrintDialog; class TQSocketNotifier; -class PrintWrapper : public QWidget +class PrintWrapper : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/printmgr/kcmprintmgr.cpp b/kdeprint/printmgr/kcmprintmgr.cpp index 7a986e0bf..0d0f8b170 100644 --- a/kdeprint/printmgr/kcmprintmgr.cpp +++ b/kdeprint/printmgr/kcmprintmgr.cpp @@ -43,7 +43,7 @@ KCMPrintMgr::KCMPrintMgr(TQWidget *parent, const char *name, const TQStringList m_mainview = new KMMainView(this,"MainView"); - QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 0); + TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 0); main_->addWidget(m_mainview); main_->activate(); diff --git a/kdeprint/slave/kio_print.cpp b/kdeprint/slave/kio_print.cpp index 4613edeb8..920c12073 100644 --- a/kdeprint/slave/kio_print.cpp +++ b/kdeprint/slave/kio_print.cpp @@ -53,7 +53,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char **argv); } -void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString::null) +void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString()) { KIO::UDSAtom atom; atom.m_uds = ID; @@ -92,7 +92,7 @@ TQString buildMenu(const TQStringList& items, const TQStringList& links, int act if (items.count() == 0 || items.count() != links.count()) return TQString("    "); - QString s; + TQString s; int index = 0; for (TQStringList::ConstIterator it1=items.begin(), it2=links.begin(); it1!=items.end() && it2!=links.end(); ++it1, ++it2, index++) { @@ -108,18 +108,18 @@ TQString buildMenu(const TQStringList& items, const TQStringList& links, int act TQString buildOptionRow(DrBase *opt, bool f) { - QString s("\n"); + TQString s("\n"); s = s.arg(f ? "contentwhite" : "contentyellow").arg(opt->get("text")).arg(opt->prettyText()); return s; } TQString buildGroupTable(DrGroup *grp, bool showHeader = true) { - QString s("\n"); + TQString s("\n"); if (showHeader) s = s.arg(grp->get("text")); else - s = TQString::null; + s = TQString(); TQPtrListIterator oit(grp->options()); bool f(false); @@ -170,10 +170,10 @@ void KIO_Print::listDir(const KURL& url) return; } - QStringList path = TQStringList::split('/', url.path(), false); + TQStringList path = TQStringList::split('/', url.path(), false); PRINT_DEBUG << "listing " << url.path() << endl; - QString group = path[0].lower(); + TQString group = path[0].lower(); if (path.count() == 0) listRoot(); else if (path.count() == 1 && group != "manager" && group != "jobs") @@ -181,7 +181,7 @@ void KIO_Print::listDir(const KURL& url) PRINT_DEBUG << "listing group " << path[0] << endl; int mask; - QString mimeType; + TQString mimeType; KIO::UDSEntry entry; if (group == "printers") @@ -252,7 +252,7 @@ void KIO_Print::listRoot() listEntry(entry, false); // Management entry - //createFileEntry(entry, i18n("Manager"), "print:/manager", "print/manager", TQString::null, S_IFDIR); + //createFileEntry(entry, i18n("Manager"), "print:/manager", "print/manager", TQString(), S_IFDIR); createDirEntry(entry, i18n("Manager"), "print:/manager", "print/manager"); listEntry(entry, false); @@ -382,9 +382,9 @@ void KIO_Print::stat(const KURL& url) } PRINT_DEBUG << "stat: " << url.url() << endl; - QStringList path = TQStringList::split('/', url.encodedPathAndQuery(-1), false); + TQStringList path = TQStringList::split('/', url.encodedPathAndQuery(-1), false); KIO::UDSEntry entry; - QString mime; + TQString mime; bool err(false); PRINT_DEBUG << "path components: " << path.join(", ") << endl; @@ -546,8 +546,8 @@ void KIO_Print::get(const KURL& url) return; } - QStringList elems = TQStringList::split('/', url.encodedPathAndQuery(), false); - QString group(elems[0].lower()), printer(KURL::decode_string(elems[1])), path, query; + TQStringList elems = TQStringList::split('/', url.encodedPathAndQuery(), false); + TQString group(elems[0].lower()), printer(KURL::decode_string(elems[1])), path, query; KMPrinter *mprinter(0); if (group == "manager") @@ -563,12 +563,12 @@ void KIO_Print::get(const KURL& url) if (group.startsWith("jobs")) { - int p = group.find('?'); + int p = group.tqfind('?'); if (p != -1) query = group.mid(p+1); if (!query.isEmpty() && query != "jobs" && query != "completed_jobs") { - error(KIO::ERR_MALFORMED_URL, TQString::null); + error(KIO::ERR_MALFORMED_URL, TQString()); return; } PRINT_DEBUG << "listing jobs for all printers" << endl; @@ -576,7 +576,7 @@ void KIO_Print::get(const KURL& url) return; } - int p = printer.find('?'); + int p = printer.tqfind('?'); if (p != -1) { query = printer.mid(p+1); @@ -634,8 +634,8 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer) { mimeType("text/html"); - QString content; - if (!loadTemplate(TQString::fromLatin1("printer.template"), content)) + TQString content; + if (!loadTemplate(TQString::tqfromLatin1("printer.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("printer.template")); return; @@ -647,7 +647,7 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer) .arg(buildMenu(TQStringList::split('|', i18n("General|Driver|Active jobs|Completed jobs"), false), TQStringList::split('|', "?general|?driver|?jobs|?completed_jobs", true), 0)) - .arg(TQString::null) + .arg(TQString()) .arg(printer->pixmap()) .arg(printer->name()) .arg(i18n("General Properties")) @@ -675,22 +675,22 @@ void KIO_Print::showClassInfo(KMPrinter *printer) { mimeType("text/html"); - QString content; - if (!loadTemplate(TQString::fromLatin1("class.template"), content)) + TQString content; + if (!loadTemplate(TQString::tqfromLatin1("class.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("class.template")); return; } - QString memberContent("
      \n"); - QStringList members(printer->members()); + TQString memberContent("
        \n"); + TQStringList members(printer->members()); for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) { - memberContent.append(TQString::fromLatin1("
      • %2
        • \n").arg(*it).arg(*it)); + memberContent.append(TQString::tqfromLatin1("
      • %2
        • \n").arg(*it).arg(*it)); } memberContent.append("
      \n"); - QString typeContent = (printer->isImplicit() ? i18n("Implicit") : (printer->isRemote() ? i18n("Remote") : i18n("Local"))); + TQString typeContent = (printer->isImplicit() ? i18n("Implicit") : (printer->isRemote() ? i18n("Remote") : i18n("Local"))); content = content .arg(i18n("Properties of %1").arg(printer->printerName())) @@ -698,7 +698,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer) .arg(buildMenu(TQStringList::split('|', i18n("General|Active jobs|Completed jobs"), false), TQStringList::split('|', "?general|?jobs|?completed_jobs", true), 0)) - .arg(TQString::null) + .arg(TQString()) .arg(printer->pixmap()) .arg(printer->name()) .arg(i18n("General Properties")) @@ -718,15 +718,15 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer) { mimeType("text/html"); - QString content; - if (!loadTemplate(TQString::fromLatin1("pseudo.template"), content)) + TQString content; + if (!loadTemplate(TQString::tqfromLatin1("pseudo.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); return; } - QString reqContent("
        \n"); - QStringList requirements = TQStringList::split(",", printer->option("kde-special-require"), false); + TQString reqContent("
          \n"); + TQStringList requirements = TQStringList::split(",", printer->option("kde-special-require"), false); for (TQStringList::ConstIterator it=requirements.begin(); it!=requirements.end(); ++it) reqContent += ("
        • " + (*it) + "
          • \n"); reqContent.append("
        \n"); @@ -737,7 +737,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer) .arg(buildMenu(TQStringList::split('|', i18n("General"), false), TQStringList::split('|', "?general", true), 0)) - .arg(TQString::null) + .arg(TQString()) .arg(printer->pixmap()) .arg(printer->name()) .arg(i18n("General Properties")) @@ -755,16 +755,16 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer) bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer) { - QFile f(locate("data", TQString::fromLatin1("kdeprint/template/")+filename)); + TQFile f(locate("data", TQString::tqfromLatin1("kdeprint/template/")+filename)); if (f.exists() && f.open(IO_ReadOnly)) { - QTextStream t(&f); + TQTextStream t(&f); buffer = t.read(); return true; } else { - buffer = TQString::null; + buffer = TQString(); return false; } } @@ -772,10 +772,10 @@ bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer) void KIO_Print::showData(const TQString& pathname) { PRINT_DEBUG << "sending data: " << pathname << endl; - QFile f(pathname); + TQFile f(pathname); if (f.exists() && f.open(IO_ReadOnly)) { - QByteArray arr(f.readAll()); + TQByteArray arr(f.readAll()); mimeType(KMimeType::findByURL(KURL(pathname), 0, true, true)->name()); data(arr); finished(); @@ -794,7 +794,7 @@ void KIO_Print::showData(const TQString& pathname) */ TQString KIO_Print::locateData(const TQString& item) { - QString path = locate("data", "kdeprint/template/"+item); + TQString path = locate("data", "kdeprint/template/"+item); if (path.isEmpty()) path = KGlobal::iconLoader()->iconPath(item, KIcon::Desktop, true); return path; @@ -819,8 +819,8 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed) mgr->addPrinter(pit.current()->printerName(), type); } - QString content; - if (!loadTemplate(TQString::fromLatin1("jobs.template"), content)) + TQString content; + if (!loadTemplate(TQString::tqfromLatin1("jobs.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); return; @@ -838,7 +838,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed) buildMenu(TQStringList::split('|', i18n("General|Driver|Active jobs|Completed jobs"), false), TQStringList::split('|', "?general|?driver|?jobs|?completed_jobs", true), (completed ? 3 : 2))) - .arg(TQString::null) + .arg(TQString()) .arg(prt->pixmap()) .arg(prt->printerName()); } @@ -854,7 +854,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed) } content = content.arg(i18n("ID")).arg(i18n("Owner")).arg(i18n("Printer")).arg(i18n("Name")).arg(i18n("State")); - QString jobContent, cellContent("
    \n"); + TQString jobContent, cellContent("\n"); TQPtrListIterator it(mgr->jobList()); bool flag(true); for (; it.current(); ++it, flag = !flag) @@ -890,8 +890,8 @@ void KIO_Print::showDriver(KMPrinter *prt) { mimeType("text/html"); - QString content; - if (!loadTemplate(TQString::fromLatin1("driver.template"), content)) + TQString content; + if (!loadTemplate(TQString::tqfromLatin1("driver.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); return; @@ -904,14 +904,14 @@ void KIO_Print::showDriver(KMPrinter *prt) .arg(buildMenu(TQStringList::split('|', i18n("General|Driver|Active jobs|Completed jobs"), false), TQStringList::split('|', "?general|?driver|?jobs|?completed_jobs", true), 1)) - .arg(TQString::null) + .arg(TQString()) .arg(prt->pixmap()) .arg(prt->printerName() + " (" + (driver ? driver->get("text") : i18n("No driver found")) + ")"); if (driver) content = content.arg(buildGroupTable(driver, false)); else - content = content.arg(TQString::null); + content = content.arg(TQString()); data(content.local8Bit()); finished(); diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc index 6d106a484..bbcb7bf23 100644 --- a/kdesktop/bgmanager.cc +++ b/kdesktop/bgmanager.cc @@ -72,7 +72,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* kwinModule m_pDesktop = desktop; if (desktop == 0L) - desktop = KApplication::desktop()->screen(); + desktop = TQT_TQWIDGET(KApplication::desktop()->screen()); m_Renderer.resize( 1 ); m_Cache.resize( 1 ); @@ -334,7 +334,7 @@ void KBackgroundManager::slotChangeNumberOfDesktops(int num) /* * Call this when the desktop has been changed. * Desk is in KWin convention: [1..desks], instead of [0..desks-1]. - * 0 repaints the current desktop. + * 0 tqrepaints the current desktop. */ void KBackgroundManager::slotChangeDesktop(int desk) { @@ -394,7 +394,7 @@ void KBackgroundManager::slotChangeDesktop(int desk) /* * Call this when the viewport has been changed. * Desk is in KWin convention: [1..desks], instead of [0..desks-1]. - * 0 repaints the current viewport. + * 0 tqrepaints the current viewport. */ void KBackgroundManager::slotChangeViewport(int desk, const TQPoint& viewport) { @@ -518,25 +518,25 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk) { TQScrollView* sv = dynamic_cast( m_pDesktop ); if ( sv ) { - // Qt eats repaint events in this case :-(( + // Qt eats tqrepaint events in this case :-(( sv->viewport()->update(); } m_pDesktop->setErasePixmap(*ep); - m_pDesktop->repaint(); + m_pDesktop->tqrepaint(); static bool root_cleared = false; if( !root_cleared ) { // clear the root window pixmap set by kdm root_cleared = true; TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot())); // but make the pixmap visible until m_pDesktop is visible - KApplication::desktop()->screen()->setErasePixmap(*ep); - KApplication::desktop()->screen()->erase(); + TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep); + TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); } } else { - KApplication::desktop()->screen()->setErasePixmap(*ep); - KApplication::desktop()->screen()->erase(); + TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep); + TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); } // and export it via Esetroot-style for gnome/GTK apps to share in the pretties @@ -556,8 +556,8 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk) void KBackgroundManager::clearRoot() { - KApplication::desktop()->screen()->setErasePixmap( TQPixmap()); - KApplication::desktop()->screen()->erase(); + TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap( TQPixmap()); + TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); } /* @@ -920,12 +920,12 @@ void KBackgroundManager::setWallpaper(int desk, TQString wallpaper, int mode) slotChangeDesktop(sdesk); } -void KBackgroundManager::repaintBackground() +void KBackgroundManager::tqrepaintBackground() { if (m_pDesktop) - m_pDesktop->repaint(); + m_pDesktop->tqrepaint(); else - KApplication::desktop()->screen()->erase(); + TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); } void KBackgroundManager::desktopResized() @@ -955,7 +955,7 @@ void KBackgroundManager::desktopResized() m_pDesktop->resize( kapp->desktop()->geometry().size()); // Repaint desktop slotChangeDesktop(0); - repaintBackground(); + tqrepaintBackground(); // Redraw all desktops so that applications relying on exported data, e.g. kpager, continue to work properly TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h index 5b9bf70f1..2923fd1b5 100644 --- a/kdesktop/bgmanager.h +++ b/kdesktop/bgmanager.h @@ -84,7 +84,7 @@ private slots: void slotChangeDesktop(int); void slotChangeViewport(int, const TQPoint&); void slotChangeNumberOfDesktops(int); - void repaintBackground(); + void tqrepaintBackground(); void desktopResized(); void clearRoot(); void saveImages(); diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index f923d953d..de58e0d24 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -79,19 +79,19 @@ bool KRootWidget::eventFilter ( TQObject *, TQEvent * e ) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent *me = static_cast(e); + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); KRootWm::self()->mousePressed( me->globalPos(), me->button() ); return true; } else if (e->type() == TQEvent::Wheel) { - TQWheelEvent *we = static_cast(e); + TQWheelEvent *we = TQT_TQWHEELEVENT(e); emit wheelRolled(we->delta()); return true; } else if ( e->type() == TQEvent::DragEnter ) { - TQDragEnterEvent* de = static_cast( e ); + TQDragEnterEvent* de = static_cast( e ); bool b = !KGlobal::config()->isImmutable() && !KGlobal::dirs()->isRestrictedResource( "wallpaper" ); bool imageURL = false; @@ -136,7 +136,7 @@ const char* KDesktop::m_wheelDirectionStrings[2] = { "Forward", "Reverse" }; KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) : DCOPObject( "KDesktopIface" ), - TQWidget( 0L, "desktop", WResizeNoErase | ( x_root_hack ? (WStyle_Customize | WStyle_NoBorder) : 0) ), + TQWidget( 0L, "desktop", (WFlags)(WResizeNoErase | ( x_root_hack ? (WStyle_Customize | WStyle_NoBorder) : 0)) ), // those two WStyle_ break kdesktop when the root-hack isn't used (no Dnd) startup_id( NULL ), m_waitForKicker(0) { @@ -153,17 +153,17 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) : setCaption( "KDE Desktop"); setAcceptDrops(true); // WStyle_Customize seems to disable that - m_pKwinmodule = new KWinModule( this ); + m_pKwinmodule = new KWinModule( TQT_TQOBJECT(this) ); kapp->dcopClient()->setNotifications(true); kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)", "KDesktopIface", "desktopIconsAreaChanged(TQRect, int)", false); - // Dont repaint on configuration changes during construction + // Dont tqrepaint on configuration changes during construction m_bInit = true; // It's the child widget that gets the focus, not us - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); if ( x_root_hack ) { @@ -277,8 +277,8 @@ KDesktop::initRoot() m_pIconView->setDragAutoScroll( false ); m_pIconView->setFrameStyle( TQFrame::NoFrame ); m_pIconView->viewport()->setBackgroundMode( X11ParentRelative ); - m_pIconView->setFocusPolicy( StrongFocus ); - m_pIconView->viewport()->setFocusPolicy( StrongFocus ); + m_pIconView->setFocusPolicy( TQ_StrongFocus ); + m_pIconView->viewport()->setFocusPolicy( TQ_StrongFocus ); m_pIconView->setGeometry( geometry() ); m_pIconView->show(); @@ -356,7 +356,7 @@ KDesktop::backgroundInitDone() // avoid flicker if (m_bDesktopEnabled) { - const TQPixmap *bg = TQApplication::desktop()->screen()->backgroundPixmap(); + const TQPixmap *bg = TQT_TQWIDGET(TQApplication::desktop()->screen())->backgroundPixmap(); if ( bg ) m_pIconView->setErasePixmap( *bg ); @@ -393,7 +393,7 @@ KDesktop::slotStart() m_pIconView->start(); // Global keys - keys = new KGlobalAccel( this ); + keys = new KGlobalAccel( TQT_TQOBJECT(this) ); (void) new KRootWm( this ); #include "kdesktopbindings.cpp" @@ -836,7 +836,7 @@ void KDesktop::refresh() m_bNeedRepaint |= 1; updateWorkArea(); #endif - kapp->dcopClient()->send( kwin_name, "", "refresh()", ""); + kapp->dcopClient()->send( kwin_name, "", "refresh()", TQString("")); refreshIcons(); } @@ -1160,7 +1160,7 @@ void KDesktop::addIcon(const TQString & _url, int x, int y) void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int y) { - TQString filename = _url.mid(_url.findRev('/') + 1); + TQString filename = _url.mid(_url.tqfindRev('/') + 1); TQValueList files; KIO::CopyInfo i; @@ -1168,7 +1168,7 @@ void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int i.uDest = KURL::fromPathOrURL( _dest ); i.uDest.addPath( filename ); files.append(i); - if (!TQFile::exists(i.uDest.prettyURL().replace("file://",TQString::null))) { m_pIconView->slotAboutToCreate( TQPoint( x, y ), files ); + if (!TQFile::exists(i.uDest.prettyURL().tqreplace("file://",TQString()))) { m_pIconView->slotAboutToCreate( TQPoint( x, y ), files ); KIO::copy( i.uSource, i.uDest, false ); } // m_pIconView->addFuturePosition(filename, x, y); @@ -1184,7 +1184,7 @@ void KDesktop::removeIcon(const TQString &_url) return; } unlink(KURL(_url).path().latin1()); - TQString dest = _url.left(_url.findRev('/') + 1); + TQString dest = _url.left(_url.tqfindRev('/') + 1); m_pIconView->update( dest ); } diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h index 19cc4cbbe..be1aeb796 100644 --- a/kdesktop/desktop.h +++ b/kdesktop/desktop.h @@ -41,7 +41,7 @@ class KDIconView; class Minicli; class KActionCollection; -class KRootWidget : public QObject +class KRootWidget : public TQObject { Q_OBJECT public: diff --git a/kdesktop/init.cc b/kdesktop/init.cc index 27441b170..1d4411ce6 100644 --- a/kdesktop/init.cc +++ b/kdesktop/init.cc @@ -123,7 +123,7 @@ static TQString realDesktopPath() if (kdesktop_screen_number != 0) { TQString dn = "Desktop"; dn += TQString::number(kdesktop_screen_number); - desktopPath.replace("Desktop", dn); + desktopPath.tqreplace("Desktop", dn); } return desktopPath; } diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cc index 1d39a093d..00e3ce24c 100644 --- a/kdesktop/kcustommenu.cc +++ b/kdesktop/kcustommenu.cc @@ -82,7 +82,7 @@ KCustomMenu::insertMenuItem(KService::Ptr & s, int nId, int nIndex/*= -1*/) // item names may contain ampersands. To avoid them being converted // to accelators, replace them with two ampersands. - serviceName.replace("&", "&&"); + serviceName.tqreplace("&", "&&"); TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small, 0, KIcon::DefaultState, 0L, true); diff --git a/kdesktop/kcustommenu.h b/kdesktop/kcustommenu.h index 602a09584..93b8d671f 100644 --- a/kdesktop/kcustommenu.h +++ b/kdesktop/kcustommenu.h @@ -27,7 +27,7 @@ * This class provides a Popup Menu with programs that can be executed and * that reads its configuration from a config file. */ -class KCustomMenu : public QPopupMenu +class KCustomMenu : public TQPopupMenu { Q_OBJECT public: diff --git a/kdesktop/kdesktopbindings.cpp b/kdesktop/kdesktopbindings.cpp index 4e46a2013..ad166aab4 100644 --- a/kdesktop/kdesktopbindings.cpp +++ b/kdesktop/kdesktopbindings.cpp @@ -1,13 +1,13 @@ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) ) # define DEF2( name, key3, key4, receiver, slot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4, receiver, slot ); + keys->insert( name, i18n(name), TQString(), key3, key4, receiver, slot ); #else # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString(), key3, key4 ) # define DEF2( name, key3, key4, receiver, slot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString(), key3, key4 ) #endif #define WIN KKey::QtWIN diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index 5d20aa12d..076831bba 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -130,7 +130,7 @@ void KDIconView::readIconPosition(KSimpleConfig *config, int &x, int &y) // ----------------------------------------------------------------------------- KDIconView::KDIconView( TQWidget *parent, const char* name ) - : KonqIconViewWidget( parent, name, WResizeNoErase, true ), + : KonqIconViewWidget( parent, name, (WFlags)WResizeNoErase, true ), m_actionCollection( this, "KDIconView::m_actionCollection" ), m_accel( 0L ), m_bNeedRepaint( false ), @@ -296,7 +296,7 @@ void KDIconView::initConfig( bool init ) m_bSortDirectoriesFirst = KDesktopSettings::directoriesFirst(); m_itemsAlwaysFirst = KDesktopSettings::alwaysFirstItems(); // Distributor plug-in - if (KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media"))) + if (KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media"))) m_enableMedia=KDesktopSettings::mediaEnabled(); else m_enableMedia=false; @@ -321,7 +321,7 @@ void KDIconView::initConfig( bool init ) if ( previewSettings().count() ) { for ( TQStringList::ConstIterator it = oldPreview.begin(); it != oldPreview.end(); ++it) - if ( !previewSettings().contains( *it ) ){ + if ( !previewSettings().tqcontains( *it ) ){ kdDebug(1204) << "Disabling preview for " << *it << endl; if ( *it == "audio/" ) disableSoundPreviews(); @@ -425,28 +425,28 @@ void KDIconView::createActions() undo, TQT_SLOT( setText( const TQString & ) ) ); undo->setEnabled( KonqUndoManager::self()->undoAvailable() ); - KAction* paCut = KStdAction::cut( this, TQT_SLOT( slotCut() ), &m_actionCollection, "cut" ); + KAction* paCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), &m_actionCollection, "cut" ); KShortcut cutShortCut = paCut->shortcut(); cutShortCut.remove( KKey( SHIFT + Key_Delete ) ); // used for deleting files paCut->setShortcut( cutShortCut ); - KStdAction::copy( this, TQT_SLOT( slotCopy() ), &m_actionCollection, "copy" ); - KStdAction::paste( this, TQT_SLOT( slotPaste() ), &m_actionCollection, "paste" ); - KAction *pasteTo = KStdAction::paste( this, TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" ); + KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), &m_actionCollection, "copy" ); + KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), &m_actionCollection, "paste" ); + KAction *pasteTo = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" ); pasteTo->setEnabled( false ); // only enabled during popupMenu() KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload); - new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" ); + new KAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" ); - (void) new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, this, TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" ); - (void) new KAction( i18n( "&Properties" ), ALT+Key_Return, this, TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" ); + (void) new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" ); + (void) new KAction( i18n( "&Properties" ), ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" ); KAction* trash = new KAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" ); connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) ); KConfig config("kdeglobals", true, false); config.setGroup( "KDE" ); - (void) new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, this, TQT_SLOT( slotDelete() ), &m_actionCollection, "del" ); + (void) new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" ); // Initial state of the actions (cut/copy/paste/...) slotSelectionChanged(); @@ -581,7 +581,7 @@ KURL KDIconView::desktopURL() if (kdesktop_screen_number != 0) { TQString dn = "Desktop"; dn += TQString::number(kdesktop_screen_number); - desktopPath.replace("Desktop", dn); + desktopPath.tqreplace("Desktop", dn); } KURL desktopURL; @@ -605,9 +605,9 @@ void KDIconView::contentsMousePressEvent( TQMouseEvent *e ) if (!m_dirLister) return; //kdDebug(1204) << "KDIconView::contentsMousePressEvent" << endl; // TQIconView, as of Qt 2.2, doesn't emit mouseButtonPressed for LMB on background - if ( e->button() == LeftButton && KRootWm::self()->hasLeftButtonMenu() ) + if ( e->button() == Qt::LeftButton && KRootWm::self()->hasLeftButtonMenu() ) { - TQIconViewItem *item = findItem( e->pos() ); + TQIconViewItem *item = tqfindItem( e->pos() ); if ( !item ) { // Left click menu @@ -628,7 +628,7 @@ void KDIconView::wheelEvent( TQWheelEvent* e ) if (!m_dirLister) return; //kdDebug(1204) << "KDIconView::wheelEvent" << endl; - TQIconViewItem *item = findItem( e->pos() ); + TQIconViewItem *item = tqfindItem( e->pos() ); if ( !item ) { emit wheelRolled( e->delta() ); @@ -670,7 +670,7 @@ void KDIconView::slotMouseButtonClickedKDesktop(int _button, TQIconViewItem* _it { if (!m_dirLister) return; //kdDebug(1204) << "KDIconView::slotMouseButtonClickedKDesktop" << endl; - if ( _item && _button == MidButton ) + if ( _item && _button == Qt::MidButton ) slotExecuted(_item); } @@ -723,7 +723,7 @@ void KDIconView::slotPopupPasteTo() } // These two functions and the following class are all lifted from desktopbehavior_impl.cpp to handle the media icons -class DesktopBehaviorMediaItem : public QCheckListItem +class DesktopBehaviorMediaItem : public TQCheckListItem { public: DesktopBehaviorMediaItem(TQListView *parent, const TQString name, const TQString mimetype, bool on) @@ -748,7 +748,7 @@ void KDIconView::fillMediaListView() for (; it2 != mimetypes.end(); ++it2) { if ( ((*it2)->name().startsWith("media/")) ) { - bool ok=excludedMedia.contains((*it2)->name())==0; + bool ok=excludedMedia.tqcontains((*it2)->name())==0; new DesktopBehaviorMediaItem (mMediaListView, (*it2)->comment(), (*it2)->name(),ok); } } @@ -784,7 +784,7 @@ void KDIconView::removeBuiltinIcon(TQString iconName) { DesktopBehaviorMediaItem *changeItem; fillMediaListView(); - changeItem = static_cast(mMediaListView->findItem(iconName, 0)); + changeItem = static_cast(mMediaListView->tqfindItem(iconName, 0)); if (changeItem != 0) { changeItem->setOn(false); } @@ -860,12 +860,12 @@ bool KDIconView::deleteGlobalDesktopFiles() return !itemsLeft; } -void KDIconView::slotTrashActivated( KAction::ActivationReason reason, Qt::ButtonState state ) +void KDIconView::slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state ) { if (deleteGlobalDesktopFiles()) return; // All items deleted - if ( reason == KAction::PopupMenuActivation && ( state & Qt::ShiftButton ) ) + if ( reason == KAction::PopupMenuActivation && ( state & TQt::ShiftButton ) ) KonqOperations::del(this, KonqOperations::DEL, selectedUrls()); else KonqOperations::del(this, KonqOperations::TRASH, selectedUrls()); @@ -960,20 +960,20 @@ bool KDIconView::isDesktopFile( KFileItem * _item ) const return false; // return true if desktop file - return ( (_item->mimetype() == TQString::fromLatin1("application/x-desktop")) - || (_item->mimetype() == TQString::fromLatin1("media/builtin-mydocuments")) - || (_item->mimetype() == TQString::fromLatin1("media/builtin-mycomputer")) - || (_item->mimetype() == TQString::fromLatin1("media/builtin-mynetworkplaces")) - || (_item->mimetype() == TQString::fromLatin1("media/builtin-printers")) - || (_item->mimetype() == TQString::fromLatin1("media/builtin-trash")) - || (_item->mimetype() == TQString::fromLatin1("media/builtin-webbrowser")) ); + return ( (_item->mimetype() == TQString::tqfromLatin1("application/x-desktop")) + || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mydocuments")) + || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mycomputer")) + || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mynetworkplaces")) + || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-printers")) + || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-trash")) + || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-webbrowser")) ); } TQString KDIconView::stripDesktopExtension( const TQString & text ) { - if (text.right(7) == TQString::fromLatin1(".kdelnk")) + if (text.right(7) == TQString::tqfromLatin1(".kdelnk")) return text.left(text.length() - 7); - else if (text.right(8) == TQString::fromLatin1(".desktop")) + else if (text.right(8) == TQString::tqfromLatin1(".desktop")) return text.left(text.length() - 8); return text; } @@ -1009,12 +1009,12 @@ bool KDIconView::makeFriendlyText( KFileIVI *fileIVI ) TQStringList tmpList; if (cfg.hasKey("OnlyShowIn")) { - if (!cfg.readListEntry("OnlyShowIn", ';').contains("KDE")) + if (!cfg.readListEntry("OnlyShowIn", ';').tqcontains("KDE")) return false; } if (cfg.hasKey("NotShowIn")) { - if (cfg.readListEntry("NotShowIn", ';').contains("KDE")) + if (cfg.readListEntry("NotShowIn", ';').tqcontains("KDE")) return false; } if (cfg.hasKey("TryExec")) @@ -1055,7 +1055,7 @@ void KDIconView::slotNewItems( const KFileItemList & entries ) KURL desktop_URL = desktopURL(); if (desktop_URL.isLocalFile()) desktopPath = desktop_URL.path(); - // We have new items, so we'll need to repaint in slotCompleted + // We have new items, so we'll need to tqrepaint in slotCompleted m_bNeedRepaint = true; kdDebug(1214) << "KDIconView::slotNewItems count=" << entries.count() << endl; KFileItemListIterator it(entries); @@ -1198,7 +1198,7 @@ void KDIconView::slotRefreshItems( const KFileItemList & entries ) } else { - // In case we replace a big icon with a small one, need to repaint. + // In case we replace a big icon with a small one, need to tqrepaint. updateContents(); // Can't do that with m_bNeedRepaint since slotCompleted isn't called m_bNeedRepaint = false; @@ -1305,7 +1305,7 @@ void KDIconView::slotCompleted() if (!m_hasExistingPos) rearrangeIcons(); -// kdDebug(1204) << "KDIconView::slotCompleted save:" << m_bNeedSave << " repaint:" << m_bNeedRepaint << endl; +// kdDebug(1204) << "KDIconView::slotCompleted save:" << m_bNeedSave << " tqrepaint:" << m_bNeedRepaint << endl; if ( m_bNeedSave ) { // Done here because we want to align icons only once initially, and each time new icons appear. @@ -1317,7 +1317,7 @@ void KDIconView::slotCompleted() } if ( m_bNeedRepaint ) { - viewport()->repaint(); + viewport()->tqrepaint(); m_bNeedRepaint = false; } } @@ -1327,7 +1327,7 @@ void KDIconView::slotClipboardDataChanged() // This is very related to KonqDirPart::slotClipboardDataChanged KURL::List lst; - TQMimeSource *data = TQApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::tqclipboard()->data(); if ( data->provides( "application/x-kde-cutselection" ) && data->provides( "text/uri-list" ) ) if ( KonqDrag::decodeIsCutSelection( data ) ) (void) KURLDrag::decode( data, lst ); @@ -1471,7 +1471,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e ) bool isImmutable = KGlobal::config()->isImmutable(); if ( (isColorDrag || isImageDrag) && !isUrlDrag ) { - // Hack to clear the drag shape + // Hack to clear the drag tqshape bool bMovable = itemsMovable(); bool bSignals = signalsBlocked(); setItemsMovable(false); @@ -1499,7 +1499,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e ) bool adjustedAnyItems = false; for( TQIconViewItem *item = firstItem(); item; item = item->nextItem() ) { - if( !desk.contains( item->rect(), true )) + if( !desk.tqcontains( item->rect(), true )) { TQRect r = item->rect(); @@ -1519,7 +1519,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e ) if( adjustedAnyItems ) { // Make sure the viewport isn't unnecessarily resized by now, - // then schedule a repaint to remove any garbage pixels. + // then schedule a tqrepaint to remove any garbage pixels. resizeContents( width(), height() ); viewport()->update(); } @@ -1541,7 +1541,7 @@ void KDIconView::updateWorkArea( const TQRect &wr ) { m_gotIconsArea = true; // now we have it! - if (( iconArea() == wr ) && (m_needDesktopAlign == false)) return; // nothing changed; avoid repaint/saveIconPosition ... + if (( iconArea() == wr ) && (m_needDesktopAlign == false)) return; // nothing changed; avoid tqrepaint/saveIconPosition ... TQRect oldArea = iconArea(); setIconArea( wr ); @@ -1593,8 +1593,8 @@ void KDIconView::updateWorkArea( const TQRect &wr ) } } if ( needRepaint ) { - viewport()->repaint( FALSE ); - repaint( FALSE ); + viewport()->tqrepaint( FALSE ); + tqrepaint( FALSE ); saveIconPositions(); } } @@ -1615,7 +1615,7 @@ void KDIconView::setupSortKeys() if (!m_itemsAlwaysFirst.isEmpty()) { TQString strFileName = static_cast( it )->item()->url().fileName(); - int nFind = m_itemsAlwaysFirst.findIndex(strFileName); + int nFind = m_itemsAlwaysFirst.tqfindIndex(strFileName); if (nFind >= 0) strKey = "0" + TQString::number(nFind); } @@ -1718,7 +1718,7 @@ void KDIconView::moveToFreePosition(TQIconViewItem *item ) TQRect rect=item->rect(); if (m_bVertAlign) { - kdDebug(1214)<<"moveToFreePosition for vertical alignment"<textColor(); shadow = ( settings->bgColor().isValid() ) ? settings->bgColor() : - ( qGray( text.rgb() ) > 127 ) ? black : white; + ( tqGray( text.rgb() ) > 127 ) ? black : white; if (rebuild) { setNormalImage(buildShadow(p, align, shadow)); _normalUID = uid; diff --git a/kdesktop/kfileividesktop.h b/kdesktop/kfileividesktop.h index 129abec07..6ceed0b42 100644 --- a/kdesktop/kfileividesktop.h +++ b/kdesktop/kfileividesktop.h @@ -91,7 +91,7 @@ class KFileIVIDesktop : public KFileIVI * Builds the shadow. As the algorithm is pretty slow (at pixel level), * This method is triggered only if the configuration has changed. * @param p the painter for drawing the item - * @param align the shadow alignment + * @param align the shadow tqalignment * @param shadowColor the shadow color */ virtual TQImage *buildShadow(TQPainter *p, const int align, TQColor &shadowColor); diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index e44c027c2..2ea6fa87c 100644 --- a/kdesktop/krootwm.cc +++ b/kdesktop/krootwm.cc @@ -131,7 +131,7 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop) if (kapp->authorize("run_command")) { - new KAction(i18n("Run Command..."), "run", 0, m_pDesktop, TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" ); + new KAction(i18n("Run Command..."), "run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" ); new KAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ), m_actionCollection, "open_terminal" ); } @@ -243,7 +243,7 @@ void KRootWm::initConfig() if (s == s_choices[c]) { rightButtonChoice = (menuChoice) c; break; } - // Read configuration for icons alignment + // Read configuration for icons tqalignment if ( m_bDesktopEnabled ) { bool startup = true; m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() ); if ( kapp->authorize( "editable_desktop_icons" ) ) { @@ -606,15 +606,15 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button ) { if (!desktopMenu) return; // initialisation not yet done switch ( _button ) { - case LeftButton: + case Qt::LeftButton: if ( m_bShowMenuBar && menuBar ) menuBar->raise(); activateMenu( leftButtonChoice, _global ); break; - case MidButton: + case Qt::MidButton: activateMenu( middleButtonChoice, _global ); break; - case RightButton: + case Qt::RightButton: if (!kapp->authorize("action/kdesktop_rmb")) return; activateMenu( rightButtonChoice, _global ); break; @@ -636,8 +636,8 @@ void KRootWm::slotWindowList() { windowListMenu->init(); disconnect( windowListMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice - // windowListMenu->rect() is not valid before showing, use sizeHint() - windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->sizeHint()).center()); + // windowListMenu->rect() is not valid before showing, use tqsizeHint() + windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->tqsizeHint()).center()); windowListMenu->selectActiveWindow(); // make the popup more useful connect( windowListMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotWindowListAboutToShow() ) ); @@ -656,7 +656,7 @@ void KRootWm::slotSwitchUser() { slotPopulateSessions(); disconnect( sessionsMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice - sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->sizeHint()).center()); + sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->tqsizeHint()).center()); connect( sessionsMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotPopulateSessions() ) ); } @@ -810,17 +810,17 @@ void KRootWm::slotToggleDesktopMenu() void KRootWm::slotUnclutterWindows() { - kapp->dcopClient()->send(kwin_name, "KWinInterface", "unclutterDesktop()", ""); + kapp->dcopClient()->send(kwin_name, "KWinInterface", "unclutterDesktop()", TQString("")); } void KRootWm::slotCascadeWindows() { - kapp->dcopClient()->send(kwin_name, "KWinInterface", "cascadeDesktop()", ""); + kapp->dcopClient()->send(kwin_name, "KWinInterface", "cascadeDesktop()", TQString("")); } void KRootWm::slotLock() { - kapp->dcopClient()->send(kdesktop_name, "KScreensaverIface", "lock()", ""); + kapp->dcopClient()->send(kdesktop_name, "KScreensaverIface", "lock()", TQString("")); } diff --git a/kdesktop/kshadowengine.cpp b/kdesktop/kshadowengine.cpp index 893eac8e0..e8493b92b 100644 --- a/kdesktop/kshadowengine.cpp +++ b/kdesktop/kshadowengine.cpp @@ -110,7 +110,7 @@ TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgC alphaShadow = (alphaShadow > m_shadowSettings->maxOpacity()) ? m_shadowSettings->maxOpacity() : alphaShadow; // update the shadow's i,j pixel. - result.setPixel(i,j, qRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow)); + result.setPixel(i,j, tqRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow)); } } return result; @@ -127,15 +127,15 @@ double KShadowEngine::defaultDecay(TQImage& source, int i, int j) return 0; double alphaShadow; - alphaShadow =(qGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR + - qGray(source.pixel(i-1,j )) * AXIS_FACTOR + - qGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR + - qGray(source.pixel(i ,j-1)) * AXIS_FACTOR + + alphaShadow =(tqGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR + + tqGray(source.pixel(i-1,j )) * AXIS_FACTOR + + tqGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR + + tqGray(source.pixel(i ,j-1)) * AXIS_FACTOR + 0 + - qGray(source.pixel(i ,j+1)) * AXIS_FACTOR + - qGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR + - qGray(source.pixel(i+1,j )) * AXIS_FACTOR + - qGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor(); + tqGray(source.pixel(i ,j+1)) * AXIS_FACTOR + + tqGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR + + tqGray(source.pixel(i+1,j )) * AXIS_FACTOR + + tqGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor(); return alphaShadow; } @@ -185,7 +185,7 @@ double KShadowEngine::noDecay(TQImage& source, int i, int j) else sy = j + m; - opacity += qGray(source.pixel(sx, sy)); + opacity += tqGray(source.pixel(sx, sy)); } } alphaShadow += opacity / m_shadowSettings->multiplicationFactor(); diff --git a/kdesktop/kshadowengine.h b/kdesktop/kshadowengine.h index 33391e464..4a9d6b7eb 100644 --- a/kdesktop/kshadowengine.h +++ b/kdesktop/kshadowengine.h @@ -92,13 +92,13 @@ class KShadowEngine /* * a slower algorithm where the influence of a pixel - * is qGray(px)/(abs(dx) + abs(dy) +1). + * is tqGray(px)/(abs(dx) + abs(dy) +1). */ double doubleLinearDecay(TQImage& source, int x, int y); /* * a very slow algorithm where the influence of a pixel - * is qGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1). + * is tqGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1). */ double radialDecay(TQImage& source, int x, int y); diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp index e0e6ab322..b3560c793 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.cpp +++ b/kdesktop/kwebdesktop/kwebdesktop.cpp @@ -171,7 +171,7 @@ KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType ) } else { // Try to find an appropriate viewer component m_part = KParts::ComponentFactory::createPartInstanceFromQuery - ( mimeType, TQString::null, 0, 0, this, 0 ); + ( mimeType, TQString(), 0, 0, this, 0 ); if ( !m_part ) kdWarning() << "No handler found for " << mimeType << endl; else { diff --git a/kdesktop/kwebdesktop/kwebdesktop.h b/kdesktop/kwebdesktop/kwebdesktop.h index 7ec81338e..b4b5cc0fc 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.h +++ b/kdesktop/kwebdesktop/kwebdesktop.h @@ -26,7 +26,7 @@ namespace KIO { class Job; } -class KWebDesktop : public QObject +class KWebDesktop : public TQObject { Q_OBJECT public: diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp index ff173c842..97dd253a7 100644 --- a/kdesktop/kxdglauncher.cpp +++ b/kdesktop/kxdglauncher.cpp @@ -52,9 +52,9 @@ void readXdgUserDirs(TQString *desktop, TQString *documents) while (!line.isNull()) { if (line.startsWith("XDG_DESKTOP_DIR=")) - *desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); + *desktop = TQString(line.remove("XDG_DESKTOP_DIR=").remove("\"")).tqreplace("$HOME", TQDir::homeDirPath()); else if (line.startsWith("XDG_DOCUMENTS_DIR=")) - *documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); + *documents = TQString(line.remove("XDG_DOCUMENTS_DIR=").remove("\"")).tqreplace("$HOME", TQDir::homeDirPath()); line = s.readLine(); } @@ -132,7 +132,7 @@ int main( int argc, char **argv) } if (directoryOk == true) { TQString xdgModifiedDirectory = newDirectory; - xdgModifiedDirectory = xdgModifiedDirectory.replace(TQDir::homeDirPath(), "$HOME"); + xdgModifiedDirectory = xdgModifiedDirectory.tqreplace(TQDir::homeDirPath(), "$HOME"); while (xdgModifiedDirectory.endsWith("/")) { xdgModifiedDirectory.truncate(xdgModifiedDirectory.length()-1); } diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc index b51791d98..3dbb3ac6b 100644 --- a/kdesktop/lock/autologout.cc +++ b/kdesktop/lock/autologout.cc @@ -27,7 +27,7 @@ #define COUNTDOWN 30 -AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog", true, WX11BypassWM) +AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog", true, (WFlags)WX11BypassWM) { frame = new TQFrame(this); frame->setFrameStyle(TQFrame::Panel | TQFrame::Raised); @@ -40,7 +40,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog" TQLabel *infoLabel = new TQLabel(i18n("To prevent being logged out, resume using this session by moving the mouse or pressing a key."), frame); mStatusLabel = new TQLabel(" ", frame); - mStatusLabel->setAlignment(TQLabel::AlignCenter); + mStatusLabel->tqsetAlignment(TQLabel::AlignCenter); TQLabel *mProgressLabel = new TQLabel("Time Remaining:", frame); mProgressRemaining = new TQProgressBar(frame); @@ -66,7 +66,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog" mCountdownTimerId = startTimer(1000/25); - connect(qApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity())); + connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity())); } AutoLogout::~AutoLogout() @@ -102,7 +102,7 @@ void AutoLogout::slotActivity() void AutoLogout::logout() { - killTimers(); + TQT_TQOBJECT(this)->killTimers(); DCOPRef("ksmserver","ksmserver").send("logout", 0, 0, 0); } diff --git a/kdesktop/lock/autologout.h b/kdesktop/lock/autologout.h index f40ac5f0d..c15a47f07 100644 --- a/kdesktop/lock/autologout.h +++ b/kdesktop/lock/autologout.h @@ -20,7 +20,7 @@ class TQLabel; class TQDialog; class TQProgressBar; -class AutoLogout : public QDialog +class AutoLogout : public TQDialog { Q_OBJECT diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc index 2249dc46e..60c500925 100644 --- a/kdesktop/lock/infodlg.cc +++ b/kdesktop/lock/infodlg.cc @@ -59,7 +59,7 @@ // Simple dialog for displaying an unlock status or recurring error message // InfoDlg::InfoDlg(LockProcess *parent) - : TQDialog(parent, "information dialog", true, WX11BypassWM), + : TQDialog(parent, "information dialog", true, (WFlags)WX11BypassWM), mUnlockingFailed(false) { frame = new TQFrame( this ); @@ -72,7 +72,7 @@ InfoDlg::InfoDlg(LockProcess *parent) KUser user; mStatusLabel = new TQLabel( " ", frame ); - mStatusLabel->setAlignment( TQLabel::AlignCenter ); + mStatusLabel->tqsetAlignment( TQLabel::AlignCenter ); TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this ); unlockDialogLayout->addWidget( frame ); @@ -81,7 +81,7 @@ InfoDlg::InfoDlg(LockProcess *parent) layStatus->addWidget( mStatusLabel ); frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); - frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, AlignTop ); + frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop ); frameLayout->addLayout( layStatus, 1, 1 ); installEventFilter(this); diff --git a/kdesktop/lock/infodlg.h b/kdesktop/lock/infodlg.h index a0ca3b8c0..bb974282f 100644 --- a/kdesktop/lock/infodlg.h +++ b/kdesktop/lock/infodlg.h @@ -24,7 +24,7 @@ class TQListView; // Simple dialog for displaying an info message. // It does not handle password validation. // -class InfoDlg : public QDialog +class InfoDlg : public TQDialog { Q_OBJECT diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc index 2efe56a8a..60c382511 100644 --- a/kdesktop/lock/lockdlg.cc +++ b/kdesktop/lock/lockdlg.cc @@ -65,7 +65,7 @@ // Simple dialog for entering a password. // PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin) - : TQDialog(parent, "password dialog", true, WX11BypassWM), + : TQDialog(parent, "password dialog", true, (WFlags)WX11BypassWM), mPlugin( plugin ), mCapsLocked(-1), mUnlockingFailed(false) @@ -83,7 +83,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin) i18n("The session was locked by %1
    ").arg( user.fullName() ), frame ); mStatusLabel = new TQLabel( " ", frame ); - mStatusLabel->setAlignment( TQLabel::AlignCenter ); + mStatusLabel->tqsetAlignment( TQLabel::AlignCenter ); mLayoutButton = new TQPushButton( frame ); mLayoutButton->setFlat( true ); @@ -112,7 +112,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin) layButtons->addWidget( cancel ); frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); - frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, AlignTop ); + frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, Qt::AlignTop ); frameLayout->addWidget( greetLabel, 0, 1 ); frameLayout->addItem( greet->getLayoutItem(), 1, 1 ); frameLayout->addLayout( layStatus, 2, 1 ); @@ -135,7 +135,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin) mFailedTimerId = 0; mTimeoutTimerId = startTimer(PASSDLG_HIDE_TIMEOUT); - connect(qApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) ); + connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) ); greet->start(); @@ -144,7 +144,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin) layoutsList = kxkb.call("getLayoutsList"); TQString currentLayout = kxkb.call("getCurrentLayout"); if( !currentLayout.isEmpty() && layoutsList.count() > 1 ) { - currLayout = layoutsList.find(currentLayout); + currLayout = layoutsList.tqfind(currentLayout); if (currLayout == layoutsList.end()) setLayoutText("err"); else @@ -179,7 +179,7 @@ void PasswordDlg::setLayoutText( const TQString &txt ) { mLayoutButton->setText( txt ); TQSize sz = mLayoutButton->fontMetrics().size( 0, txt ); - int mrg = mLayoutButton->style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2; + int mrg = mLayoutButton->tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2; mLayoutButton->setFixedSize( sz.width() + mrg, sz.height() + mrg ); } @@ -468,7 +468,7 @@ void PasswordDlg::gplugActivity() void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text ) { - TQDialog dialog( this, 0, true, WX11BypassWM ); + TQDialog dialog( this, 0, true, (WFlags)WX11BypassWM ); TQFrame *winFrame = new TQFrame( &dialog ); winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised ); winFrame->setLineWidth( 2 ); @@ -480,7 +480,7 @@ void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text ) TQLabel *label2 = new TQLabel( text, winFrame ); KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame ); button->setDefault( true ); - button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) ); TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 ); @@ -513,7 +513,7 @@ void PasswordDlg::slotStartNewSession() killTimer(mTimeoutTimerId); mTimeoutTimerId = 0; - TQDialog *dialog = new TQDialog( this, "warnbox", true, WX11BypassWM ); + TQDialog *dialog = new TQDialog( this, "warnbox", true, (WFlags)WX11BypassWM ); TQFrame *winFrame = new TQFrame( dialog ); winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised ); winFrame->setLineWidth( 2 ); @@ -627,7 +627,7 @@ void PasswordDlg::slotSwitchUser() int p = 0; DM dm; - TQDialog dialog( this, "sessbox", true, WX11BypassWM ); + TQDialog dialog( this, "sessbox", true, (WFlags)WX11BypassWM ); TQFrame *winFrame = new TQFrame( &dialog ); winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised ); winFrame->setLineWidth( 2 ); @@ -667,9 +667,9 @@ void PasswordDlg::slotSwitchUser() ns++; } int fw = lv->frameWidth() * 2; - TQSize hds( lv->header()->sizeHint() ); + TQSize hds( lv->header()->tqsizeHint() ); lv->setMinimumWidth( fw + hds.width() + - (ns > 10 ? style().pixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) ); + (ns > 10 ? tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) ); lv->setFixedHeight( fw + hds.height() + itm->height() * (ns < 6 ? 6 : ns > 10 ? 10 : ns) ); lv->header()->adjustHeaderSize(); diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index cdd5581e7..69c121002 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -195,7 +195,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly) TQStringList dmopt = TQStringList::split(TQChar(','), - TQString::fromLatin1( ::getenv( "XDM_MANAGED" ))); + TQString::tqfromLatin1( ::getenv( "XDM_MANAGED" ))); for (TQStringList::ConstIterator it = dmopt.begin(); it != dmopt.end(); ++it) if ((*it).startsWith("method=")) mMethod = (*it).mid(7); @@ -421,7 +421,7 @@ void LockProcess::setupSignals() pipe(signal_pipe); TQSocketNotifier* notif = new TQSocketNotifier(signal_pipe[0], - TQSocketNotifier::Read, this ); + TQSocketNotifier::Read, TQT_TQOBJECT(this) ); connect( notif, TQT_SIGNAL(activated(int)), TQT_SLOT(signalPipeSignal())); } @@ -550,7 +550,7 @@ void LockProcess::readSaver() bool opengl = kapp->authorize("opengl_screensavers"); bool manipulatescreen = kapp->authorize("manipulatescreen_screensavers"); KDesktopFile config(file, true); - if (config.readEntry("X-KDE-Type").utf8()) + if (config.readEntry("X-KDE-Type").utf8() != 0) { TQString saverType = config.readEntry("X-KDE-Type").utf8(); TQStringList saverTypes = TQStringList::split(";", saverType); @@ -660,7 +660,7 @@ void LockProcess::createSaverWindow() // screen state if necessary setBackgroundMode(TQWidget::NoBackground); - setCursor( blankCursor ); + setCursor( tqblankCursor ); setGeometry(0, 0, mRootWidth, mRootHeight); kdDebug(1204) << "Saver window Id: " << winId() << endl; @@ -670,7 +670,7 @@ void LockProcess::desktopResized() { mBusy = true; suspend(); - setCursor( blankCursor ); + setCursor( tqblankCursor ); // Get root window size XWindowAttributes rootAttr; @@ -840,7 +840,7 @@ bool LockProcess::grabMouse() { int rv = XGrabPointer( qt_xdisplay(), TQApplication::desktop()->winId(), True, GRABEVENTS, GrabModeAsync, GrabModeAsync, None, - blankCursor.handle(), CurrentTime ); + TQCursor(tqblankCursor).handle(), CurrentTime ); return (rv == GrabSuccess); } @@ -904,13 +904,13 @@ bool LockProcess::startSaver() saveVRoot(); if (mParent) { - TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, this, "notifier"); + TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, TQT_TQOBJECT(this), "notifier"); connect(notifier, TQT_SIGNAL( activated (int)), TQT_SLOT( quitSaver())); } createSaverWindow(); move(0, 0); show(); - setCursor( blankCursor ); + setCursor( tqblankCursor ); raise(); XSync(qt_xdisplay(), False); @@ -944,7 +944,7 @@ void LockProcess::stopSaver() TQVariant LockProcess::getConf(void *ctx, const char *key, const TQVariant &dflt) { LockProcess *that = (LockProcess *)ctx; - TQString fkey = TQString::fromLatin1( key ) + '='; + TQString fkey = TQString::tqfromLatin1( key ) + '='; for (TQStringList::ConstIterator it = that->mPluginOptions.begin(); it != that->mPluginOptions.end(); ++it) if ((*it).startsWith( fkey )) @@ -1182,7 +1182,7 @@ int LockProcess::execDialog( TQDialog *dlg ) { suspend(); XChangeActivePointerGrab( qt_xdisplay(), GRABEVENTS, - arrowCursor.handle(), CurrentTime); + TQCursor(tqarrowCursor).handle(), CurrentTime); } mDialogs.prepend( dlg ); fakeFocusIn( dlg->winId()); @@ -1192,7 +1192,7 @@ int LockProcess::execDialog( TQDialog *dlg ) mDialogs.remove( dlg ); if( mDialogs.isEmpty() ) { XChangeActivePointerGrab( qt_xdisplay(), GRABEVENTS, - blankCursor.handle(), CurrentTime); + TQCursor(tqblankCursor).handle(), CurrentTime); resume( false ); } else fakeFocusIn( mDialogs.first()->winId()); @@ -1226,7 +1226,7 @@ void LockProcess::doFunctionKeyBroadcast() { } mDialogControlLock = false; } - setCursor( blankCursor ); + setCursor( tqblankCursor ); DCOPRef ref( "*", "MainApplication-Interface"); ref.send("sendFakeKey", DCOPArg(mkeyCode , "unsigned int")); @@ -1341,7 +1341,7 @@ bool LockProcess::x11Event(XEvent *event) { XEvent ev2 = *event; ev2.xkey.window = ev2.xkey.subwindow = mDialogs.first()->winId(); - qApp->x11ProcessEvent( &ev2 ); + tqApp->x11ProcessEvent( &ev2 ); return true; } @@ -1444,7 +1444,7 @@ void LockProcess::unlockXF86() void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt ) { - TQDialog box( 0, "messagebox", true, WX11BypassWM ); + TQDialog box( 0, "messagebox", true, (WFlags)WX11BypassWM ); TQFrame *winFrame = new TQFrame( &box ); winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised ); winFrame->setLineWidth( 2 ); @@ -1453,7 +1453,7 @@ void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt ) TQLabel *label2 = new TQLabel( txt, winFrame ); KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame ); button->setDefault( true ); - button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); connect( button, TQT_SIGNAL( clicked() ), &box, TQT_SLOT( accept() ) ); TQVBoxLayout *vbox = new TQVBoxLayout( &box ); @@ -1525,7 +1525,7 @@ void LockProcess::windowAdded( WId w, bool managed ) &length, &after, &data ); bool withdrawn = true; if ( r == Success && data && format == 32 ) { - Q_UINT32 *wstate = (Q_UINT32*)data; + TQ_UINT32 *wstate = (TQ_UINT32*)data; withdrawn = (*wstate == WithdrawnState ); XFree( (char *)data ); } @@ -1576,7 +1576,7 @@ bool LockProcess::forwardVkbdEvent( XEvent* event ) for( TQValueList< VkbdWindow >::ConstIterator it = mVkbdWindows.begin(); it != mVkbdWindows.end(); ++it ) { - if( (*it).rect.contains( pos )) { + if( TQT_TQRECT_OBJECT((*it).rect).tqcontains( pos )) { // Find the subwindow where the event should actually go. // Not exactly cheap in the number of X roundtrips but oh well. Window window = (*it).id; diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h index 76ffb6013..9f9c2c0bf 100644 --- a/kdesktop/lock/lockprocess.h +++ b/kdesktop/lock/lockprocess.h @@ -41,7 +41,7 @@ struct GreeterPluginHandle { // starting screensaver hacks, and password entry. // class LockProcess - : public QWidget + : public TQWidget { Q_OBJECT public: @@ -153,7 +153,7 @@ private: WId id; QRect rect; }; - QValueList< VkbdWindow > mVkbdWindows; + TQValueList< VkbdWindow > mVkbdWindows; WId mVkbdLastEventWindow; bool mPipeOpen; diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 6e032bebb..3f6bdb330 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -96,7 +96,7 @@ int main( int argc, char **argv ) kdDebug() << "screen " << number_of_screens << " " << kdesktop_screen_number << " " << display_name << " " << starting_screen << endl; dpy = 0; - if ((pos = display_name.findRev('.')) != -1) + if ((pos = display_name.tqfindRev('.')) != -1) display_name.remove(pos, 10); TQCString env; diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc index d4ad06e88..b05d77076 100644 --- a/kdesktop/lock/querydlg.cc +++ b/kdesktop/lock/querydlg.cc @@ -59,7 +59,7 @@ // Simple dialog for displaying a password/PIN entry dialog // QueryDlg::QueryDlg(LockProcess *parent) - : TQDialog(parent, "query dialog", true, WX11BypassWM), + : TQDialog(parent, "query dialog", true, (WFlags)WX11BypassWM), mUnlockingFailed(false) { frame = new TQFrame( this ); @@ -72,8 +72,8 @@ QueryDlg::QueryDlg(LockProcess *parent) KUser user; mStatusLabel = new TQLabel( " ", frame ); - //mStatusLabel->setAlignment( TQLabel::AlignCenter ); - mStatusLabel->setAlignment( TQLabel::AlignLeft ); + //mStatusLabel->tqsetAlignment( TQLabel::AlignCenter ); + mStatusLabel->tqsetAlignment( TQLabel::AlignLeft ); KSeparator *sep = new KSeparator( KSeparator::HLine, frame ); @@ -95,7 +95,7 @@ QueryDlg::QueryDlg(LockProcess *parent) layButtons->addWidget( ok ); frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); - frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, AlignTop ); + frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop ); frameLayout->addLayout( layStatus, 0, 1 ); frameLayout->addLayout( layPin, 2, 1 ); frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 ); diff --git a/kdesktop/lock/querydlg.h b/kdesktop/lock/querydlg.h index e6a768369..0da557caf 100644 --- a/kdesktop/lock/querydlg.h +++ b/kdesktop/lock/querydlg.h @@ -26,7 +26,7 @@ class TQListView; // Simple dialog for displaying an query dialog. // It does not handle password validation. // -class QueryDlg : public QDialog +class QueryDlg : public TQDialog { Q_OBJECT diff --git a/kdesktop/main.cc b/kdesktop/main.cc index 695392165..d9eaa5f91 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -129,7 +129,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) XCloseDisplay(dpy); dpy = 0; - if ((pos = display_name.findRev('.')) != -1) + if ((pos = display_name.tqfindRev('.')) != -1) display_name.remove(pos, 10); TQCString env; diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index 027aa0bfc..cb7ebbdab 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -76,7 +76,7 @@ #define KDESU_ERR strerror(errno) Minicli::Minicli( TQWidget *parent, const char *name) - :KDialog( parent, name, false, WType_TopLevel ), + :KDialog( parent, name, false, (WFlags)WType_TopLevel ), m_autoCheckedRunInTerm(false) { m_pURLCompletion = 0L; @@ -89,7 +89,7 @@ Minicli::Minicli( TQWidget *parent, const char *name) mainLayout->addWidget(m_dlg); m_dlg->lbRunIcon->setPixmap(DesktopIcon("kmenu")); - m_dlg->lbComment->setAlignment( Qt::WordBreak ); + m_dlg->lbComment->tqsetAlignment( TQt::WordBreak ); m_dlg->cbCommand->setDuplicatesEnabled( false ); m_dlg->cbCommand->setTrapReturnKey( true ); @@ -173,15 +173,15 @@ void Minicli::setCommand(const TQString& command) { m_dlg->cbCommand->lineEdit()->setText(command); m_dlg->cbCommand->lineEdit()->deselect(); - int firstSpace = command.find(' '); + int firstSpace = command.tqfind(' '); if (firstSpace > 0) { m_dlg->cbCommand->lineEdit()->setSelection(firstSpace+1, command.length()); } } -TQSize Minicli::sizeHint() const +TQSize Minicli::tqsizeHint() const { - int maxWidth = qApp->desktop()->screenGeometry((TQWidget*)this).width(); + int maxWidth = tqApp->desktop()->screenGeometry((TQWidget*)this).width(); if (maxWidth < 603) { // a sensible max for smaller screens @@ -319,7 +319,7 @@ void Minicli::accept() int kicker_screen_number = qt_xscreen(); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", ""); + kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); } } @@ -389,7 +389,7 @@ TQString Minicli::terminalCommand (const TQString& cmd, const TQString& args) else terminal += TQString(" -e /bin/sh -c \"%1 %2\"").arg(cmd).arg(args); - if (!m_terminalAppList.contains(cmd)) + if (!m_terminalAppList.tqcontains(cmd)) m_terminalAppList << cmd; return terminal; @@ -414,13 +414,13 @@ int Minicli::runCommand() cmd = uri.url(); TQCString asn; - if( qApp->desktop()->isVirtualDesktop()) + if( tqApp->desktop()->isVirtualDesktop()) { asn = KStartupInfo::createNewStartupId(); KStartupInfoId id; id.initId( asn ); KStartupInfoData data; - data.setXinerama( qApp->desktop()->screenNumber( this )); + data.setXinerama( tqApp->desktop()->screenNumber( this )); KStartupInfo::sendChange( id, data ); } @@ -558,7 +558,7 @@ int Minicli::runCommand() case KURIFilterData::HELP: { // No need for kfmclient, KRun does it all (David) - (void) new KRun( m_filterData->uri(), parentWidget(), asn ); + (void) new KRun( m_filterData->uri(), tqparentWidget(), asn ); return 0; } case KURIFilterData::EXECUTABLE: @@ -570,7 +570,7 @@ int Minicli::runCommand() if (service && service->isValid() && service->type() == "Application") { notifyServiceStarted(service); - KRun::run(*service, KURL::List(), parentWidget(), asn ); + KRun::run(*service, KURL::List(), tqparentWidget(), asn ); return 0; } } @@ -605,7 +605,7 @@ int Minicli::runCommand() if (service && service->isValid() && service->type() == "Application") { notifyServiceStarted(service); - KRun::run(*service, KURL::List(), parentWidget(), asn ); + KRun::run(*service, KURL::List(), tqparentWidget(), asn ); return 0; } @@ -613,7 +613,7 @@ int Minicli::runCommand() if (service && service->isValid() && service->type() == "Application") { notifyServiceStarted(service); - KRun::run(*service, KURL::List(), parentWidget(), asn ); + KRun::run(*service, KURL::List(), tqparentWidget(), asn ); return 0; } @@ -625,7 +625,7 @@ int Minicli::runCommand() } } - if ( KRun::runCommand( cmd, exec, m_iconName, parentWidget(), asn ) ) + if ( KRun::runCommand( cmd, exec, m_iconName, tqparentWidget(), asn ) ) return 0; else { @@ -674,7 +674,7 @@ void Minicli::slotCmdChanged(const TQString& text) // Also use autocompletion if it appears that I am using some kind of ioslave, except the http:// ioslave m_urlCompletionStarted = true; // flag for slotMatch() - if ((text.startsWith( "/" ) || text.startsWith( "~" ) || (text.contains("://", false) != 0)) && (text.contains("http://", false) == 0)) { + if ((text.startsWith( "/" ) || text.startsWith( "~" ) || (text.tqcontains("://", false) != 0)) && (text.tqcontains("http://", false) == 0)) { TQString completion = m_pURLCompletion->makeCompletion( text ); } } @@ -730,7 +730,7 @@ void Minicli::slotAdvanced() // Set the focus back to the widget that had it to begin with, i.e. // do not put the focus on the "Options" button. - m_FocusWidget = focusWidget(); + m_FocusWidget = tqfocusWidget(); if( m_FocusWidget ) m_FocusWidget->setFocus(); @@ -763,7 +763,7 @@ void Minicli::parseLine( bool final ) KURIFilter::self()->filterURI( *(m_filterData), m_middleFilters ); bool isTerminalApp = ((m_filterData->uriType() == KURIFilterData::EXECUTABLE) && - m_terminalAppList.contains(m_filterData->uri().url())); + m_terminalAppList.tqcontains(m_filterData->uri().url())); if( !isTerminalApp ) { @@ -792,7 +792,7 @@ void Minicli::parseLine( bool final ) void Minicli::setIcon () { if( m_iconName.isEmpty() || m_iconName == "unknown" || m_iconName == "kde" ) - m_iconName = TQString::fromLatin1("kmenu"); + m_iconName = TQString::tqfromLatin1("kmenu"); TQPixmap icon = DesktopIcon( m_iconName ); @@ -806,13 +806,13 @@ void Minicli::setIcon () { int x = icon.width() - overlay.width(); int y = icon.height() - overlay.height(); - if ( icon.mask() ) + if ( icon.tqmask() ) { - TQBitmap mask = *icon.mask(); + TQBitmap mask = *icon.tqmask(); bitBlt( &mask, x, y, - overlay.mask() ? const_cast(overlay.mask()) : &overlay, + overlay.tqmask() ? TQT_TQPIXMAP(const_cast(overlay.tqmask())) : &overlay, 0, 0, overlay.width(), overlay.height(), - overlay.mask() ? OrROP : SetROP ); + overlay.tqmask() ? OrROP : SetROP ); icon.setMask(mask); } bitBlt( &icon, x, y, &overlay ); @@ -837,9 +837,9 @@ void Minicli::updateAuthLabel() m_prevChecked = m_dlg->cbRunAsOther->isChecked(); m_prevCached = true; } - if (m_dlg->leUsername->text() != TQString::fromLatin1("root")) + if (m_dlg->leUsername->text() != TQString::tqfromLatin1("root")) m_dlg->lePassword->setText(TQString::null); - m_dlg->leUsername->setText(TQString::fromLatin1("root")); + m_dlg->leUsername->setText(TQString::tqfromLatin1("root")); m_dlg->cbRunAsOther->setChecked(true); m_dlg->cbRunAsOther->setEnabled(false); m_dlg->leUsername->setEnabled(false); @@ -884,7 +884,7 @@ void Minicli::slotTerminal(bool enable) if (enable) { m_prevIconName = m_iconName; - m_iconName = TQString::fromLatin1( "konsole" ); + m_iconName = TQString::tqfromLatin1( "konsole" ); setIcon(); } else if (!m_prevIconName.isEmpty()) diff --git a/kdesktop/minicli.h b/kdesktop/minicli.h index 4ae49cf7c..93c296600 100644 --- a/kdesktop/minicli.h +++ b/kdesktop/minicli.h @@ -57,7 +57,7 @@ public: void clearHistory(); virtual void show(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; public slots: void saveConfig(); diff --git a/kdesktop/minicli_ui.ui b/kdesktop/minicli_ui.ui index 3809eb852..52e5a3d49 100644 --- a/kdesktop/minicli_ui.ui +++ b/kdesktop/minicli_ui.ui @@ -1,6 +1,6 @@ MinicliDlgUI - + MinicliDlgUI @@ -27,7 +27,7 @@ FreeResize - + layout4 @@ -61,7 +61,7 @@ Expanding - + 80 20 @@ -105,7 +105,7 @@ - + layout4 @@ -123,14 +123,14 @@ Fixed - + 57 20 - + gbAdvanced @@ -157,14 +157,14 @@ Fixed - + 20 30 - + cbRealtime @@ -180,7 +180,7 @@ </qt> - + cbAutocomplete @@ -192,7 +192,7 @@ </qt> - + cbAutohistory @@ -204,7 +204,7 @@ </qt> - + lbUsername @@ -248,7 +248,7 @@ Enter the password here for the user you specified above. - + lbPassword @@ -273,7 +273,7 @@ Enter the password here for the user you specified above. - + cbRunInTerminal @@ -284,7 +284,7 @@ Check this option if the application you want to run is a text mode application. The application will then be run in a terminal emulator window. - + layout30 @@ -292,7 +292,7 @@ unnamed - + textLabel1 @@ -319,7 +319,7 @@ Minimum - + 20 9 @@ -328,7 +328,7 @@ - + cbPriority @@ -358,7 +358,7 @@ Enter the user you want to run the application as here. - + layout29 @@ -369,7 +369,7 @@ 0 - + lbLowPriority @@ -383,7 +383,7 @@ The priority that the command will be run with can be set here. From left to right, it goes from low to high. The center position is the default value. For priorities higher than the default, you will need to provide the root password. - + lbHighPriority @@ -393,14 +393,14 @@ High - + AlignVCenter|AlignRight The priority that the command will be run with can be set here. From left to right, it goes from low to high. The center position is the default value. For priorities higher than the default, you will need to provide the root password. - + slPriority @@ -427,7 +427,7 @@ - + cbRunAsOther @@ -448,7 +448,7 @@ Fixed - + 20 40 @@ -459,7 +459,7 @@ - + separator @@ -478,7 +478,7 @@ Sunken - + lbCommand @@ -500,7 +500,7 @@ Enter the command you wish to execute or the address of the resource you want to open. This can be a remote URL like "www.kde.org" or a local one like "~/.kderc". - + lbRunIcon @@ -515,7 +515,7 @@ - + AlignCenter @@ -531,7 +531,7 @@ 0 - + 388 0 @@ -541,7 +541,7 @@ Enter the command you wish to execute or the address of the resource you want to open. This can be a remote URL like "www.kde.org" or a local one like "~/.kderc". - + lbComment @@ -556,7 +556,7 @@ Enter the name of the application you want to run or the URL you want to view - + WordBreak|AlignVCenter diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cc index bc869d341..17c1ee04e 100644 --- a/kdesktop/pixmapserver.cc +++ b/kdesktop/pixmapserver.cc @@ -58,7 +58,7 @@ KPixmapServer::~KPixmapServer() void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite) { - if (m_Names.contains(name)) + if (m_Names.tqcontains(name)) { if (overwrite) remove(name); @@ -77,7 +77,7 @@ void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite) si.handle = pm->handle(); m_Selections[sel] = si; - DataIterator it = m_Data.find(pm->handle()); + DataIterator it = m_Data.tqfind(pm->handle()); if (it == m_Data.end()) { KPixmapData data; @@ -95,20 +95,20 @@ void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite) void KPixmapServer::remove(TQString name) { // Remove the name - NameIterator it = m_Names.find(name); + NameIterator it = m_Names.tqfind(name); if (it == m_Names.end()) return; KPixmapInode pi = it.data(); m_Names.remove(it); // Remove and disown the selection - SelectionIterator it2 = m_Selections.find(pi.selection); + SelectionIterator it2 = m_Selections.tqfind(pi.selection); assert(it2 != m_Selections.end()); m_Selections.remove(it2); XSetSelectionOwner(qt_xdisplay(), pi.selection, None, CurrentTime); // Decrease refcount on data - DataIterator it3 = m_Data.find(pi.handle); + DataIterator it3 = m_Data.tqfind(pi.handle); assert(it3 != m_Data.end()); it3.data().refcount--; if (!it3.data().refcount && !it3.data().usecount) @@ -131,7 +131,7 @@ TQStringList KPixmapServer::list() void KPixmapServer::setOwner(TQString name) { - NameIterator it = m_Names.find(name); + NameIterator it = m_Names.tqfind(name); if (it == m_Names.end()) return; @@ -160,7 +160,7 @@ bool KPixmapServer::x11Event(XEvent *event) // Check if we know about this selection Atom sel = ev->selection; - SelectionIterator it = m_Selections.find(sel); + SelectionIterator it = m_Selections.tqfind(sel); if (it == m_Selections.end()) return false; KSelectionInode si = it.data(); @@ -174,7 +174,7 @@ bool KPixmapServer::x11Event(XEvent *event) } // Check if there is no transaction in progress to the same property - if (m_Active.contains(ev->property)) + if (m_Active.tqcontains(ev->property)) { kdDebug(1204) << ID << "selection is busy.\n"; XSendEvent(qt_xdisplay(), ev->requestor, false, 0, &reply); @@ -182,7 +182,7 @@ bool KPixmapServer::x11Event(XEvent *event) } // Check if the selection was not deleted - DataIterator it2 = m_Data.find(si.handle); + DataIterator it2 = m_Data.tqfind(si.handle); if (it2 == m_Data.end()) { kdDebug(1204) << ID << "selection has been deleted.\n"; @@ -216,13 +216,13 @@ bool KPixmapServer::x11Event(XEvent *event) { XPropertyEvent *ev = &event->xproperty; - AtomIterator it = m_Active.find(ev->atom); + AtomIterator it = m_Active.tqfind(ev->atom); if (it == m_Active.end()) return false; HANDLE handle = it.data(); m_Active.remove(it); - DataIterator it2 = m_Data.find(handle); + DataIterator it2 = m_Data.tqfind(handle); assert(it2 != m_Data.end()); it2.data().usecount--; if (!it2.data().usecount && !it2.data().refcount) @@ -239,7 +239,7 @@ bool KPixmapServer::x11Event(XEvent *event) { XSelectionClearEvent *ev = &event->xselectionclear; - SelectionIterator it = m_Selections.find(ev->selection); + SelectionIterator it = m_Selections.tqfind(ev->selection); if (it == m_Selections.end()) return false; diff --git a/kdesktop/pixmapserver.h b/kdesktop/pixmapserver.h index 009b70fc8..f5c877f17 100644 --- a/kdesktop/pixmapserver.h +++ b/kdesktop/pixmapserver.h @@ -48,7 +48,7 @@ struct KSelectionInode * * @author Geert Jansen */ -class KPixmapServer: public QWidget +class KPixmapServer: public TQWidget { Q_OBJECT diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp index 720dd4bba..b534fe8ad 100644 --- a/kdesktop/startupid.cpp +++ b/kdesktop/startupid.cpp @@ -218,8 +218,8 @@ void StartupId::start_startupid( const TQString& icon_P ) } else { - if( icon_pixmap.mask() != NULL ) - startup_widget->setMask( *icon_pixmap.mask()); + if( icon_pixmap.tqmask() != NULL ) + startup_widget->setMask( *icon_pixmap.tqmask()); else startup_widget->clearMask(); startup_widget->setBackgroundPixmap( icon_pixmap ); @@ -257,8 +257,8 @@ void StartupId::update_startupid() yoffset = frame_to_yoffset[ frame ]; TQPixmap pm = pixmaps[ frame_to_pixmap[ frame ] ]; startup_widget->setBackgroundPixmap( pm ); - if ( pm.mask() != NULL ) - startup_widget->setMask( *pm.mask() ); + if ( pm.tqmask() != NULL ) + startup_widget->setMask( *pm.tqmask() ); else startup_widget->clearMask(); if ( ++frame >= ( sizeof( frame_to_yoffset ) / sizeof( frame_to_yoffset[ 0 ] ) ) ) diff --git a/kdesktop/startupid.h b/kdesktop/startupid.h index d54b72730..62e7031db 100644 --- a/kdesktop/startupid.h +++ b/kdesktop/startupid.h @@ -32,7 +32,7 @@ class TQStyle; class StartupId - : public QWidget + : public TQWidget { Q_OBJECT public: diff --git a/kdesktop/xautolock.h b/kdesktop/xautolock.h index 35b53207a..5684ce6ef 100644 --- a/kdesktop/xautolock.h +++ b/kdesktop/xautolock.h @@ -17,7 +17,7 @@ // Detect user inactivity. // Named XAutoLock after the program that it is based on. // -class XAutoLock : public QWidget +class XAutoLock : public TQWidget { Q_OBJECT public: diff --git a/kdesu/kdesu/kdesu.cpp b/kdesu/kdesu/kdesu.cpp index 67ea55fe9..daa522ee1 100644 --- a/kdesu/kdesu/kdesu.cpp +++ b/kdesu/kdesu/kdesu.cpp @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) if (result == 127) { - KMessageBox::sorry(0, i18n("Command '%1' not found.").arg(command)); + KMessageBox::sorry(0, i18n("Command '%1' not found.").arg(static_cast(command))); } return result; @@ -204,7 +204,7 @@ static int startApp() int priority = tmp.toInt(&ok); if (!ok || (priority < 0) || (priority > 100)) { - KCmdLineArgs::usage(i18n("Illegal priority: %1").arg(tmp)); + KCmdLineArgs::usage(i18n("Illegal priority: %1").arg(static_cast(tmp))); exit(1); } int scheduler = SuProcess::SchedNormal; diff --git a/kdesu/kdesu/sudlg.cpp b/kdesu/kdesu/sudlg.cpp index f2ec71723..483633739 100644 --- a/kdesu/kdesu/sudlg.cpp +++ b/kdesu/kdesu/sudlg.cpp @@ -26,7 +26,7 @@ KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,co } m_User = auth_user; - setCaption(i18n("Run as %1").arg(user)); + setCaption(i18n("Run as %1").arg(static_cast(user))); TQString prompt; if (superUserCommand == "sudo" && m_User == "root") { @@ -39,7 +39,7 @@ KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,co } else { prompt = i18n("The action you requested needs additional privileges. " "Please enter the password for \"%1\" below or click " - "Ignore to continue with your current privileges.").arg(m_User); + "Ignore to continue with your current privileges.").arg(static_cast(m_User)); } } setPrompt(prompt); diff --git a/kdesu/kdesud/handler.cpp b/kdesu/kdesud/handler.cpp index 1d52a58ac..45cce362b 100644 --- a/kdesu/kdesud/handler.cpp +++ b/kdesu/kdesud/handler.cpp @@ -87,7 +87,7 @@ int ConnectionHandler::handle() // Do we have a complete command yet? int n; TQCString newbuf; - while ((n = m_Buf.find('\n')) != -1) + while ((n = m_Buf.tqfind('\n')) != -1) { newbuf = m_Buf.left(n+1); m_Buf.fill('x', n+1); @@ -304,9 +304,9 @@ int ConnectionHandler::doCommand(TQCString buf) SuProcess proc; proc.setCommand(command); proc.setUser(user); - if (options.contains('x')) + if (options.tqcontains('x')) proc.setXOnly(true); - if (options.contains('f')) + if (options.tqcontains('f')) proc.setDCOPForwarding(true); proc.setPriority(m_Priority); proc.setScheduler(m_Scheduler); diff --git a/kdesu/kdesud/kdesud.cpp b/kdesu/kdesud/kdesud.cpp index 49006a401..e8227269c 100644 --- a/kdesu/kdesud/kdesud.cpp +++ b/kdesu/kdesud/kdesud.cpp @@ -166,9 +166,9 @@ int create_socket() } // strip the screen number from the display - display.replace(TQRegExp("\\.[0-9]+$"), ""); + display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); - sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(display))); + sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(static_cast(display)))); int stat_err=lstat(sock, &s); if(!stat_err && S_ISLNK(s.st_mode)) { kdWarning(1205) << "Someone is running a symlink attack on you\n"; @@ -400,7 +400,7 @@ int main(int argc, char *argv[]) if (fd+1 > (int) handler.size()) handler.resize(fd+1); handler.insert(fd, new ConnectionHandler(fd)); - maxfd = QMAX(maxfd, fd); + maxfd = TQMAX(maxfd, fd); FD_SET(fd, &active_fds); continue; } diff --git a/kdesu/kdesud/repo.cpp b/kdesu/kdesud/repo.cpp index cdbbcaed1..fb1d7eadb 100644 --- a/kdesu/kdesud/repo.cpp +++ b/kdesu/kdesud/repo.cpp @@ -27,7 +27,7 @@ Repository::~Repository() void Repository::add(const TQCString &key, Data_entry &data) { - RepoIterator it = repo.find(key); + RepoIterator it = repo.tqfind(key); if (it != repo.end()) remove(key); if (data.timeout == 0) @@ -43,7 +43,7 @@ int Repository::remove(const TQCString &key) if( key.isEmpty() ) return -1; - RepoIterator it = repo.find(key); + RepoIterator it = repo.tqfind(key); if (it == repo.end()) return -1; it.data().value.fill('x'); @@ -60,8 +60,8 @@ int Repository::removeSpecialKey(const TQCString &key) TQValueStack rm_keys; for (RepoCIterator it=repo.begin(); it!=repo.end(); ++it) { - if ( key.find( it.data().group ) == 0 && - it.key().find( key ) >= 0 ) + if ( key.tqfind( static_cast(it.data().group) ) == 0 && + it.key().tqfind( static_cast(key) ) >= 0 ) { rm_keys.push(it.key()); found = 0; @@ -128,13 +128,13 @@ TQCString Repository::findKeys(const TQCString &group, const char *sep ) const { key = it.key().copy(); kdDebug(1205) << "Matching key found: " << key << endl; - pos = key.findRev(sep); + pos = key.tqfindRev(sep); key.truncate( pos ); key.remove(0, 2); if (!list.isEmpty()) { // Add the same keys only once please :) - if( !list.contains(key) ) + if( !list.tqcontains(static_cast(key)) ) { kdDebug(1205) << "Key added to list: " << key << endl; list += '\007'; // I do not know @@ -154,7 +154,7 @@ TQCString Repository::find(const TQCString &key) const if( key.isEmpty() ) return 0; - RepoCIterator it = repo.find(key); + RepoCIterator it = repo.tqfind(key); if (it == repo.end()) return 0; return it.data().value; diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index 8cf9b581f..9914306ba 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -104,14 +104,14 @@ static KCmdLineOptions options[] = // this class hooks into the eventloop and outputs the id // of shown dialogs or makes the dialog transient for other winids. // Will destroy itself on app exit. -class WinIdEmbedder: public QObject +class WinIdEmbedder: public TQObject { public: WinIdEmbedder(bool printID, WId winId): - TQObject(qApp), print(printID), id(winId) + TQObject(tqApp), print(printID), id(winId) { - if (qApp) - qApp->installEventFilter(this); + if (tqApp) + tqApp->installEventFilter(this); } protected: bool eventFilter(TQObject *o, TQEvent *e); @@ -125,7 +125,7 @@ bool WinIdEmbedder::eventFilter(TQObject *o, TQEvent *e) if (e->type() == TQEvent::Show && o->isWidgetType() && o->inherits("KDialog")) { - TQWidget *w = static_cast(o); + TQWidget *w = TQT_TQWIDGET(o); if (print) cout << "winId: " << w->winId() << endl; #ifdef Q_WS_X11 @@ -241,9 +241,9 @@ static int directCommand(KCmdLineArgs *args) TQString text = TQString::fromLocal8Bit(args->getOption( option )); int pos; - while ((pos = text.find( TQString::fromLatin1("\\n") )) >= 0) + while ((pos = text.tqfind( TQString::tqfromLatin1("\\n") )) >= 0) { - text.replace(pos, 2, TQString::fromLatin1("\n")); + text.tqreplace(pos, 2, TQString::tqfromLatin1("\n")); } if ( type == KMessageBox::WarningContinueCancel ) { @@ -597,43 +597,43 @@ static int directCommand(KCmdLineArgs *args) contextStr = TQString::fromLocal8Bit(args->arg(0)); } KIcon::Group group = KIcon::NoGroup; - if ( groupStr == TQString::fromLatin1( "Desktop" ) ) + if ( groupStr == TQString::tqfromLatin1( "Desktop" ) ) group = KIcon::Desktop; - else if ( groupStr == TQString::fromLatin1( "Toolbar" ) ) + else if ( groupStr == TQString::tqfromLatin1( "Toolbar" ) ) group = KIcon::Toolbar; - else if ( groupStr == TQString::fromLatin1( "MainToolbar" ) ) + else if ( groupStr == TQString::tqfromLatin1( "MainToolbar" ) ) group = KIcon::MainToolbar; - else if ( groupStr == TQString::fromLatin1( "Small" ) ) + else if ( groupStr == TQString::tqfromLatin1( "Small" ) ) group = KIcon::Small; - else if ( groupStr == TQString::fromLatin1( "Panel" ) ) + else if ( groupStr == TQString::tqfromLatin1( "Panel" ) ) group = KIcon::Panel; - else if ( groupStr == TQString::fromLatin1( "User" ) ) + else if ( groupStr == TQString::tqfromLatin1( "User" ) ) group = KIcon::User; KIcon::Context context = KIcon::Any; // From kicontheme.cpp - if ( contextStr == TQString::fromLatin1( "Devices" ) ) + if ( contextStr == TQString::tqfromLatin1( "Devices" ) ) context = KIcon::Device; - else if ( contextStr == TQString::fromLatin1( "MimeTypes" ) ) + else if ( contextStr == TQString::tqfromLatin1( "MimeTypes" ) ) context = KIcon::MimeType; - else if ( contextStr == TQString::fromLatin1( "FileSystems" ) ) + else if ( contextStr == TQString::tqfromLatin1( "FileSystems" ) ) context = KIcon::FileSystem; - else if ( contextStr == TQString::fromLatin1( "Applications" ) ) + else if ( contextStr == TQString::tqfromLatin1( "Applications" ) ) context = KIcon::Application; - else if ( contextStr == TQString::fromLatin1( "Actions" ) ) + else if ( contextStr == TQString::tqfromLatin1( "Actions" ) ) context = KIcon::Action; - else if ( contextStr == QString::fromLatin1( "Animations" ) ) + else if ( contextStr == TQString::tqfromLatin1( "Animations" ) ) context = KIcon::Animation; - else if ( contextStr == QString::fromLatin1( "Categories" ) ) + else if ( contextStr == TQString::tqfromLatin1( "Categories" ) ) context = KIcon::Category; - else if ( contextStr == QString::fromLatin1( "Emblems" ) ) + else if ( contextStr == TQString::tqfromLatin1( "Emblems" ) ) context = KIcon::Emblem; - else if ( contextStr == QString::fromLatin1( "Emotes" ) ) + else if ( contextStr == TQString::tqfromLatin1( "Emotes" ) ) context = KIcon::Emote; - else if ( contextStr == QString::fromLatin1( "International" ) ) + else if ( contextStr == TQString::tqfromLatin1( "International" ) ) context = KIcon::International; - else if ( contextStr == QString::fromLatin1( "Places" ) ) + else if ( contextStr == TQString::tqfromLatin1( "Places" ) ) context = KIcon::Place; - else if ( contextStr == QString::fromLatin1( "Status" ) ) + else if ( contextStr == TQString::tqfromLatin1( "Status" ) ) context = KIcon::StatusIcon; KIconDialog dlg(0, "icon dialog"); diff --git a/kdialog/klistboxdialog.cpp b/kdialog/klistboxdialog.cpp index d7abfb694..23fe18f53 100644 --- a/kdialog/klistboxdialog.cpp +++ b/kdialog/klistboxdialog.cpp @@ -32,7 +32,7 @@ KListBoxDialog::KListBoxDialog(TQString text, TQWidget *parent) TQVBox *page = makeVBoxMainWidget(); label = new TQLabel(text, page); - label->setAlignment(AlignCenter); + label->tqsetAlignment(AlignCenter); table = new TQListBox(page); table->setFocus(); diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp index a2064a5ba..322cf0a0d 100644 --- a/kdialog/widgets.cpp +++ b/kdialog/widgets.cpp @@ -130,7 +130,7 @@ int Widgets::textInputBox(TQWidget *parent, int width, int height, const TQStrin KTextEdit *edit = new KTextEdit( vbox ); edit->setReadOnly(FALSE); - edit->setTextFormat( Qt::PlainText ); + edit->setTextFormat( TQt::PlainText ); edit->setFocus(); if( args.count() > 1 ) @@ -218,7 +218,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString& table.setCurrentItem(0); // This is to circumvent a Qt bug for (unsigned int i=0; i+2 [ "C_TYPE_INT", " | C_BOOL", "int\t", "bool\t", "GetCfgInt", "GetCfgInt" ], "enum" => [ "C_TYPE_INT", " | C_ENUM", "int\t", "", "GetCfgInt", "" ], "group" => [ "C_TYPE_INT", " | C_GRP", "int\t", "", "GetCfgInt", "" ], - "string" => [ "C_TYPE_STR", "", "char\t*", "QString\t", "GetCfgStr", "GetCfgQStr" ], - "path" => [ "C_TYPE_STR", " | C_PATH", "char\t*", "QString\t", "GetCfgStr", "GetCfgQStr" ], - "list" => [ "C_TYPE_ARGV", "", "char\t**", "QStringList\t", "GetCfgStrArr", "GetCfgQStrList" ] + "string" => [ "C_TYPE_STR", "", "char\t*", "TQString\t", "GetCfgStr", "GetCfgQStr" ], + "path" => [ "C_TYPE_STR", " | C_PATH", "char\t*", "TQString\t", "GetCfgStr", "GetCfgQStr" ], + "list" => [ "C_TYPE_ARGV", "", "char\t**", "TQStringList\t", "GetCfgStrArr", "GetCfgQStrList" ] ); -my @tl = ("QFont\t", "QStringList\t", "QString\t", "char\t**", "char\t*", "int\t", "bool\t"); +my @tl = ("QFont\t", "TQStringList\t", "TQString\t", "char\t**", "char\t*", "int\t", "bool\t"); sub init_defs($) { diff --git a/kdm/kfrontend/kchooser.cpp b/kdm/kfrontend/kchooser.cpp index df602efea..c76f041e2 100644 --- a/kdm/kfrontend/kchooser.cpp +++ b/kdm/kfrontend/kchooser.cpp @@ -59,7 +59,7 @@ ChooserDlg::ChooserDlg() TQBoxLayout *vbox = new TQVBoxLayout( this, 10, 10 ); TQLabel *title = new TQLabel( i18n("XDMCP Host Menu"), this ); - title->setAlignment( AlignCenter ); + title->tqsetAlignment( AlignCenter ); vbox->addWidget( title ); host_view = new TQListView( this, "hosts" ); @@ -106,7 +106,7 @@ ChooserDlg::ChooserDlg() vbox->addWidget( consoleView ); #endif - sn = new TQSocketNotifier( rfd, TQSocketNotifier::Read, this ); + sn = new TQSocketNotifier( rfd, TQSocketNotifier::Read, TQT_TQOBJECT(this) ); connect( sn, TQT_SIGNAL(activated( int )), TQT_SLOT(slotReadPipe()) ); connect( pingButton, TQT_SIGNAL(clicked()), TQT_SLOT(pingHosts()) ); @@ -145,14 +145,14 @@ void ChooserDlg::pingHosts() void ChooserDlg::accept() { - if (focusWidget() == iline) { + if (tqfocusWidget() == iline) { if (!iline->text().isEmpty()) { GSendInt( G_Ch_DirectChoice ); GSendStr( iline->text().latin1() ); iline->clear(); } return; - } else /*if (focusWidget() == host_view)*/ { + } else /*if (tqfocusWidget() == host_view)*/ { TQListViewItem *item = host_view->currentItem(); if (item) { GSendInt( G_Ready ); @@ -170,7 +170,7 @@ TQString ChooserDlg::recvStr() { char *arr = GRecvStr(); if (arr) { - TQString str = TQString::fromLatin1( arr ); + TQString str = TQString::tqfromLatin1( arr ); free( arr ); return str; } else diff --git a/kdm/kfrontend/kconsole.cpp b/kdm/kfrontend/kconsole.cpp index 6c2ab09ab..5bc159244 100644 --- a/kdm/kfrontend/kconsole.cpp +++ b/kdm/kfrontend/kconsole.cpp @@ -163,7 +163,7 @@ KConsole::slotData() verticalScrollBar()->maxValue()); TQString str( TQString::fromLocal8Bit( buffer, n ).remove( '\r' ) ); int pos, opos; - for (opos = 0; (pos = str.find( '\n', opos )) >= 0; opos = pos + 1) { + for (opos = 0; (pos = str.tqfind( '\n', opos )) >= 0; opos = pos + 1) { if (paragraphs() == 100) removeParagraph( 0 ); if (!leftover.isEmpty()) { diff --git a/kdm/kfrontend/kdm_greet.c b/kdm/kfrontend/kdm_greet.c index b03d96e15..7a75330b0 100644 --- a/kdm/kfrontend/kdm_greet.c +++ b/kdm/kfrontend/kdm_greet.c @@ -700,11 +700,11 @@ restore_modifiers( void ) } void -setCursor( Display *mdpy, int window, int shape ) +setCursor( Display *mdpy, int window, int tqshape ) { Cursor xcursor; - if ((xcursor = XCreateFontCursor( mdpy, shape ))) { + if ((xcursor = XCreateFontCursor( mdpy, tqshape ))) { XDefineCursor( mdpy, window, xcursor ); XFreeCursor( mdpy, xcursor ); XFlush( mdpy ); diff --git a/kdm/kfrontend/kdm_greet.h b/kdm/kfrontend/kdm_greet.h index df325c28d..d68ee8604 100644 --- a/kdm/kfrontend/kdm_greet.h +++ b/kdm/kfrontend/kdm_greet.h @@ -77,7 +77,7 @@ int PingServer( struct _XDisplay *dpy ); void setup_modifiers( struct _XDisplay *mdpy, int numlock ); void restore_modifiers( void ); -void setCursor( struct _XDisplay *mdpy, int window, int shape ); +void setCursor( struct _XDisplay *mdpy, int window, int tqshape ); extern int rfd; /* for select() loops */ diff --git a/kdm/kfrontend/kdmadmindialog.cpp b/kdm/kfrontend/kdmadmindialog.cpp index 637d6dd90..42459ad60 100644 --- a/kdm/kfrontend/kdmadmindialog.cpp +++ b/kdm/kfrontend/kdmadmindialog.cpp @@ -75,10 +75,10 @@ KDMAdmin::KDMAdmin( const TQString &user, TQWidget *_parent ) box->addWidget( new KSeparator( KSeparator::HLine, this ) ); okButton = new KPushButton( KStdGuiItem::ok(), this ); - okButton->setSizePolicy( fp ); + okButton->tqsetSizePolicy( fp ); okButton->setDefault( true ); cancelButton = new KPushButton( KStdGuiItem::cancel(), this ); - cancelButton->setSizePolicy( fp ); + cancelButton->tqsetSizePolicy( fp ); hlay = new TQHBoxLayout( box ); hlay->addStretch( 1 ); @@ -103,7 +103,7 @@ void KDMAdmin::slotActivatePlugMenu() { TQPopupMenu *cmnu = verify->getPlugMenu(); - TQSize sh( cmnu->sizeHint() / 2 ); + TQSize sh( cmnu->tqsizeHint() / 2 ); cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) ); } diff --git a/kdm/kfrontend/kdmclock.cpp b/kdm/kfrontend/kdmclock.cpp index 88cd53970..87e6a32ba 100644 --- a/kdm/kfrontend/kdmclock.cpp +++ b/kdm/kfrontend/kdmclock.cpp @@ -50,7 +50,7 @@ KdmClock::KdmClock( TQWidget *parent, const char *name ) mBorder = false;//config->readNumEntry( "border", FALSE ); //config->setGroup( "Font" ); - mFont.setFamily( TQString::fromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ ); + mFont.setFamily( TQString::tqfromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ ); mFont.setPointSize( 51/*config->readNumEntry( "Point Size", 51)*/ ); mFont.setWeight( 75/*config->readNumEntry( "Weight", 75)*/ ); mFont.setItalic( TRUE/*config->readNumEntry( "Italic",TRUE )*/ ); @@ -76,19 +76,19 @@ KdmClock::KdmClock( TQWidget *parent, const char *name ) //setBackgroundOrigin( WindowOrigin ); mBackgroundBrush = backgroundBrush(); setBackgroundMode( NoBackground ); - repaint(); + tqrepaint(); } void KdmClock::showEvent( TQShowEvent * ) { - repaint(); + tqrepaint(); } void KdmClock::timeout() { - repaint(); + tqrepaint(); } void KdmClock::paintEvent( TQPaintEvent * ) diff --git a/kdm/kfrontend/kdmconfig.cpp b/kdm/kfrontend/kdmconfig.cpp index 15a63fa67..0916eb881 100644 --- a/kdm/kfrontend/kdmconfig.cpp +++ b/kdm/kfrontend/kdmconfig.cpp @@ -41,7 +41,7 @@ TQString _stsFile; bool _isLocal; bool _authorized; -static QString +static TQString GetCfgQStr( int id ) { char *tmp = GetCfgStr( id ); @@ -50,7 +50,7 @@ GetCfgQStr( int id ) return qs; } -static QStringList +static TQStringList GetCfgQStrList( int id ) { int i, len; @@ -65,14 +65,14 @@ GetCfgQStrList( int id ) } // Based on kconfigbase.cpp -static QFont +static TQFont Str2Font( const TQString &aValue ) { uint nFontBits; TQFont aRetFont; TQString chStr; - TQStringList sl = TQStringList::split( TQString::fromLatin1(","), aValue ); + TQStringList sl = TQStringList::split( TQString::tqfromLatin1(","), aValue ); if (sl.count() == 1) { /* X11 font spec */ @@ -160,7 +160,7 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc ) sess->vt ? TQString("vt%1").arg( sess->vt ) : #endif - TQString::fromLatin1( *sess->from ? sess->from : sess->display ); + TQString::tqfromLatin1( *sess->from ? sess->from : sess->display ); } else { user = !sess->user ? @@ -174,6 +174,6 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc ) sess->vt ? TQString("%1, vt%2").arg( sess->display ).arg( sess->vt ) : #endif - TQString::fromLatin1( sess->display ); + TQString::tqfromLatin1( sess->display ); } } diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp index dcd8a4cf1..8a556d2c8 100644 --- a/kdm/kfrontend/kdmshutdown.cpp +++ b/kdm/kfrontend/kdmshutdown.cpp @@ -115,7 +115,7 @@ KDMShutdownBase::complete( TQWidget *prevWidget ) hlay->addStretch( 1 ); if (mayOk) { okButton = new KPushButton( KStdGuiItem::ok(), this ); - okButton->setSizePolicy( fp ); + okButton->tqsetSizePolicy( fp ); okButton->setDefault( true ); hlay->addWidget( okButton ); hlay->addStretch( 1 ); @@ -124,13 +124,13 @@ KDMShutdownBase::complete( TQWidget *prevWidget ) if (maySched) { KPushButton *schedButton = new KPushButton( KGuiItem( i18n("&Schedule...") ), this ); - schedButton->setSizePolicy( fp ); + schedButton->tqsetSizePolicy( fp ); hlay->addWidget( schedButton ); hlay->addStretch( 1 ); connect( schedButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) ); } cancelButton = new KPushButton( KStdGuiItem::cancel(), this ); - cancelButton->setSizePolicy( fp ); + cancelButton->tqsetSizePolicy( fp ); if (!mayOk) cancelButton->setDefault( true ); hlay->addWidget( cancelButton ); @@ -147,7 +147,7 @@ KDMShutdownBase::slotActivatePlugMenu() TQPopupMenu *cmnu = verify->getPlugMenu(); if (!cmnu) return; - TQSize sh( cmnu->sizeHint() / 2 ); + TQSize sh( cmnu->tqsizeHint() / 2 ); cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) ); } } @@ -268,11 +268,11 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent ) TQWidget *hlp = new TQWidget( howGroup ); targets = new TQComboBox( hlp ); for (int i = 0; tlist[i]; i++) - targets->insertItem( TQString::fromLocal8Bit( tlist[i] ) ); + targets->insertItem( TQString(TQString::fromLocal8Bit( tlist[i] )) ); freeStrArr( tlist ); targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget ); TQHBoxLayout *hb = new TQHBoxLayout( hlp, 0, KDsh ); - int spc = kapp->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ) + int spc = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ) + howGroup->insideSpacing(); hb->addSpacing( spc ); hb->addWidget( targets ); @@ -280,7 +280,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent ) } GSet( 0 ); - howGroup->setSizePolicy( fp ); + howGroup->tqsetSizePolicy( fp ); schedGroup = new TQGroupBox( i18n("Scheduling"), this ); hlay->addWidget( schedGroup, 0, AlignTop ); @@ -300,13 +300,13 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent ) TQGridLayout *grid = new TQGridLayout( schedGroup, 0, 0, KDmh, KDsh ); grid->addRowSpacing( 0, schedGroup->fontMetrics().height() - 5 ); - grid->addWidget( lab1, 1, 0, AlignRight ); + grid->addWidget( lab1, 1, 0, Qt::AlignRight ); grid->addWidget( le_start, 1, 1 ); - grid->addWidget( lab2, 2, 0, AlignRight ); + grid->addWidget( lab2, 2, 0, Qt::AlignRight ); grid->addWidget( le_timeout, 2, 1 ); grid->addMultiCellWidget( cb_force, 3,3, 0,1 ); - schedGroup->setSizePolicy( fp ); + schedGroup->tqsetSizePolicy( fp ); le_start->setText( "0" ); if (_defSdMode == SHUT_SCHEDULE) @@ -477,7 +477,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) if(doUbuntuLogout) { lfrm->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); - lfrm->setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) ); + lfrm->setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) ); // we need to set the minimum size for the logout box, since it // gets too small if there isn't all options available lfrm->setMinimumSize(300,120); @@ -487,13 +487,13 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) // first line of buttons hbuttonbox = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() ); - hbuttonbox->setAlignment( Qt::AlignHCenter ); + hbuttonbox->tqsetAlignment( Qt::AlignHCenter ); // Reboot FlatButton* btnReboot = new FlatButton( lfrm ); btnReboot->setTextLabel( i18n("&Restart"), false ); btnReboot->setPixmap( DesktopIcon( "reload") ); - int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 + int i = btnReboot->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1 btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnReboot); connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot())); @@ -524,14 +524,14 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) FlatButton* btnHalt = new FlatButton( lfrm ); btnHalt->setTextLabel( i18n("&Turn Off"), false ); btnHalt->setPixmap( DesktopIcon( "exit") ); - i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 + i = btnHalt->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1 btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnHalt ); connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt())); // cancel buttonbox TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() ); - hbuttonbox2->setAlignment( Qt::AlignRight ); + hbuttonbox2->tqsetAlignment( Qt::AlignRight ); // Back to kdm KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm ); @@ -744,7 +744,7 @@ void FlatButton::init() setUsesBigPixmap(true); setAutoRaise(true); setTextPosition( TQToolButton::Under ); - setFocusPolicy(TQWidget::StrongFocus); + setFocusPolicy(TQ_StrongFocus); } @@ -816,7 +816,7 @@ KDMConfShutdown::KDMConfShutdown( int _uid, dpySpec *sess, int type, const char .arg( os ? i18n("
    (Next boot: %1)") .arg( TQString::fromLocal8Bit( os ) ) : - TQString::null ), + TQString() ), this ) ); if (sess) { @@ -876,13 +876,13 @@ KDMCancelShutdown::KDMCancelShutdown( int how, int start, int timeout, strt = i18n("now"); else { qdt.setTime_t( start ); - strt = qdt.toString( LocalDate ); + strt = qdt.toString( Qt::LocalDate ); } if (timeout == TO_INF) end = i18n("infinite"); else { qdt.setTime_t( timeout ); - end = qdt.toString( LocalDate ); + end = qdt.toString( Qt::LocalDate ); } TQString trg = i18n("Owner: %1" @@ -900,7 +900,7 @@ KDMCancelShutdown::KDMCancelShutdown( int how, int start, int timeout, .arg( strt ).arg( end ) .arg( os ? i18n("\nNext boot: %1").arg( TQString::fromLocal8Bit( os ) ) : - TQString::null ); + TQString() ); if (timeout != TO_INF) trg += i18n("\nAfter timeout: %1") .arg( force == SHUT_FORCE ? diff --git a/kdm/kfrontend/kdmshutdown.h b/kdm/kfrontend/kdmshutdown.h index c9084c153..18fda2e9a 100644 --- a/kdm/kfrontend/kdmshutdown.h +++ b/kdm/kfrontend/kdmshutdown.h @@ -213,7 +213,7 @@ private: }; -class FlatButton : public QToolButton +class FlatButton : public TQToolButton { Q_OBJECT diff --git a/kdm/kfrontend/kfdialog.cpp b/kdm/kfrontend/kfdialog.cpp index 78359e237..5052e7165 100644 --- a/kdm/kfrontend/kfdialog.cpp +++ b/kdm/kfrontend/kfdialog.cpp @@ -59,7 +59,7 @@ FDialog::resizeEvent( TQResizeEvent *e ) void FDialog::adjustGeometry() { - TQDesktopWidget *dsk = qApp->desktop(); + TQDesktopWidget *dsk = tqApp->desktop(); if (_greeterScreen < 0) _greeterScreen = _greeterScreen == -2 ? @@ -74,7 +74,7 @@ FDialog::adjustGeometry() adjustSize(); } - if (parentWidget()) + if (tqparentWidget()) return; TQRect grt( rect() ); @@ -140,10 +140,10 @@ KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &t TQLabel *label2 = new TQLabel( text, this ); TQRect d = KGlobalSettings::desktopGeometry(this); if ( label2->fontMetrics().size( 0, text).width() > d.width() * 3 / 5) - label2->setAlignment(Qt::WordBreak | Qt::AlignAuto ); + label2->tqsetAlignment(TQt::WordBreak | TQt::AlignAuto ); KPushButton *button = new KPushButton( KStdGuiItem::ok(), this ); button->setDefault( true ); - button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 ); diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp index 50e65e916..027e9a693 100644 --- a/kdm/kfrontend/kgapp.cpp +++ b/kdm/kfrontend/kgapp.cpp @@ -201,7 +201,7 @@ kg_main( const char *argv0 ) } if (cmd == G_ErrorGreet) { - if (KGVerify::handleFailVerify( qApp->desktop()->screen( _greeterScreen ) )) + if (KGVerify::handleFailVerify( TQT_TQWIDGET(tqApp->desktop()->screen( _greeterScreen )) )) break; _autoLoginDelay = 0; cmd = G_Greet; diff --git a/kdm/kfrontend/kgdialog.cpp b/kdm/kfrontend/kgdialog.cpp index f4ed918c6..e3d060643 100644 --- a/kdm/kfrontend/kgdialog.cpp +++ b/kdm/kfrontend/kgdialog.cpp @@ -133,8 +133,8 @@ KGDialog::inserten( const TQString& txt, int accel, TQPopupMenu *cmnu ) void KGDialog::slotActivateMenu( int id ) { - TQPopupMenu *cmnu = optMenu->findItem( id )->popup(); - TQSize sh( cmnu->sizeHint() / 2 ); + TQPopupMenu *cmnu = optMenu->tqfindItem( id )->popup(); + TQSize sh( cmnu->tqsizeHint() / 2 ); cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) ); } diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp index bd2e2651a..2e5da21a2 100644 --- a/kdm/kfrontend/kgreeter.cpp +++ b/kdm/kfrontend/kgreeter.cpp @@ -79,7 +79,7 @@ class UserListView : public KListView { : KListView( parent, name ) , themed(_them), cachedSizeHint( -1, 0 ) { - setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ); + tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ); header()->hide(); addColumn( TQString::null ); setColumnAlignment( 0, AlignVCenter ); @@ -105,10 +105,10 @@ class UserListView : public KListView { return sum; } public: - virtual TQSize sizeHint() const + virtual TQSize tqsizeHint() const { if (themed) - return KListView::sizeHint(); + return KListView::tqsizeHint(); if (!cachedSizeHint.isValid()) { constPolish(); @@ -119,7 +119,7 @@ public: maxw = thisw; } cachedSizeHint.setWidth( - style().pixelMetric( TQStyle::PM_ScrollBarExtent ) + + tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) + frameWidth() * 2 + maxw ); } return cachedSizeHint; @@ -133,14 +133,14 @@ public: // painting of list background for now. return KListView::paintEmptyArea(p, rect ); - const TQPixmap *pm = paletteBackgroundPixmap(); + const TQPixmap *pm = TQT_TQPIXMAP_CONST(paletteBackgroundPixmap()); if (!pm || pm->isNull()) return; kdDebug() << "paintEmpty " << rect << endl; TQRect devRect = p->xForm( rect ); kdDebug() << "paintEmpty2 " << devRect << endl; - p->drawPixmap(0, 0, *pm, devRect.left(), devRect.top() ); + p->tqdrawPixmap(0, 0, *pm, devRect.left(), devRect.top() ); } TQPixmap background; @@ -207,7 +207,7 @@ void KGreeter::readFacesList() if ( line.isEmpty() ) continue; TQString icon; - int index = line.find( ' ' ); + int index = line.tqfind( ' ' ); if ( index > 0 ) { icon = line.left( index ); line = line.mid( index ); @@ -235,12 +235,12 @@ class UserListViewItem : public KListViewItem { parent->cachedSizeHint.setWidth( -1 ); } - virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { if (((UserListView*)listView())->themed) - TQListViewItem::paintCell(p, cg, column, width, alignment); + TQListViewItem::paintCell(p, cg, column, width, tqalignment); else - KListViewItem::paintCell(p, cg, column, width, alignment); + KListViewItem::paintCell(p, cg, column, width, tqalignment); } TQString login; @@ -277,7 +277,7 @@ KGreeter::insertUser( const TQImage &default_pix, dp ^= 1; TQCString fn = !dp ? TQCString( ps->pw_dir ) + '/' : - TQFile::encodeName( _faceDir + '/' + username ); + TQCString(TQFile::encodeName( _faceDir + '/' + username )); fn += ".face.icon"; int fd, ico; if ((fd = open( fn.data(), O_RDONLY | O_NONBLOCK )) < 0) { @@ -302,7 +302,7 @@ KGreeter::insertUser( const TQImage &default_pix, TQBuffer buf( fc ); buf.open( IO_ReadOnly ); TQImageIO ir; - ir.setIODevice( &buf ); + ir.setIODevice( TQT_TQIODEVICE(&buf) ); if (!ir.read()) { LogInfo( "%s is no valid image\n", fn.data() ); continue; @@ -310,7 +310,7 @@ KGreeter::insertUser( const TQImage &default_pix, p = ir.image(); TQSize ns( 48, 48 ); if (p.size() != ns) - p = p.convertDepth( 32 ).smoothScale( ns, TQImage::ScaleMin ); + p = p.convertDepth( 32 ).smoothScale( ns, TQ_ScaleMin ); break; } while (--nd >= 0); @@ -319,7 +319,7 @@ KGreeter::insertUser( const TQImage &default_pix, if ( randomFace.isNull() ) { TQStringList::size_type index = 0; for ( size_t i = 0; i < username.length(); ++i ) - index += ( 0x7f - username.at( i ).latin1() ) % 37; + index += ( 0x7f - username.tqat( i ).latin1() ) % 37; randomFace = randomFaces[ index % randomFaces.count() ]; } p.load( _faceDir + "/../pics/users/" + randomFace + ".png" ); @@ -329,7 +329,7 @@ KGreeter::insertUser( const TQImage &default_pix, p = default_pix; TQString realname = KStringHandler::from8Bit( ps->pw_gecos ); - realname.truncate( realname.find( ',' ) ); + realname.truncate( realname.tqfind( ',' ) ); if (realname.isEmpty() || realname == username) new UserListViewItem( userView, username, TQPixmap( p ), username ); else { @@ -343,7 +343,7 @@ KGreeter::insertUser( const TQImage &default_pix, class KCStringList : public TQValueList { public: - bool contains( const char *str ) const + bool tqcontains( const char *str ) const { for (ConstIterator it = begin(); it != end(); ++it) if (*it == str) @@ -355,9 +355,9 @@ class KCStringList : public TQValueList { class UserList { public: UserList( char **in ); - bool hasUser( const char *str ) const { return users.contains( str ); } + bool hasUser( const char *str ) const { return users.tqcontains( str ); } bool hasGroup( gid_t gid ) const - { return groups.find( gid ) != groups.end(); } + { return groups.tqfind( gid ) != groups.end(); } bool hasGroups() const { return !groups.isEmpty(); } KCStringList users; @@ -396,7 +396,7 @@ KGreeter::insertUsers(int limit_users) TQSize ns( 48, 48 ); if (default_pix.size() != ns) default_pix = - default_pix.convertDepth( 32 ).smoothScale( ns, TQImage::ScaleMin ); + default_pix.convertDepth( 32 ).smoothScale( ns, TQ_ScaleMin ); } if (_showUsers == SHOW_ALL) { UserList noUsers( _noUsers ); @@ -412,7 +412,7 @@ KGreeter::insertUsers(int limit_users) !noUsers.hasGroup( ps->pw_gid )) { TQString username( TQFile::decodeName( ps->pw_name ) ); - if (!dupes.find( username )) { + if (!dupes.tqfind( username )) { dupes.insert( username, (int *)-1 ); toinsert.append( username ); @@ -443,7 +443,7 @@ KGreeter::insertUsers(int limit_users) // !noUsers.hasGroup( ps->pw_gid )) // { // TQString username( TQFile::decodeName( ent->ut_user ) ); -// if (!dupes.find( username )) { +// if (!dupes.tqfind( username )) { // dupes.insert( username, (int *)-1 ); // toinsert.append( username ); // count++; @@ -477,7 +477,7 @@ KGreeter::insertUsers(int limit_users) users.hasGroup( ps->pw_gid ))) { TQString username( TQFile::decodeName( ps->pw_name ) ); - if (!dupes.find( username )) { + if (!dupes.tqfind( username )) { dupes.insert( username, (int *)-1 ); insertUser( default_pix, username, ps ); } @@ -786,14 +786,14 @@ KStdGreeter::KStdGreeter() i18n("This display requires no X authorization.\n" "This means that anybody can connect to it,\n" "open windows on it or intercept your input.") ); - complainLabel->setAlignment( AlignCenter ); + complainLabel->tqsetAlignment( AlignCenter ); complainLabel->setFont( _failFont ); complainLabel->setPaletteForegroundColor( Qt::red ); inner_box->addWidget( complainLabel ); } if (!_greetString.isEmpty()) { TQLabel *welcomeLabel = new TQLabel( _greetString, this ); - welcomeLabel->setAlignment( AlignCenter ); + welcomeLabel->tqsetAlignment( AlignCenter ); welcomeLabel->setFont( _greetFont ); inner_box->addWidget( welcomeLabel ); } diff --git a/kdm/kfrontend/kgverify.cpp b/kdm/kfrontend/kgverify.cpp index 98abb4fb5..b80f63279 100644 --- a/kdm/kfrontend/kgverify.cpp +++ b/kdm/kfrontend/kgverify.cpp @@ -148,9 +148,9 @@ TQString // public KGVerify::pluginName() const { TQString name( greetPlugins[pluginList[curPlugin]].library->fileName() ); - uint st = name.findRev( '/' ) + 1; - uint en = name.find( '.', st ); - if (en - st > 7 && TQConstString( name.unicode() + st, 7 ).string() == "kgreet_") + uint st = name.tqfindRev( '/' ) + 1; + uint en = name.tqfind( '.', st ); + if (en - st > 7 && TQConstString( name.tqunicode() + st, 7 ).string() == "kgreet_") st += 7; return name.mid( st, en - st ); } @@ -163,7 +163,7 @@ showWidgets( TQLayoutItem *li ) if ((w = li->widget())) w->show(); - else if ((l = li->layout())) { + else if ((l = li->tqlayout())) { TQLayoutIterator it = l->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) showWidgets( itm ); @@ -849,7 +849,7 @@ KGVerify::getConf( void *, const char *key, const TQVariant &dflt ) if (!qstrcmp( key, "EchoMode" )) return TQVariant( _echoMode ); else { - TQString fkey = TQString::fromLatin1( key ) + '='; + TQString fkey = TQString::tqfromLatin1( key ) + '='; for (TQStringList::ConstIterator it = _pluginOptions.begin(); it != _pluginOptions.end(); ++it) if ((*it).startsWith( fkey )) @@ -923,11 +923,11 @@ KGStdVerify::KGStdVerify( KGVerifyHandler *_handler, TQWidget *_parent, , failedLabelState( 0 ) { grid = new TQGridLayout; - grid->setAlignment( AlignCenter ); + grid->tqsetAlignment( AlignCenter ); failedLabel = new TQLabel( parent ); failedLabel->setFont( _failFont ); - grid->addWidget( failedLabel, 1, 0, AlignCenter ); + grid->addWidget( failedLabel, 1, 0, Qt::AlignCenter ); updateLockStatus(); } @@ -1080,10 +1080,10 @@ KGChTok::KGChTok( TQWidget *_parent, const TQString &user, { TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); okButton = new KPushButton( KStdGuiItem::ok(), this ); - okButton->setSizePolicy( fp ); + okButton->tqsetSizePolicy( fp ); okButton->setDefault( true ); cancelButton = new KPushButton( KStdGuiItem::cancel(), this ); - cancelButton->setSizePolicy( fp ); + cancelButton->tqsetSizePolicy( fp ); verify = new KGStdVerify( this, this, cancelButton, user, pluginList, func, ctx ); verify->selectPlugin( curPlugin ); diff --git a/kdm/kfrontend/kgverify.h b/kdm/kfrontend/kgverify.h index 0276b2f97..0d76b5e7f 100644 --- a/kdm/kfrontend/kgverify.h +++ b/kdm/kfrontend/kgverify.h @@ -184,7 +184,7 @@ class KGStdVerify : public KGVerify { const PluginList &pluginList, KGreeterPlugin::Function func, KGreeterPlugin::Context ctx ); virtual ~KGStdVerify(); - TQLayout *getLayout() const { return grid; } + TQLayout *getLayout() const { return TQT_TQLAYOUT(grid); } void selectPlugin( int id ); protected: diff --git a/kdm/kfrontend/krootimage.cpp b/kdm/kfrontend/krootimage.cpp index 67b575c5f..a92c6aab1 100644 --- a/kdm/kfrontend/krootimage.cpp +++ b/kdm/kfrontend/krootimage.cpp @@ -60,8 +60,8 @@ MyApplication::MyApplication( const char *conf ) void MyApplication::renderDone() { - desktop()->setBackgroundPixmap( renderer.pixmap() ); - desktop()->repaint( true ); + TQT_TQWIDGET(desktop())->setBackgroundPixmap( renderer.pixmap() ); + TQT_TQWIDGET(desktop())->tqrepaint( true ); renderer.saveCacheFile(); renderer.cleanup(); for (unsigned i=0; ishow(); // Remove borders so that it blends nicely with the theme background - TQFrame* frame = ::qt_cast( widget ); + TQFrame* frame = ::tqqt_cast( widget ); if (frame) frame->setFrameStyle( TQFrame::NoFrame ); @@ -278,7 +278,7 @@ KdmItem::setGeometry( const TQRect &newGeometry, bool force ) if (fixedManager && !fixedManager->isEmpty()) fixedManager->update( newGeometry, force ); - // TODO send *selective* repaint signal + // TODO send *selective* tqrepaint signal } void @@ -295,8 +295,8 @@ KdmItem::paint( TQPainter *p, const TQRect &rect ) // Maybe set a darker version of the background instead of an exact copy? if ( myWidget && myWidget->isA( "KListView" ) ) { TQPixmap copy( myWidget->size() ); - kdDebug() << myWidget->geometry() << " " << area << " " << myWidget->size() << endl; - bitBlt( ©, TQPoint( 0, 0), p->device(), myWidget->geometry(), Qt::CopyROP ); + kdDebug() << myWidget->tqgeometry() << " " << area << " " << myWidget->size() << endl; + bitBlt( ©, TQPoint( 0, 0), p->device(), myWidget->geometry(), TQt::CopyROP ); // Lighten it slightly TQImage lightVersion; lightVersion = copy.convertToImage(); @@ -368,7 +368,7 @@ KdmItem::mouseEvent( int x, int y, bool pressed, bool released ) } ItemState oldState = state; - if (area.contains( x, y )) { + if (area.tqcontains( x, y )) { if (released && oldState == Sactive) { if (buttonParent) emit activated( id ); @@ -414,22 +414,22 @@ KdmItem::statusChanged() // BEGIN protected inheritable -QSize -KdmItem::sizeHint() +TQSize +KdmItem::tqsizeHint() { if (myWidget) return myWidget->size(); if (myLayoutItem) - return myLayoutItem->sizeHint(); + return myLayoutItem->tqsizeHint(); int w = pos.wType == DTpixel ? kAbs( pos.width ) : -1, h = pos.hType == DTpixel ? kAbs( pos.height ) : -1; return TQSize( w, h ); } -QRect +TQRect KdmItem::placementHint( const TQRect &parentRect ) { - TQSize hintedSize = sizeHint(); + TQSize hintedSize = tqsizeHint(); TQSize boxHint; int x = parentRect.left(), @@ -446,7 +446,7 @@ KdmItem::placementHint( const TQRect &parentRect ) else { if (!boxManager) return parentRect; - boxHint = boxManager->sizeHint(); + boxHint = boxManager->tqsizeHint(); } kdDebug() << timestamp() << " boxHint " << boxHint << endl; } @@ -456,21 +456,21 @@ KdmItem::placementHint( const TQRect &parentRect ) else if (pos.xType == DTnpixel) x = parentRect.right() - pos.x; else if (pos.xType == DTpercent) - x += qRound( parentRect.width() / 100.0 * pos.x ); + x += tqRound( parentRect.width() / 100.0 * pos.x ); if (pos.yType == DTpixel) y += pos.y; else if (pos.yType == DTnpixel) y = parentRect.bottom() - pos.y; else if (pos.yType == DTpercent) - y += qRound( parentRect.height() / 100.0 * pos.y ); + y += tqRound( parentRect.height() / 100.0 * pos.y ); if (pos.wType == DTpixel) w = pos.width; else if (pos.wType == DTnpixel) w -= pos.width; else if (pos.wType == DTpercent) - w = qRound( parentRect.width() / 100.0 * pos.width ); + w = tqRound( parentRect.width() / 100.0 * pos.width ); else if (pos.wType == DTbox) w = boxHint.width(); else if (hintedSize.width() > 0) @@ -483,7 +483,7 @@ KdmItem::placementHint( const TQRect &parentRect ) else if (pos.hType == DTnpixel) h -= pos.height; else if (pos.hType == DTpercent) - h = qRound( parentRect.height() / 100.0 * pos.height ); + h = tqRound( parentRect.height() / 100.0 * pos.height ); else if (pos.hType == DTbox) h = boxHint.height(); else if (hintedSize.height() > 0) { @@ -496,7 +496,7 @@ KdmItem::placementHint( const TQRect &parentRect ) // we choose to take the hinted size, but it's better to listen to the aspect ratio if (pos.wType == DTnone && pos.hType != DTnone && h && w) { - w = qRound(float(hintedSize.width() * h) / hintedSize.height()); + w = tqRound(float(hintedSize.width() * h) / hintedSize.height()); } // defaults to center @@ -504,13 +504,13 @@ KdmItem::placementHint( const TQRect &parentRect ) // anchor the rect to an edge / corner if (pos.anchor.length() > 0 && pos.anchor.length() < 3) { - if (pos.anchor.find( 'n' ) >= 0) + if (pos.anchor.tqfind( 'n' ) >= 0) dy = 0; - if (pos.anchor.find( 's' ) >= 0) + if (pos.anchor.tqfind( 's' ) >= 0) dy = -h; - if (pos.anchor.find( 'w' ) >= 0) + if (pos.anchor.tqfind( 'w' ) >= 0) dx = 0; - if (pos.anchor.find( 'e' ) >= 0) + if (pos.anchor.tqfind( 'e' ) >= 0) dx = -w; } // KdmItem *p = static_cast( parent() ); @@ -555,11 +555,11 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType ) if (s == "box") { // box value dType = DTbox; val = 0; - } else if ((p = s.find( '%' )) >= 0) { // percent value + } else if ((p = s.tqfind( '%' )) >= 0) { // percent value dType = DTpercent; TQString sCopy = s; sCopy.remove( p, 1 ); - sCopy.replace( ',', '.' ); + sCopy.tqreplace( ',', '.' ); val = (int)sCopy.toDouble(); } else { // int value dType = DTpixel; @@ -568,7 +568,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType ) sCopy.remove( 0, 1 ); dType = DTnpixel; } - sCopy.replace( ',', '.' ); + sCopy.tqreplace( ',', '.' ); val = (int)sCopy.toDouble(); } } @@ -576,7 +576,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType ) void KdmItem::parseFont( const TQString &s, TQFont &font ) { - int splitAt = s.findRev( ' ' ); + int splitAt = s.tqfindRev( ' ' ); if (splitAt < 1) return; font.setFamily( s.left( splitAt ) ); @@ -614,16 +614,16 @@ KdmItem::setFixedLayout( const TQDomNode &node ) } TQWidget * -KdmItem::parentWidget() const +KdmItem::tqparentWidget() const { if (myWidget) return myWidget; if (!this->parent()) return 0; - if (parent()->qt_cast("TQWidget")) + if (tqparent()->tqqt_cast("TQWidget")) return (TQWidget*)parent(); - return ((KdmItem*)parent())->parentWidget(); + return ((KdmItem*)parent())->tqparentWidget(); } #include "kdmitem.moc" diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h index 230ed71c4..31d4fcfa2 100644 --- a/kdm/kfrontend/themer/kdmitem.h +++ b/kdm/kfrontend/themer/kdmitem.h @@ -96,7 +96,7 @@ public: /** * Fixup the geometry of an item and its children (even if fixed - * or boxed ones). Note that this will generate repaint signals + * or boxed ones). Note that this will generate tqrepaint signals * when needed. The default implementation should fit all needs. */ virtual void setGeometry( const TQRect &newGeometry, bool force ); @@ -109,7 +109,7 @@ public: void paint( TQPainter *painter, const TQRect &boundaries ); /** - * Update representation of contents and repaint. + * Update representation of contents and tqrepaint. */ virtual void update(); @@ -120,7 +120,7 @@ public: void mouseEvent( int x, int y, bool pressed = false, bool released = false ); /** - * Similar to sizeHint(..), this returns the area of the item + * Similar to tqsizeHint(..), this returns the area of the item * given the @p parentGeometry. The default implementation * takes into account geometric constraints and layoutings. * @param parentGeometry the geometry of the caller item or a @@ -147,7 +147,7 @@ public: TQString baseDir() const { if (basedir.isEmpty() && parent()) - return static_cast( parent()->qt_cast( "KdmItem" ) )->baseDir(); + return static_cast( tqparent()->tqqt_cast( "KdmItem" ) )->baseDir(); return basedir; } @@ -163,7 +163,7 @@ public: bool isExplicitlyHidden() const { return isShown == ExplicitlyHidden; } TQRect rect() const { return area; } - TQWidget *parentWidget() const; + TQWidget *tqparentWidget() const; TQString getId() const { return id; } signals: @@ -181,7 +181,7 @@ protected: * @return (-1,-1) if no size can be determined (so it should * default to parent's size). */ - virtual TQSize sizeHint(); + virtual TQSize tqsizeHint(); /** * Low level graphical function to paint the item. @@ -195,7 +195,7 @@ protected: /** * Called when item changes its 'state' variable. This must - * handle item's repaint. + * handle item's tqrepaint. */ virtual void statusChanged(); diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp index e83ae9dc7..55a993988 100644 --- a/kdm/kfrontend/themer/kdmlabel.cpp +++ b/kdm/kfrontend/themer/kdmlabel.cpp @@ -96,7 +96,7 @@ KdmLabel::KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name ) } // Check if this is a timer label) - label.isTimer = label.text.find( "%c" ) >= 0; + label.isTimer = label.text.tqfind( "%c" ) >= 0; if (label.isTimer) { timer = new TQTimer( this ); timer->start( 1000 ); @@ -110,13 +110,13 @@ KdmLabel::setTextInt( const TQString &txt) { // TODO: catch && cText = txt; - cAccel = txt.find('&'); + cAccel = txt.tqfind('&'); delete myAccel; myAccel = 0; if (cAccel != -1) { cText.remove('&'); - myAccel = new TQAccel(parentWidget()); - myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().unicode()); + myAccel = new TQAccel(tqparentWidget()); + myAccel->insertItem(ALT + UNICODE_ACCEL + cText.tqat(cAccel).lower().tqunicode()); connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel())); } } @@ -137,8 +137,8 @@ KdmLabel::setText( const TQString &txt ) setTextInt( lookupText( label.text ) ); } -QSize -KdmLabel::sizeHint() +TQSize +KdmLabel::tqsizeHint() { // choose the correct label class struct LabelStruct::LabelClass *l = &label.normal; @@ -231,7 +231,7 @@ static const struct { { "login", I18N_NOOP("Login") } }; -QString +TQString KdmLabel::lookupStock( const TQString &stock ) { //FIXME add key accels! @@ -245,12 +245,12 @@ KdmLabel::lookupStock( const TQString &stock ) return stock; } -QString +TQString KdmLabel::lookupText( const TQString &t ) { TQString text = t; - text.replace( '_', '&' ); + text.tqreplace( '_', '&' ); TQMap m; struct utsname uts; @@ -268,7 +268,7 @@ KdmLabel::lookupText( const TQString &t ) m['s'] = KThemedGreeter::timedUser; // xgettext:no-c-format KGlobal::locale()->setDateFormat( i18n("date format", "%a %d %B") ); - m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false, false ); + m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false, false ); return KMacroExpander::expandMacros( text, m ); } diff --git a/kdm/kfrontend/themer/kdmlabel.h b/kdm/kfrontend/themer/kdmlabel.h index 1ec2f88ec..33ce1cc00 100644 --- a/kdm/kfrontend/themer/kdmlabel.h +++ b/kdm/kfrontend/themer/kdmlabel.h @@ -42,7 +42,7 @@ public: protected: // reimplemented; returns the minimum size of rendered text - virtual TQSize sizeHint(); + virtual TQSize tqsizeHint(); // draw the label virtual void drawContents( TQPainter *p, const TQRect &r ); diff --git a/kdm/kfrontend/themer/kdmlayout.cpp b/kdm/kfrontend/themer/kdmlayout.cpp index b17d2e7b7..83a4ea377 100644 --- a/kdm/kfrontend/themer/kdmlayout.cpp +++ b/kdm/kfrontend/themer/kdmlayout.cpp @@ -74,7 +74,7 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force ) // Check if box size was computed. If not compute it // TODO check if this prevents updating changing items // if (!hintedSize.isValid()) -// sizeHint(); +// tqsizeHint(); // kdDebug() << this << " hintedSize " << hintedSize << endl; @@ -114,30 +114,30 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force ) if ((*it)->isExplicitlyHidden()) continue; - TQRect temp = childrenRect, itemRect; + TQRect temp = childrenRect, tqitemRect; if (box.isVertical) { temp.setHeight( 0 ); - itemRect = (*it)->placementHint( temp ); - temp.setHeight( itemRect.height() ); - childrenRect.setTop( childrenRect.top() + itemRect.size().height() + box.spacing ); + tqitemRect = (*it)->placementHint( temp ); + temp.setHeight( tqitemRect.height() ); + childrenRect.setTop( childrenRect.top() + tqitemRect.size().height() + box.spacing ); } else { temp.setWidth( 0 ); - itemRect = (*it)->placementHint( temp ); - kdDebug() << this << " placementHint " << *it << " " << temp << " " << itemRect << endl; - temp.setWidth( itemRect.width() ); - childrenRect.setLeft( childrenRect.left() + itemRect.size().width() + box.spacing ); + tqitemRect = (*it)->placementHint( temp ); + kdDebug() << this << " placementHint " << *it << " " << temp << " " << tqitemRect << endl; + temp.setWidth( tqitemRect.width() ); + childrenRect.setLeft( childrenRect.left() + tqitemRect.size().width() + box.spacing ); kdDebug() << timestamp() << " childrenRect after " << *it << " " << childrenRect << endl; } - itemRect = (*it)->placementHint( temp ); - kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << itemRect << endl; - (*it)->setGeometry( itemRect, force ); + tqitemRect = (*it)->placementHint( temp ); + kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << tqitemRect << endl; + (*it)->setGeometry( tqitemRect, force ); } } } //FIXME truly experimental (is so close to greeter_geometry.c) -QSize -KdmLayoutBox::sizeHint() +TQSize +KdmLayoutBox::tqsizeHint() { // Sum up area taken by children int w = 0, h = 0; diff --git a/kdm/kfrontend/themer/kdmlayout.h b/kdm/kfrontend/themer/kdmlayout.h index 4c73e9a1b..69b515d67 100644 --- a/kdm/kfrontend/themer/kdmlayout.h +++ b/kdm/kfrontend/themer/kdmlayout.h @@ -80,7 +80,7 @@ public: // Computes the size hint of the box, telling which is the // smallest size inside which boxed items will fit - TQSize sizeHint(); + TQSize tqsizeHint(); private: struct { diff --git a/kdm/kfrontend/themer/kdmpixmap.cpp b/kdm/kfrontend/themer/kdmpixmap.cpp index 0fcbc065c..2322312e8 100644 --- a/kdm/kfrontend/themer/kdmpixmap.cpp +++ b/kdm/kfrontend/themer/kdmpixmap.cpp @@ -96,8 +96,8 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name ) loadPixmap( &pixmap.normal ); } -QSize -KdmPixmap::sizeHint() +TQSize +KdmPixmap::tqsizeHint() { // choose the correct pixmap class PixmapStruct::PixmapClass * pClass = &pixmap.normal; @@ -108,7 +108,7 @@ KdmPixmap::sizeHint() // use the pixmap size as the size hint if (!pClass->pixmap.isNull()) return pClass->pixmap.size(); - return KdmItem::sizeHint(); + return KdmItem::tqsizeHint(); } void @@ -163,11 +163,11 @@ KdmPixmap::loadPixmap( PixmapStruct::PixmapClass *pClass ) TQString fullpath = pClass->fullpath; kdDebug() << timestamp() << " load " << fullpath << endl; - int index = fullpath.findRev('.'); + int index = fullpath.tqfindRev('.'); TQString ext = fullpath.right(fullpath.length() - index); fullpath = fullpath.left(index); kdDebug() << timestamp() << " ext " << ext << " " << fullpath << endl; - TQString testpath = TQString("-%1x%2").arg(area.width()).arg(area.height()) + ext; + TQString testpath = TQString("-%1x%2").tqarg(area.width()).arg(area.height()) + ext; kdDebug() << timestamp() << " testing for " << fullpath + testpath << endl; if (KStandardDirs::exists(fullpath + testpath)) pClass->pixmap.load(fullpath + testpath); @@ -268,11 +268,11 @@ KdmPixmap::drawContents( TQPainter *p, const TQRect &r ) QRgb *ls = (QRgb *)scaledImage.scanLine( y ); for (int x = 0; x < w; ++x) { QRgb l = ls[x]; - int r = int( qRed( l ) * tint_red ); - int g = int( qGreen( l ) * tint_green ); - int b = int( qBlue( l ) * tint_blue ); - int a = int( qAlpha( l ) * tint_alpha ); - ls[x] = qRgba( r, g, b, a ); + int r = int( tqRed( l ) * tint_red ); + int g = int( tqGreen( l ) * tint_green ); + int b = int( tqBlue( l ) * tint_blue ); + int a = int( tqAlpha( l ) * tint_alpha ); + ls[x] = tqRgba( r, g, b, a ); } } diff --git a/kdm/kfrontend/themer/kdmpixmap.h b/kdm/kfrontend/themer/kdmpixmap.h index a12c9fea4..d49394bc9 100644 --- a/kdm/kfrontend/themer/kdmpixmap.h +++ b/kdm/kfrontend/themer/kdmpixmap.h @@ -42,7 +42,7 @@ public: protected: // reimplemented; returns the size of loaded pixmap - virtual TQSize sizeHint(); + virtual TQSize tqsizeHint(); // draw the pixmap virtual void drawContents( TQPainter *p, const TQRect &r ); diff --git a/kdm/kfrontend/themer/kdmthemer.cpp b/kdm/kfrontend/themer/kdmthemer.cpp index 9e6db33db..f95343787 100644 --- a/kdm/kfrontend/themer/kdmthemer.cpp +++ b/kdm/kfrontend/themer/kdmthemer.cpp @@ -131,19 +131,19 @@ KdmThemer::widgetEvent( TQEvent *e ) switch (e->type()) { case TQEvent::MouseMove: { - TQMouseEvent *me = static_cast(e); + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); rootItem->mouseEvent( me->x(), me->y() ); } break; case TQEvent::MouseButtonPress: { - TQMouseEvent *me = static_cast(e); + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); rootItem->mouseEvent( me->x(), me->y(), true ); } break; case TQEvent::MouseButtonRelease: { - TQMouseEvent *me = static_cast(e); + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); rootItem->mouseEvent( me->x(), me->y(), false, true ); } break; @@ -156,7 +156,7 @@ KdmThemer::widgetEvent( TQEvent *e ) break; case TQEvent::Paint: { - TQRect paintRect = static_cast(e)->rect(); + TQRect paintRect = TQT_TQPAINTEVENT(e)->rect(); kdDebug() << timestamp() << " paint on: " << paintRect << endl; if (!backBuffer) @@ -223,7 +223,7 @@ KdmThemer::generateItems( KdmItem *parent, const TQDomNode &node ) TQString id = el.attribute("id"); if (id.startsWith("plugin-specific-")) { id = id.mid(strlen("plugin-specific-")); - if (!_pluginsLogin.contains(id)) + if (!_pluginsLogin.tqcontains(id)) continue; } @@ -281,7 +281,7 @@ bool KdmThemer::willDisplay( const TQDomNode &node ) TQStringList modeList = TQStringList::split( ",", modes ); // If current mode isn't in this list, do not display item - if (modeList.find( m_currentMode ) == modeList.end()) + if (modeList.tqfind( m_currentMode ) == modeList.end()) return false; } @@ -314,13 +314,13 @@ void KdmThemer::showStructure( TQObject *obj ) { - const TQObjectList *wlist = obj->children(); + const TQObjectList wlist = obj->childrenListObject(); static int counter = 0; if (counter == 0) kdDebug() << timestamp() << " \n\n<======= Widget tree =================" << endl; - if (wlist) { + if (!wlist.isEmpty()) { counter++; - TQObjectListIterator it( *wlist ); + TQObjectListIterator it( wlist ); TQObject *object; while ((object = it.current()) != 0) { @@ -358,7 +358,7 @@ KdmThemer::slotActivated( const TQString &id ) return; item->widget()->setFocus(); - TQLineEdit *le = (TQLineEdit*)item->widget()->qt_cast("TQLineEdit"); + TQLineEdit *le = (TQLineEdit*)item->widget()->tqqt_cast("TQLineEdit"); if (le) le->selectAll(); } @@ -377,8 +377,8 @@ KdmThemer::slotPaintRoot() back_item->paint( &painter, back_item->rect()); painter.end(); - TQApplication::desktop()->screen()->setErasePixmap(pm); - TQApplication::desktop()->screen()->erase(); + TQT_TQWIDGET(TQApplication::desktop()->screen())->setErasePixmap(pm); + TQT_TQWIDGET(TQApplication::desktop()->screen())->erase(); } #include "kdmthemer.moc" diff --git a/kdm/kfrontend/themer/kdmthemer.h b/kdm/kfrontend/themer/kdmthemer.h index 6dc2318dd..0c4cd3753 100644 --- a/kdm/kfrontend/themer/kdmthemer.h +++ b/kdm/kfrontend/themer/kdmthemer.h @@ -60,9 +60,9 @@ public: bool isOK() { return rootItem != 0; } /* - * Gives a sizeHint to the widget (parent size) + * Gives a tqsizeHint to the widget (parent size) */ - //TQSize sizeHint() const{ return parentWidget()->size(); } + //TQSize tqsizeHint() const{ return tqparentWidget()->size(); } /* * Takes a shot of the current widget diff --git a/kdmlib/dmctl.cpp b/kdmlib/dmctl.cpp index 58d4f8379..63e323fdc 100644 --- a/kdmlib/dmctl.cpp +++ b/kdmlib/dmctl.cpp @@ -91,7 +91,7 @@ DM::DM() : fd( -1 ) case OldKDM: { TQString tf( ctl ); - tf.truncate( tf.find( ',' ) ); + tf.truncate( tf.tqfind( ',' ) ); fd = ::open( tf.latin1(), O_WRONLY ); } break; @@ -178,9 +178,9 @@ DM::canShutdown() TQCString re; if (DMType == GDM) - return exec( "QUERY_LOGOUT_ACTION\n", re ) && re.find("HALT") >= 0; + return exec( "QUERY_LOGOUT_ACTION\n", re ) && re.tqfind("HALT") >= 0; - return exec( "caps\n", re ) && re.find( "\tshutdown" ) >= 0; + return exec( "caps\n", re ) && re.tqfind( "\tshutdown" ) >= 0; } void @@ -194,7 +194,7 @@ DM::shutdown( KApplication::ShutdownType shutdownType, bool cap_ask; if (DMType == NewKDM) { TQCString re; - cap_ask = exec( "caps\n", re ) && re.find( "\tshutdown ask" ) >= 0; + cap_ask = exec( "caps\n", re ) && re.tqfind( "\tshutdown ask" ) >= 0; } else { if (!bootOption.isEmpty()) return; @@ -249,7 +249,7 @@ DM::bootOptions( TQStringList &opts, int &defopt, int ¤t ) opts = TQStringList::split( ' ', opts[1] ); for (TQStringList::Iterator it = opts.begin(); it != opts.end(); ++it) - (*it).replace( "\\s", " " ); + (*it).tqreplace( "\\s", " " ); return true; } @@ -272,7 +272,7 @@ DM::isSwitchable() TQCString re; - return exec( "caps\n", re ) && re.find( "\tlocal" ) >= 0; + return exec( "caps\n", re ) && re.tqfind( "\tlocal" ) >= 0; } int @@ -287,7 +287,7 @@ DM::numReserve() TQCString re; int p; - if (!(exec( "caps\n", re ) && (p = re.find( "\treserve " )) >= 0)) + if (!(exec( "caps\n", re ) && (p = re.tqfind( "\treserve " )) >= 0)) return -1; return atoi( re.data() + p + 9 ); } @@ -338,8 +338,8 @@ DM::localSessions( SessList &list ) se.vt = ts[1].mid( 2 ).toInt(); se.user = ts[2]; se.session = ts[3]; - se.self = (ts[4].find( '*' ) >= 0); - se.tty = (ts[4].find( 't' ) >= 0); + se.self = (ts[4].tqfind( '*' ) >= 0); + se.tty = (ts[4].tqfind( 't' ) >= 0); list.append( se ); } } @@ -351,7 +351,7 @@ DM::sess2Str2( const SessEnt &se, TQString &user, TQString &loc ) { if (se.tty) { user = i18n("user: ...", "%1: TTY login").arg( se.user ); - loc = se.vt ? TQString("vt%1").arg( se.vt ) : se.display ; + loc = se.vt ? TQString(TQString("vt%1").arg( se.vt )) : se.display ; } else { user = se.user.isEmpty() ? @@ -359,19 +359,19 @@ DM::sess2Str2( const SessEnt &se, TQString &user, TQString &loc ) i18n("Unused") : se.session == "" ? i18n("X login on remote host") : - i18n("... host", "X login on %1").arg( se.session ) : + TQString(i18n("... host", "X login on %1").arg( se.session )) : se.session == "" ? se.user : - i18n("user: session type", "%1: %2") - .arg( se.user ).arg( se.session ); + TQString(i18n("user: session type", "%1: %2") + .arg( se.user ).arg( se.session )); loc = se.vt ? - TQString("%1, vt%2").arg( se.display ).arg( se.vt ) : + TQString(TQString("%1, vt%2").arg( se.display ).arg( se.vt )) : se.display; } } -QString +TQString DM::sess2Str( const SessEnt &se ) { TQString user, loc; @@ -384,16 +384,16 @@ bool DM::switchVT( int vt ) { if (DMType == GDM) - return exec( TQString("SET_VT %1\n").arg(vt).latin1() ); + return exec( TQString(TQString("SET_VT %1\n").arg(vt)).latin1() ); - return exec( TQString("activate\tvt%1\n").arg(vt).latin1() ); + return exec( TQString(TQString("activate\tvt%1\n").arg(vt)).latin1() ); } void DM::lockSwitchVT( int vt ) { if (switchVT( vt )) - kapp->dcopClient()->send( "kdesktop", "KScreensaverIface", "lock()", "" ); + kapp->dcopClient()->send( "kdesktop", "KScreensaverIface", "lock()", TQString("") ); } void diff --git a/kdmlib/kgreet_classic.cpp b/kdmlib/kgreet_classic.cpp index fd2e65bd8..def8882c1 100644 --- a/kdmlib/kgreet_classic.cpp +++ b/kdmlib/kgreet_classic.cpp @@ -71,7 +71,8 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler, themer = 0; if (!themer) - layoutItem = grid = new TQGridLayout( 0, 0, 10 ); + grid = new TQGridLayout( 0, 0, 10 ); + layoutItem = TQT_TQLAYOUTITEM(grid); loginLabel = passwdLabel = passwd1Label = passwd2Label = 0; loginEdit = 0; @@ -166,7 +167,7 @@ KClassicGreeter::~KClassicGreeter() delete passwdEdit; return; } - TQLayoutIterator it = static_cast(layoutItem)->iterator(); + TQLayoutIterator it = TQT_TQLAYOUT(static_cast(layoutItem))->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); delete layoutItem; @@ -259,7 +260,7 @@ bool // virtual KClassicGreeter::textMessage( const char *text, bool err ) { if (!err && - TQString( text ).find( TQRegExp( "^Changing password for [^ ]+$" ) ) >= 0) + TQString( text ).tqfind( TQRegExp( "^Changing password for [^ ]+$" ) ) >= 0) return true; return false; } @@ -274,11 +275,11 @@ KClassicGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) exp = 1; else { TQString pr( prompt ); - if (pr.find( TQRegExp( "\\bpassword\\b", false ) ) >= 0) { - if (pr.find( TQRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b", + if (pr.tqfind( TQRegExp( "\\bpassword\\b", false ) ) >= 0) { + if (pr.tqfind( TQRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b", false ) ) >= 0) exp = 3; - else if (pr.find( TQRegExp( "\\bnew\\b", false ) ) >= 0) + else if (pr.tqfind( TQRegExp( "\\bnew\\b", false ) ) >= 0) exp = 2; else { // TQRegExp( "\\b(old|current)\\b", false ) is too strict handler->gplugReturnText( "", diff --git a/kdmlib/kgreet_pam.cpp b/kdmlib/kgreet_pam.cpp index b43952488..38556cc7a 100644 --- a/kdmlib/kgreet_pam.cpp +++ b/kdmlib/kgreet_pam.cpp @@ -56,7 +56,7 @@ protected: }; static FILE* log; -static void debug(const char* fmt, ...) +static void kg_debug(const char* fmt, ...) { va_list lst; va_start(lst, fmt); @@ -92,9 +92,9 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler, { ctx = Login; - debug("KPamGreeter constructed\n"); + kg_debug("KPamGreeter constructed\n"); - m_parentWidget = parent; + m_tqparentWidget = parent; KdmItem *user_entry = 0, *pw_entry = 0; int line = 0; @@ -109,7 +109,7 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler, m_themer = themer; if (!themer) - layoutItem = new TQGridLayout( 0, 0, 10 ); + layoutItem = TQT_TQLAYOUTITEM(new TQGridLayout( 0, 0, 10 )); loginLabel = 0; authLabel.clear(); @@ -119,8 +119,8 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler, if (ctx == ExUnlock || ctx == ExChangeTok) fixedUser = KUser().loginName(); if (func != ChAuthTok) { - debug("func != ChAuthTok\n"); - debug("fixedUser: *%s*\n", fixedUser.latin1()); + kg_debug("func != ChAuthTok\n"); + kg_debug("fixedUser: *%s*\n", fixedUser.latin1()); if (fixedUser.isEmpty()) { loginEdit = new KLineEdit( parent ); @@ -203,17 +203,17 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler, // virtual KPamGreeter::~KPamGreeter() { - debug("KPamGreeter::~KPamGreeter"); + kg_debug("KPamGreeter::~KPamGreeter"); abort(); if (!layoutItem) { delete loginEdit; return; } - TQLayoutIterator it = static_cast(layoutItem)->iterator(); + TQLayoutIterator it = TQT_TQLAYOUT(static_cast(layoutItem))->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); delete layoutItem; - debug("destructor finished, good bye"); + kg_debug("destructor finished, good bye"); } void // virtual @@ -229,7 +229,7 @@ KPamGreeter::loadUsers( const TQStringList &users ) void // virtual KPamGreeter::presetEntity( const TQString &entity, int field ) { - debug("presetEntity(%s,%d) called!\n", entity.latin1(), field); + kg_debug("presetEntity(%s,%d) called!\n", entity.latin1(), field); loginEdit->setText( entity ); if (field == 1 && authEdit.size() >= 1) authEdit[0]->setFocus(); @@ -279,7 +279,7 @@ KPamGreeter::setEnabled(bool enable) void // private KPamGreeter::returnData() { - debug("*************** returnData called with exp %d\n", exp); + kg_debug("*************** returnData called with exp %d\n", exp); switch (exp) { @@ -308,13 +308,13 @@ KPamGreeter::returnData() bool // virtual KPamGreeter::textMessage( const char *text, bool err ) { - debug(" ************** textMessage(%s, %d)\n", text, err); + kg_debug(" ************** textMessage(%s, %d)\n", text, err); if (!authEdit.size()) return false; if (getLayoutItem()) { - TQLabel* label = new TQLabel(TQString::fromUtf8(text), m_parentWidget); + TQLabel* label = new TQLabel(TQString::fromUtf8(text), m_tqparentWidget); getLayoutItem()->addWidget(label, state+1, 0, 0); } @@ -324,8 +324,8 @@ KPamGreeter::textMessage( const char *text, bool err ) void // virtual KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) { - debug("textPrompt called with prompt %s echo %d nonBlocking %d", prompt, echo, nonBlocking); - debug("state is %d, authEdit.size is %d\n", state, authEdit.size()); + kg_debug("textPrompt called with prompt %s echo %d nonBlocking %d", prompt, echo, nonBlocking); + kg_debug("state is %d, authEdit.size is %d\n", state, authEdit.size()); if (state == 0 && echo) { if (loginLabel) @@ -341,12 +341,12 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) } else if (state >= authEdit.size()) { if (getLayoutItem()) { - TQLabel* label = new TQLabel(TQString::fromUtf8(prompt), m_parentWidget); + TQLabel* label = new TQLabel(TQString::fromUtf8(prompt), m_tqparentWidget); getLayoutItem()->addWidget(label, state+1, 0, 0); - debug("added label widget to layout"); + kg_debug("added label widget to layout"); } else if (m_themer) { - debug("themer found!"); + kg_debug("themer found!"); KdmItem *pw_label = 0; KdmLabel *kdmlabel = static_cast(m_themer->findNode("pw-label")); @@ -361,9 +361,9 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) KDMPasswordEdit* passwdEdit; if (echoMode == -1) - passwdEdit = new KDMPasswordEdit( m_parentWidget ); + passwdEdit = new KDMPasswordEdit( m_tqparentWidget ); else - passwdEdit = new KDMPasswordEdit( echoMode, m_parentWidget); + passwdEdit = new KDMPasswordEdit( echoMode, m_tqparentWidget); connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) ); connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) ); @@ -383,7 +383,7 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) getLayoutItem()->addWidget(passwdEdit, state+1, 1, 0); if (m_themer) { - debug("themer found!"); + kg_debug("themer found!"); KdmItem *pw_entry = 0; pw_entry = m_themer->findNode("pw-entry"); @@ -398,13 +398,13 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) } } else - debug("no themer found!"); + kg_debug("no themer found!"); } ++state; pExp = exp; exp = authEdit.size(); - debug("state %d exp: %d, has %d\n", state, exp, has); + kg_debug("state %d exp: %d, has %d\n", state, exp, has); if (has >= exp || nonBlocking) returnData(); @@ -420,7 +420,7 @@ KPamGreeter::binaryPrompt( const char *, bool ) void // virtual KPamGreeter::start() { - debug("******* start() called\n"); + kg_debug("******* start() called\n"); while(authEdit.begin() != authEdit.end()) { KPasswordEdit* item = *authEdit.remove(authEdit.begin()); @@ -452,10 +452,10 @@ KPamGreeter::resume() void // virtual KPamGreeter::next() { - debug("********* next() called state %d\n", state); + kg_debug("********* next() called state %d\n", state); if (state == 0 && running && handler) { - debug(" **** returned text!\n"); + kg_debug(" **** returned text!\n"); handler->gplugReturnText( (loginEdit ? loginEdit->text() : fixedUser).local8Bit(), KGreeterPluginHandler::IsUser ); @@ -479,7 +479,7 @@ KPamGreeter::next() has = -1; } - debug(" has %d and exp %d\n", has, exp); + kg_debug(" has %d and exp %d\n", has, exp); #if 0 // assert( running ); @@ -508,7 +508,7 @@ KPamGreeter::next() void // virtual KPamGreeter::abort() { - debug("***** abort() called\n"); + kg_debug("***** abort() called\n"); running = false; if (exp >= 0) { @@ -520,7 +520,7 @@ KPamGreeter::abort() void // virtual KPamGreeter::succeeded() { - debug("**** succeeded() called\n"); + kg_debug("**** succeeded() called\n"); // assert( running || timed_login ); if (!authTok) @@ -617,14 +617,14 @@ KPamGreeter::slotLoginLostFocus() handler->gplugReturnText( 0, 0 ); } curUser = loginEdit->text(); - debug("curUser is %s", curUser.latin1()); + kg_debug("curUser is %s", curUser.latin1()); handler->gplugSetUser( curUser ); } void KPamGreeter::slotActivity() { - debug("slotActivity"); + kg_debug("slotActivity"); if (running) handler->gplugActivity(); diff --git a/kdmlib/kgreet_pam.h b/kdmlib/kgreet_pam.h index f0bea7d02..b531adee7 100644 --- a/kdmlib/kgreet_pam.h +++ b/kdmlib/kgreet_pam.h @@ -64,7 +64,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin { virtual void revive(); virtual void clear(); - TQGridLayout *getLayoutItem() const { return static_cast(layoutItem); } + TQGridLayout *getLayoutItem() const { return TQT_TQGRIDLAYOUT(static_cast(layoutItem)); } public slots: void slotLoginLostFocus(); @@ -78,7 +78,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin { TQLabel *loginLabel; TQValueList authLabel; KLineEdit *loginEdit; - TQWidget* m_parentWidget; + TQWidget* m_tqparentWidget; TQValueList authEdit; KSimpleConfig *stsFile; KdmThemer *m_themer; diff --git a/kdmlib/kgreet_winbind.cpp b/kdmlib/kgreet_winbind.cpp index 5f6530707..edb38ad1d 100644 --- a/kdmlib/kgreet_winbind.cpp +++ b/kdmlib/kgreet_winbind.cpp @@ -56,7 +56,7 @@ static TQString defaultDomain; static void splitEntity( const TQString &ent, TQString &dom, TQString &usr ) { - int pos = ent.find( separator ); + int pos = ent.tqfind( separator ); if (pos < 0) dom = "", usr = ent; else @@ -89,7 +89,8 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler, themer = 0; if (!themer) - layoutItem = grid = new TQGridLayout( 0, 0, 10 ); + grid = new TQGridLayout( 0, 0, 10 ); + layoutItem = TQT_TQLAYOUTITEM(grid); domainLabel = loginLabel = passwdLabel = passwd1Label = passwd2Label = 0; domainCombo = 0; @@ -212,7 +213,7 @@ KWinbindGreeter::~KWinbindGreeter() delete domainCombo; return; } - TQLayoutIterator it = static_cast(layoutItem)->iterator(); + TQLayoutIterator it = TQT_TQLAYOUT(static_cast(layoutItem))->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); delete layoutItem; @@ -227,7 +228,7 @@ KWinbindGreeter::slotChangedDomain( const TQString &dom ) TQStringList users; if (dom == "") { for (TQStringList::ConstIterator it = allUsers.begin(); it != allUsers.end(); ++it) - if ((*it).find( separator ) < 0) + if ((*it).tqfind( separator ) < 0) users << *it; } else { TQString st( dom + separator ); @@ -340,7 +341,7 @@ bool // virtual KWinbindGreeter::textMessage( const char *text, bool err ) { if (!err && - TQString( text ).find( TQRegExp( "^Changing password for [^ ]+$" ) ) >= 0) + TQString( text ).tqfind( TQRegExp( "^Changing password for [^ ]+$" ) ) >= 0) return true; return false; } @@ -355,15 +356,15 @@ KWinbindGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) exp = 1; else { TQString pr( prompt ); - if (pr.find( TQRegExp( "\\b(old|current)\\b", false ) ) >= 0) { + if (pr.tqfind( TQRegExp( "\\b(old|current)\\b", false ) ) >= 0) { handler->gplugReturnText( "", KGreeterPluginHandler::IsOldPassword | KGreeterPluginHandler::IsSecret ); return; - } else if (pr.find( TQRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b", + } else if (pr.tqfind( TQRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b", false ) ) >= 0) exp = 3; - else if (pr.find( TQRegExp( "\\bnew\\b", false ) ) >= 0) + else if (pr.tqfind( TQRegExp( "\\bnew\\b", false ) ) >= 0) exp = 2; else { handler->gplugMsgBox( TQMessageBox::Critical, @@ -593,7 +594,7 @@ KWinbindGreeter::slotEndDomainList() for (TQStringList::const_iterator it = mDomainListing.begin(); it != mDomainListing.end(); ++it) { - if (!domainList.contains(*it)) + if (!domainList.tqcontains(*it)) domainList.append(*it); } @@ -625,7 +626,7 @@ static bool init( const TQString &, { echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt(); staticDomains = TQStringList::split( ':', getConf( ctx, "winbind.Domains", TQVariant( "" ) ).toString() ); - if (!staticDomains.contains("")) + if (!staticDomains.tqcontains("")) staticDomains << ""; defaultDomain = getConf( ctx, "winbind.DefaultDomain", TQVariant( staticDomains.first() ) ).toString(); diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp index 95e4045ac..b012cef6b 100644 --- a/kfind/kdatecombo.cpp +++ b/kfind/kdatecombo.cpp @@ -33,7 +33,7 @@ void KDateCombo::initObject(const TQDate & date, TQWidget *, const char *) popupFrame = new KPopupFrame(this, "popupFrame"); popupFrame->installEventFilter(this); datePicker = new KDatePicker(popupFrame, date, "datePicker"); - datePicker->setMinimumSize(datePicker->sizeHint()); + datePicker->setMinimumSize(datePicker->tqsizeHint()); datePicker->installEventFilter(this); popupFrame->setMainWidget(datePicker); setDate(date); @@ -57,9 +57,9 @@ TQDate & KDateCombo::string2Date(const TQString & str, TQDate *qd) return *qd = KGlobal::locale()->readDate(str); } -TQDate & KDateCombo::getDate(TQDate *currentDate) +TQDate & KDateCombo::getDate(TQDate *tqcurrentDate) { - return string2Date(currentText(), currentDate); + return string2Date(currentText(), tqcurrentDate); } bool KDateCombo::setDate(const TQDate & newDate) @@ -84,9 +84,9 @@ void KDateCombo::dateEnteredEvent(TQDate newDate) void KDateCombo::mousePressEvent (TQMouseEvent * e) { - if (e->button() & TQMouseEvent::LeftButton) + if (e->button() & Qt::LeftButton) { - if (rect().contains( e->pos())) + if (TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos())) { TQDate tempDate; getDate(& tempDate); @@ -103,7 +103,7 @@ bool KDateCombo::eventFilter (TQObject*, TQEvent* e) { TQMouseEvent *me = (TQMouseEvent *)e; TQPoint p = mapFromGlobal( me->globalPos() ); - if (rect().contains( p ) ) + if (TQT_TQRECT_OBJECT(rect()).tqcontains( p ) ) { TQTimer::singleShot(10, this, TQT_SLOT(dateEnteredEvent())); return true; diff --git a/kfind/kdatecombo.h b/kfind/kdatecombo.h index ab714a3ba..d8da787b8 100644 --- a/kfind/kdatecombo.h +++ b/kfind/kdatecombo.h @@ -26,7 +26,7 @@ public: KDateCombo(const TQDate & date, TQWidget *parent=0, const char *name=0); ~KDateCombo(); - TQDate & getDate(TQDate *currentDate); + TQDate & getDate(TQDate *tqcurrentDate); bool setDate(const TQDate & newDate); private: diff --git a/kfind/kfind.cpp b/kfind/kfind.cpp index 8908b26c8..f10490315 100644 --- a/kfind/kfind.cpp +++ b/kfind/kfind.cpp @@ -70,7 +70,7 @@ Kfind::Kfind(TQWidget *parent, const char *name) mTopLayout->addWidget(mButtonBox); mSearch = new KPushButton( KGuiItem(i18n("&Find"), "find"), mButtonBox ); - mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4); + mButtonBox->setSpacing( (tabWidget->tqsizeHint().height()-4*mSearch->tqsizeHint().height()) / 4); connect( mSearch, TQT_SIGNAL(clicked()), this, TQT_SLOT( startSearch() ) ); mStop = new KPushButton( KGuiItem(i18n("Stop"), "stop"), mButtonBox ); connect( mStop, TQT_SIGNAL(clicked()), this, TQT_SLOT( stopSearch() ) ); diff --git a/kfind/kfind.h b/kfind/kfind.h index fc18ca045..3919080e9 100644 --- a/kfind/kfind.h +++ b/kfind/kfind.h @@ -18,7 +18,7 @@ class KQuery; class KURL; class KfindTabWidget; -class Kfind: public QWidget +class Kfind: public TQWidget { Q_OBJECT diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp index aeb6d2708..557d4b04e 100644 --- a/kfind/kfinddlg.cpp +++ b/kfind/kfinddlg.cpp @@ -31,7 +31,7 @@ KfindDlg::KfindDlg(const KURL & url, TQWidget *parent, const char *name) KStdGuiItem::saveAs()) { TQWidget::setCaption( i18n("Find Files/Folders" ) ); - setButtonBoxOrientation(Vertical); + setButtonBoxOrientation(Qt::Vertical); enableButton(Apply, true); // Enable "Find" enableButton(User1, false); // Disable "Stop" @@ -72,7 +72,7 @@ KfindDlg::KfindDlg(const KURL & url, TQWidget *parent, const char *name) connect(win ,TQT_SIGNAL(resultSelected(bool)), this,TQT_SIGNAL(resultSelected(bool))); - query = new KQuery(frame); + query = new KQuery(TQT_TQOBJECT(frame)); connect(query, TQT_SIGNAL(addFile(const KFileItem*,const TQString&)), TQT_SLOT(addFile(const KFileItem*,const TQString&))); connect(query, TQT_SIGNAL(result(int)), TQT_SLOT(slotResult(int))); @@ -236,7 +236,7 @@ void KfindDlg::about () void KfindDlg::slotDeleteItem(const TQString& file) { - kdDebug()<url().path(+1))==0) + if(file.tqfind(query->url().path(+1))==0) { kdDebug()<firstChild(); diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp index 92082019f..252aca295 100644 --- a/kfind/kfindpart.cpp +++ b/kfind/kfindpart.cpp @@ -33,7 +33,7 @@ class KonqDirPart; typedef KParts::GenericFactory KFindFactory; K_EXPORT_COMPONENT_FACTORY( libkfindpart, KFindFactory ) -KFindPart::KFindPart( TQWidget * parentWidget, const char *widgetName, +KFindPart::KFindPart( TQWidget * tqparentWidget, const char *widgetName, TQObject *parent, const char *name , const TQStringList & /*args*/ ) : KonqDirPart (parent, name )/*KParts::ReadOnlyPart*/ @@ -43,8 +43,8 @@ KFindPart::KFindPart( TQWidget * parentWidget, const char *widgetName, setBrowserExtension( new KonqDirPartBrowserExtension( this ) ); kdDebug() << "KFindPart::KFindPart " << this << endl; - m_kfindWidget = new Kfind( parentWidget, widgetName ); - m_kfindWidget->setMaximumHeight(m_kfindWidget->minimumSizeHint().height()); + m_kfindWidget = new Kfind( tqparentWidget, widgetName ); + m_kfindWidget->setMaximumHeight(m_kfindWidget->tqminimumSizeHint().height()); const KFileItem *item = ((KonqDirPart*)parent)->currentItem(); kdDebug() << "Kfind: currentItem: " << ( item ? item->url().path().local8Bit() : TQString("null") ) << endl; TQDir d; diff --git a/kfind/kfindpart.h b/kfind/kfindpart.h index 47d75a53c..f9a0d6cde 100644 --- a/kfind/kfindpart.h +++ b/kfind/kfindpart.h @@ -44,7 +44,7 @@ class KFindPart : public KonqDirPart//KParts::ReadOnlyPart Q_OBJECT Q_PROPERTY( bool showsResult READ showsResult ) public: - KFindPart( TQWidget * parentWidget, const char *widgetName, + KFindPart( TQWidget * tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList & /*args*/ ); virtual ~KFindPart(); diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp index 3d7615afd..95a8c3048 100644 --- a/kfind/kftabdlg.cpp +++ b/kfind/kftabdlg.cpp @@ -60,11 +60,11 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) pages[0] = new TQWidget( this, "page1" ); nameBox = new KComboBox(TRUE, pages[0], "combo1"); - nameBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry + nameBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * namedL = new TQLabel(nameBox, i18n("&Named:"), pages[0], "named"); TQToolTip::add( namedL, i18n("You can use wildcard matching and \";\" for separating multiple names") ); dirBox = new KComboBox(TRUE, pages[0], "combo2"); - dirBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry + dirBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * lookinL = new TQLabel(dirBox, i18n("Look &in:"), pages[0], "named"); subdirsCb = new TQCheckBox(i18n("Include &subfolders"), pages[0]); caseSensCb = new TQCheckBox(i18n("Case s&ensitive search"), pages[0]); @@ -187,7 +187,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) sizeUnitBox ->setCurrentItem(1); int tmp = sizeEdit->fontMetrics().width(" 000000000 "); - sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height()); + sizeEdit->setMinimumSize(tmp, sizeEdit->tqsizeHint().height()); m_usernameBox->setDuplicatesEnabled(FALSE); m_groupBox->setDuplicatesEnabled(FALSE); @@ -212,7 +212,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) grid1->addWidget(rb[0], 1, 1 ); grid1->addWidget(fromDate, 1, 2 ); - grid1->addWidget(andL, 1, 3, AlignHCenter ); + grid1->addWidget(andL, 1, 3, Qt::AlignHCenter ); grid1->addWidget(toDate, 1, 4 ); grid1->addWidget(rb[1], 2, 1 ); @@ -245,7 +245,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) pages[2] = new TQWidget( this, "page3" ); typeBox =new KComboBox(FALSE, pages[2], "typeBox"); - typeBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry + typeBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * typeL =new TQLabel(typeBox, i18n("File &type:"), pages[2], "type"); textEdit=new KLineEdit(pages[2], "textEdit" ); TQLabel * textL =new TQLabel(textEdit, i18n("C&ontaining text:"), pages[2], "text"); @@ -315,7 +315,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) // Layout tmp = sizeEdit->fontMetrics().width(" 00000 "); - sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height()); + sizeEdit->setMinimumSize(tmp, sizeEdit->tqsizeHint().height()); TQGridLayout *grid2 = new TQGridLayout( pages[2], 5, 4, KDialog::marginHint(), @@ -330,7 +330,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) grid2->addWidget( textMetaKey, 4, 0 ); grid2->addWidget( metainfokeyEdit, 4, 1 ); - grid2->addWidget( textMetaInfo, 4, 2, AlignHCenter ); + grid2->addWidget( textMetaInfo, 4, 2, Qt::AlignHCenter ); grid2->addWidget( metainfoEdit, 4, 3 ); metainfokeyEdit->setText("*"); @@ -390,7 +390,7 @@ void KfindTabWidget::setURL( const KURL & url ) dirBox->insertStringList(sl); // If the _searchPath already exists in the list we do not // want to add it again - int indx = sl.findIndex(m_url.prettyURL()); + int indx = sl.tqfindIndex(m_url.prettyURL()); if(indx == -1) dirBox->insertItem(m_url.prettyURL(), 0); // make it the first one else @@ -472,7 +472,7 @@ void KfindTabWidget::loadHistory() dirBox->insertStringList(sl); // If the _searchPath already exists in the list we do not // want to add it again - int indx = sl.findIndex(m_url.prettyURL()); + int indx = sl.tqfindIndex(m_url.prettyURL()); if(indx == -1) dirBox->insertItem(m_url.prettyURL(), 0); // make it the first one else @@ -496,9 +496,9 @@ void KfindTabWidget::loadHistory() void KfindTabWidget::slotEditRegExp() { if ( ! regExpDialog ) - regExpDialog = KParts::ComponentFactory::createInstanceFromQuery( "KRegExpEditor/KRegExpEditor", TQString::null, this ); + regExpDialog = KParts::ComponentFactory::createInstanceFromQuery( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); - KRegExpEditorInterface *iface = static_cast( regExpDialog->qt_cast( "KRegExpEditorInterface" ) ); + KRegExpEditorInterface *iface = static_cast( regExpDialog->tqqt_cast( "KRegExpEditorInterface" ) ); if ( !iface ) return; @@ -651,8 +651,8 @@ void KfindTabWidget::setQuery(KQuery *query) toDate->getDate(&q2); // do not generate negative numbers .. find doesn't handle that - time_t time1 = epoch.secsTo(q1); - time_t time2 = epoch.secsTo(q2.addDays(1)) - 1; // Include the last day + time_t time1 = epoch.secsTo(TQDateTime(q1)); + time_t time2 = epoch.secsTo(TQDateTime(q2.addDays(1))) - 1; // Include the last day query->setTimeRange(time1, time2); } @@ -712,7 +712,7 @@ void KfindTabWidget::setQuery(KQuery *query) } else { - query->setMimeType( TQString::null ); + query->setMimeType( TQString() ); } //Metainfo @@ -807,7 +807,7 @@ bool KfindTabWidget::isSearchRecursive() Digit validator. Allows only digits to be typed. **/ KDigitValidator::KDigitValidator( TQWidget * parent, const char *name ) - : TQValidator( parent, name ) + : TQValidator( TQT_TQOBJECT(parent), name ) { r = new TQRegExp("^[0-9]*$"); } @@ -854,15 +854,15 @@ static void save_pattern(TQComboBox *obj, conf->writePathEntry(entry, sl); } -TQSize KfindTabWidget::sizeHint() const +TQSize KfindTabWidget::tqsizeHint() const { // #44662: avoid a huge default size when the comboboxes have very large items // Like in minicli, we changed the combobox size policy so that they can resize down, // and then we simply provide a reasonable size hint for the whole window, depending // on the screen width. - TQSize sz = TQTabWidget::sizeHint(); + TQSize sz = TQTabWidget::tqsizeHint(); KfindTabWidget* me = const_cast( this ); - const int screenWidth = qApp->desktop()->screenGeometry(me).width(); + const int screenWidth = tqApp->desktop()->screenGeometry(me).width(); if ( sz.width() > screenWidth / 2 ) sz.setWidth( screenWidth / 2 ); return sz; diff --git a/kfind/kftabdlg.h b/kfind/kftabdlg.h index 157a1fa44..dfea860da 100644 --- a/kfind/kftabdlg.h +++ b/kfind/kftabdlg.h @@ -29,7 +29,7 @@ class TQSpinBox; class KfDirDialog; -class KfindTabWidget: public QTabWidget +class KfindTabWidget: public TQTabWidget { Q_OBJECT @@ -49,7 +49,7 @@ public: void setURL( const KURL & url ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; public slots: void setFocus(); @@ -119,7 +119,7 @@ private: TQStringList m_AudioTypes; }; -class KDigitValidator : public QValidator +class KDigitValidator : public TQValidator { Q_OBJECT diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index 2ee69aa14..963fdaf92 100644 --- a/kfind/kfwin.cpp +++ b/kfind/kfwin.cpp @@ -146,7 +146,7 @@ KfindWindow::KfindWindow( TQWidget *parent, const char *name ) TQString KfindWindow::reducedDir(const TQString& fullDir) { - if (fullDir.find(m_baseDir)==0) + if (fullDir.tqfind(m_baseDir)==0) { TQString tmp=fullDir.mid(m_baseDir.length()); return tmp; @@ -156,7 +156,7 @@ TQString KfindWindow::reducedDir(const TQString& fullDir) void KfindWindow::beginSearch(const KURL& baseUrl) { - kdDebug()<clipboard(); + TQClipboard *cb = kapp->tqclipboard(); cb->setData(drag_obj); } } @@ -215,14 +215,14 @@ void KfindWindow::saveResults() TQFile file(filename); if ( !file.open(IO_WriteOnly) ) - KMessageBox::error(parentWidget(), + KMessageBox::error(tqparentWidget(), i18n("Unable to save results.")); else { TQTextStream stream( &file ); stream.setEncoding( TQTextStream::Locale ); if ( mimeType->name() == "text/html") { - stream << TQString::fromLatin1("\n" + stream << TQString::tqfromLatin1("\n" "\n" "%2\n" "

    %3

    " @@ -236,13 +236,13 @@ void KfindWindow::saveResults() { TQString path=((KfFileLVI*)item)->fileitem.url().url(); TQString pretty=((KfFileLVI*)item)->fileitem.url().htmlURL(); - stream << TQString::fromLatin1("
    ") << pretty - << TQString::fromLatin1("\n"); + stream << TQString::tqfromLatin1("
    ") << pretty + << TQString::tqfromLatin1("\n"); item = item->nextSibling(); } - stream << TQString::fromLatin1("

    \n"); + stream << TQString::tqfromLatin1("

    \n"); } else { item = firstChild(); @@ -255,7 +255,7 @@ void KfindWindow::saveResults() } file.close(); - KMessageBox::information(parentWidget(), + KMessageBox::information(tqparentWidget(), i18n("Results were saved to file\n")+ filename); } @@ -287,7 +287,7 @@ void KfindWindow::deleteFiles() { TQString tmp = i18n("Do you really want to delete the selected file?", "Do you really want to delete the %n selected files?",selectedItems().count()); - if (KMessageBox::warningContinueCancel(parentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(tqparentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Cancel) return; // Iterate on all selected elements @@ -335,7 +335,7 @@ void KfindWindow::resizeEvent(TQResizeEvent *e) { KListView::resizeEvent(e); resetColumns(false); - clipper()->repaint(); + clipper()->tqrepaint(); } TQDragObject * KfindWindow::dragObject() @@ -372,7 +372,7 @@ void KfindWindow::resetColumns(bool init) { setColumnWidth(2, QMAX(fm.width(columnText(2)), fm.width("0000000")) + 15); TQString sampleDate = - KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); + KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); setColumnWidth(3, QMAX(fm.width(columnText(3)), fm.width(sampleDate)) + 15); setColumnWidth(4, QMAX(fm.width(columnText(4)), fm.width(i18n(perm[RO]))) + 15); setColumnWidth(5, QMAX(fm.width(columnText(5)), fm.width("some text")) + 15); diff --git a/kfind/kfwin.h b/kfind/kfwin.h index a011f45df..4ff7041ff 100644 --- a/kfind/kfwin.h +++ b/kfind/kfwin.h @@ -17,7 +17,7 @@ class TQFileInfo; class KPopupMenu; class KfindWindow; -class KfFileLVI : public QListViewItem +class KfFileLVI : public TQListViewItem { public: KfFileLVI(KfindWindow* lv, const KFileItem &item,const TQString& matchingLine); diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp index 4231f1aab..4fd874c96 100644 --- a/kfind/kquery.cpp +++ b/kfind/kquery.cpp @@ -242,7 +242,7 @@ void KQuery::processQuery( KFileItem* file) return; break; default: - if (!m_mimetype.isEmpty() && !m_mimetype.contains(file->mimetype())) + if (!m_mimetype.isEmpty() && !m_mimetype.tqcontains(file->mimetype())) return; } @@ -270,7 +270,7 @@ void KQuery::processQuery( KFileItem* file) continue; metaitem=metadatas.item(*it); strmetakeycontent=metaitem.string(); - if(strmetakeycontent.find(m_metainfo)!=-1) + if(strmetakeycontent.tqfind(m_metainfo)!=-1) { foundmeta=true; break; @@ -285,7 +285,7 @@ void KQuery::processQuery( KFileItem* file) if (!m_context.isEmpty()) { - if( !m_search_binary && ignore_mimetypes.findIndex(file->mimetype()) != -1 ) { + if( !m_search_binary && ignore_mimetypes.tqfindIndex(file->mimetype()) != -1 ) { kdDebug() << "ignoring, mime type is in exclusion list: " << file->url() << endl; return; } @@ -303,8 +303,8 @@ void KQuery::processQuery( KFileItem* file) TQByteArray zippedXmlFileContent; // KWord's and OpenOffice.org's files are zipped... - if( ooo_mimetypes.findIndex(file->mimetype()) != -1 || - koffice_mimetypes.findIndex(file->mimetype()) != -1 ) + if( ooo_mimetypes.tqfindIndex(file->mimetype()) != -1 || + koffice_mimetypes.tqfindIndex(file->mimetype()) != -1 ) { KZip zipfile(file->url().path()); KZipFileEntry *zipfileEntry; @@ -313,7 +313,7 @@ void KQuery::processQuery( KFileItem* file) { const KArchiveDirectory *zipfileContent = zipfile.directory(); - if( koffice_mimetypes.findIndex(file->mimetype()) != -1 ) + if( koffice_mimetypes.tqfindIndex(file->mimetype()) != -1 ) zipfileEntry = (KZipFileEntry*)zipfileContent->entry("maindoc.xml"); else zipfileEntry = (KZipFileEntry*)zipfileContent->entry("content.xml"); //for OpenOffice.org @@ -359,7 +359,7 @@ void KQuery::processQuery( KFileItem* file) if (str.isNull()) break; if(isZippedOfficeDocument) - str.replace(xmlTags, ""); + str.tqreplace(xmlTags, ""); if (m_regexpForContent) { @@ -373,7 +373,7 @@ void KQuery::processQuery( KFileItem* file) else { if ((!str.isNull()) && (!m_context.isNull())) { - if (str.find(m_context, 0, m_casesensitive) != -1) + if (str.tqfind(m_context, 0, m_casesensitive) != -1) { matchingLine=TQString::number(matchingLineNumber)+": "+str; found = true; @@ -458,7 +458,7 @@ void KQuery::setRegExp(const TQString ®exp, bool caseSensitive) // m_regexpsContainsGlobs.clear(); for ( TQStringList::ConstIterator it = strList.begin(); it != strList.end(); ++it ) { regExp = new TQRegExp((*it),caseSensitive,true); -// m_regexpsContainsGlobs.append(regExp->pattern().contains(globChars)); +// m_regexpsContainsGlobs.append(regExp->pattern().tqcontains(globChars)); m_regexps.append(regExp); } } diff --git a/kfind/kquery.h b/kfind/kquery.h index a599cdbf1..ecd83b348 100644 --- a/kfind/kquery.h +++ b/kfind/kquery.h @@ -15,7 +15,7 @@ class KFileItem; -class KQuery : public QObject +class KQuery : public TQObject { Q_OBJECT diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp index 716c4d99e..96747696b 100644 --- a/khelpcenter/docentry.cpp +++ b/khelpcenter/docentry.cpp @@ -219,7 +219,7 @@ bool DocEntry::readFromFile( const TQString &fileName ) mIdentifier = fi.baseName( true ); } mIndexer = file.readEntry( "X-DOC-Indexer" ); - mIndexer.replace( "%f", fileName ); + mIndexer.tqreplace( "%f", fileName ); mIndexTestFile = file.readEntry( "X-DOC-IndexTestFile" ); mSearchEnabledDefault = file.readBoolEntry( "X-DOC-SearchEnabledDefault", false ); diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp index 4d6dd6fad..cfdfa9f7e 100644 --- a/khelpcenter/docmetainfo.cpp +++ b/khelpcenter/docmetainfo.cpp @@ -60,7 +60,7 @@ DocEntry *DocMetaInfo::addDocEntry( const TQString &fileName ) lang = extensions[ extensions.count() - 2 ]; } - if ( !lang.isEmpty() && mLanguages.find( lang ) == mLanguages.end() ) { + if ( !lang.isEmpty() && mLanguages.tqfind( lang ) == mLanguages.end() ) { return 0; } @@ -77,7 +77,7 @@ DocEntry *DocMetaInfo::addDocEntry( const TQString &fileName ) mHtmlSearch->setupDocEntry( entry ); } TQString indexer = entry->indexer(); - indexer.replace( "%f", fileName ); + indexer.tqreplace( "%f", fileName ); entry->setIndexer( indexer ); addDocEntry( entry ); return entry; @@ -108,7 +108,7 @@ TQString DocMetaInfo::languageName( const TQString &langcode ) if ( langcode == "en" ) return i18n("English"); TQString cfgfile = locate( "locale", - TQString::fromLatin1( "%1/entry.desktop" ).arg( langcode ) ); + TQString::tqfromLatin1( "%1/entry.desktop" ).arg( langcode ) ); kdDebug() << "-- langcode: " << langcode << " cfgfile: " << cfgfile << endl; @@ -155,8 +155,8 @@ DocEntry *DocMetaInfo::scanMetaInfoDir( const TQString &dirName, TQDir dir( dirName ); if ( !dir.exists() ) return 0; - const QFileInfoList *entryList = dir.entryInfoList(); - QFileInfoListIterator it( *entryList ); + const TQFileInfoList *entryList = dir.entryInfoList(); + TQFileInfoListIterator it( *entryList ); TQFileInfo *fi; for( ; ( fi = it.current() ); ++it ) { DocEntry *entry = 0; diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp index b9f394289..859d003c3 100644 --- a/khelpcenter/formatter.cpp +++ b/khelpcenter/formatter.cpp @@ -73,7 +73,7 @@ bool Formatter::readTemplates() switch ( state ) { case IDLE: if ( !line.isEmpty() && !line.startsWith( "#" ) ) { - int pos = line.find( "<<" ); + int pos = line.tqfind( "<<" ); if ( pos >= 0 ) { state = MULTILINE; symbol = line.left( pos ).stripWhiteSpace(); @@ -120,7 +120,7 @@ bool Formatter::readTemplates() bool success = true; TQStringList::ConstIterator it2; for( it2 = requiredSymbols.begin(); it2 != requiredSymbols.end(); ++it2 ) { - if ( !mSymbols.contains( *it2 ) ) { + if ( !mSymbols.tqcontains( *it2 ) ) { success = false; kdError() << "Symbol '" << *it2 << "' is missing from main template file." << endl; @@ -137,7 +137,7 @@ TQString Formatter::header( const TQString &title ) TQString s; if ( mHasTemplate ) { s = mSymbols[ "HEADER" ]; - s.replace( "--TITLE:--", title ); + s.tqreplace( "--TITLE:--", title ); } else { s = "" + title + "\n\n"; } diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp index dc596372e..6538a77eb 100644 --- a/khelpcenter/glossary.cpp +++ b/khelpcenter/glossary.cpp @@ -49,7 +49,7 @@ class SectionItem : public KListViewItem { KListViewItem::setOpen(open); - setPixmap( 0, SmallIcon( TQString::fromLatin1( open ? "contents" : "contents2" ) ) ); + setPixmap( 0, SmallIcon( TQString::tqfromLatin1( open ? "contents" : "contents2" ) ) ); } }; @@ -92,7 +92,7 @@ Glossary::Glossary( TQWidget *parent ) : KListView( parent ) m_cacheFile = locateLocal( "cache", "help/glossary.xml" ); - m_sourceFile = View::View::langLookup( TQString::fromLatin1( "khelpcenter/glossary/index.docbook" ) ); + m_sourceFile = View::View::langLookup( TQString::tqfromLatin1( "khelpcenter/glossary/index.docbook" ) ); m_config = kapp->config(); m_config->setGroup( "Glossary" ); @@ -150,10 +150,10 @@ void Glossary::rebuildGlossaryCache() connect( meinproc, TQT_SIGNAL( processExited( KProcess * ) ), this, TQT_SLOT( meinprocExited( KProcess * ) ) ); - *meinproc << locate( "exe", TQString::fromLatin1( "meinproc" ) ); - *meinproc << TQString::fromLatin1( "--output" ) << m_cacheFile; - *meinproc << TQString::fromLatin1( "--stylesheet" ) - << locate( "data", TQString::fromLatin1( "khelpcenter/glossary.xslt" ) ); + *meinproc << locate( "exe", TQString::tqfromLatin1( "meinproc" ) ); + *meinproc << TQString::tqfromLatin1( "--output" ) << m_cacheFile; + *meinproc << TQString::tqfromLatin1( "--stylesheet" ) + << locate( "data", TQString::tqfromLatin1( "khelpcenter/glossary.xslt" ) ); *meinproc << m_sourceFile; meinproc->start( KProcess::NotifyOnExit ); @@ -189,21 +189,21 @@ void Glossary::buildGlossaryTree() if ( !doc.setContent( &cacheFile ) ) return; - TQDomNodeList sectionNodes = doc.documentElement().elementsByTagName( TQString::fromLatin1( "section" ) ); + TQDomNodeList sectionNodes = doc.documentElement().elementsByTagName( TQString::tqfromLatin1( "section" ) ); for ( unsigned int i = 0; i < sectionNodes.count(); i++ ) { TQDomElement sectionElement = sectionNodes.item( i ).toElement(); - TQString title = sectionElement.attribute( TQString::fromLatin1( "title" ) ); + TQString title = sectionElement.attribute( TQString::tqfromLatin1( "title" ) ); SectionItem *topicSection = new SectionItem( m_byTopicItem, title ); - TQDomNodeList entryNodes = sectionElement.elementsByTagName( TQString::fromLatin1( "entry" ) ); + TQDomNodeList entryNodes = sectionElement.elementsByTagName( TQString::tqfromLatin1( "entry" ) ); for ( unsigned int j = 0; j < entryNodes.count(); j++ ) { TQDomElement entryElement = entryNodes.item( j ).toElement(); - TQString entryId = entryElement.attribute( TQString::fromLatin1( "id" ) ); + TQString entryId = entryElement.attribute( TQString::tqfromLatin1( "id" ) ); if ( entryId.isNull() ) continue; - TQDomElement termElement = childElement( entryElement, TQString::fromLatin1( "term" ) ); + TQDomElement termElement = childElement( entryElement, TQString::tqfromLatin1( "term" ) ); TQString term = termElement.text().simplifyWhiteSpace(); EntryItem *entry = new EntryItem(topicSection, term, entryId ); @@ -221,19 +221,19 @@ void Glossary::buildGlossaryTree() new EntryItem( alphabSection, term, entryId ); - TQDomElement definitionElement = childElement( entryElement, TQString::fromLatin1( "definition" ) ); + TQDomElement definitionElement = childElement( entryElement, TQString::tqfromLatin1( "definition" ) ); TQString definition = definitionElement.text().simplifyWhiteSpace(); GlossaryEntryXRef::List seeAlso; - TQDomElement referencesElement = childElement( entryElement, TQString::fromLatin1( "references" ) ); - TQDomNodeList referenceNodes = referencesElement.elementsByTagName( TQString::fromLatin1( "reference" ) ); + TQDomElement referencesElement = childElement( entryElement, TQString::tqfromLatin1( "references" ) ); + TQDomNodeList referenceNodes = referencesElement.elementsByTagName( TQString::tqfromLatin1( "reference" ) ); if ( referenceNodes.count() > 0 ) for ( unsigned int k = 0; k < referenceNodes.count(); k++ ) { TQDomElement referenceElement = referenceNodes.item( k ).toElement(); - TQString term = referenceElement.attribute( TQString::fromLatin1( "term" ) ); - TQString id = referenceElement.attribute( TQString::fromLatin1( "id" ) ); + TQString term = referenceElement.attribute( TQString::tqfromLatin1( "term" ) ); + TQString id = referenceElement.attribute( TQString::tqfromLatin1( "id" ) ); seeAlso += GlossaryEntryXRef( term, id ); } @@ -279,10 +279,10 @@ TQString Glossary::entryToHtml( const GlossaryEntry &entry ) GlossaryEntryXRef::List::ConstIterator it = seeAlsos.begin(); GlossaryEntryXRef::List::ConstIterator end = seeAlsos.end(); for (; it != end; ++it) { - seeAlso += TQString::fromLatin1("") + (*it).term(); - seeAlso += TQString::fromLatin1(", "); + seeAlso += TQString::tqfromLatin1("\">") + (*it).term(); + seeAlso += TQString::tqfromLatin1(", "); } seeAlso = seeAlso.left(seeAlso.length() - 2); } @@ -303,7 +303,7 @@ TQString Glossary::entryToHtml( const GlossaryEntry &entry ) void Glossary::slotSelectGlossEntry( const TQString &id ) { - EntryItem *newItem = m_idDict.find( id ); + EntryItem *newItem = m_idDict.tqfind( id ); if ( newItem == 0 ) return; @@ -311,7 +311,7 @@ void Glossary::slotSelectGlossEntry( const TQString &id ) if ( curItem != 0 ) { if ( curItem->id() == id ) return; - curItem->parent()->setOpen( false ); + curItem->tqparent()->setOpen( false ); } setCurrentItem( newItem ); diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp index 9a90831f7..ef9cbe7c0 100644 --- a/khelpcenter/history.cpp +++ b/khelpcenter/history.cpp @@ -53,7 +53,7 @@ History::~History() void History::setupActions( KActionCollection *coll ) { - QPair backForward = KStdGuiItem::backAndForward(); + TQPair backForward = KStdGuiItem::backAndForward(); m_backAction = new KToolBarPopupAction( backForward.first, ALT+Key_Left, this, TQT_SLOT( back() ), coll, "back" ); @@ -257,7 +257,7 @@ void History::fillForwardMenu() void History::fillGoMenu() { KMainWindow *mainWindow = static_cast( kapp->mainWidget() ); - TQPopupMenu *goMenu = dynamic_cast( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) ); + TQPopupMenu *goMenu = dynamic_cast( mainWindow->guiFactory()->container( TQString::tqfromLatin1( "go" ), mainWindow ) ); if ( !goMenu || m_goMenuIndex == -1 ) return; @@ -290,7 +290,7 @@ void History::fillGoMenu() void History::goMenuActivated( int id ) { KMainWindow *mainWindow = static_cast( kapp->mainWidget() ); - TQPopupMenu *goMenu = dynamic_cast( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) ); + TQPopupMenu *goMenu = dynamic_cast( mainWindow->guiFactory()->container( TQString::tqfromLatin1( "go" ), mainWindow ) ); if ( !goMenu ) return; @@ -324,7 +324,7 @@ void History::fillHistoryPopup( TQPopupMenu *popup, bool onlyBack, bool onlyForw { TQString text = it.current()->title; text = KStringHandler::csqueeze(text, 50); //CT: squeeze - text.replace( "&", "&&" ); + text.tqreplace( "&", "&&" ); if ( checkCurrentItem && it.current() == current ) { int id = popup->insertItem( text ); // no pixmap if checked diff --git a/khelpcenter/history.h b/khelpcenter/history.h index a5a7327a4..ba30f312b 100644 --- a/khelpcenter/history.h +++ b/khelpcenter/history.h @@ -34,7 +34,7 @@ namespace KHC { class View; -class History : public QObject +class History : public TQObject { Q_OBJECT public: diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp index c47300190..c9feaa61f 100644 --- a/khelpcenter/htmlsearch/htmlsearch.cpp +++ b/khelpcenter/htmlsearch/htmlsearch.cpp @@ -43,7 +43,7 @@ void HTMLSearch::scanDir(const TQString& dir) for (it=list.begin(); it != list.end(); ++it) { file = adir + *it; - if ( !_files.contains( file ) ) { + if ( !_files.tqcontains( file ) ) { _files.append(file); progress->setFilesScanned(++_filesScanned); } @@ -375,13 +375,13 @@ void HTMLSearch::htdigStdout(KProcess *, char *buffer, int len) TQString line = TQString(buffer).left(len); int cnt=0, index=-1; - while ( (index = line.find("file://", index+1)) > 0) + while ( (index = line.tqfind("file://", index+1)) > 0) cnt++; _filesDigged += cnt; cnt=0; index=-1; - while ( (index = line.find("not changed", index+1)) > 0) + while ( (index = line.tqfind("not changed", index+1)) > 0) cnt++; _filesDigged -= cnt; @@ -467,8 +467,8 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int delete _proc; // modify the search result - _searchResult = _searchResult.replace("http://localhost/", "file:/"); - _searchResult = _searchResult.replace("Content-type: text/html", TQString::null); + _searchResult = _searchResult.tqreplace("http://localhost/", "file:/"); + _searchResult = _searchResult.tqreplace("Content-type: text/html", TQString::null); // dump the search result TQFile f(result); diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp index 9dfc5e350..c2b1cd883 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp @@ -50,15 +50,15 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name) TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the " "ht://dig HTML search engine. " "You can get ht://dig at the"), gb); - l->setAlignment(TQLabel::WordBreak); - l->setMinimumSize(l->sizeHint()); + l->tqsetAlignment(TQLabel::WordBreak); + l->setMinimumSize(l->tqsizeHint()); grid->addMultiCellWidget(l, 1, 1, 0, 1); TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) ); KURLLabel *url = new KURLLabel(gb); url->setURL("http://www.htdig.org"); url->setText(i18n("ht://dig home page")); - url->setAlignment(TQLabel::AlignHCenter); + url->tqsetAlignment(TQLabel::AlignHCenter); grid->addMultiCellWidget(url, 2,2, 0, 1); connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), this, TQT_SLOT(urlClicked(const TQString&))); @@ -157,7 +157,7 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name) runButton = new TQPushButton(i18n("Generate Index..."), this); TQWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) ); - runButton->setFixedSize(runButton->sizeHint()); + runButton->setFixedSize(runButton->tqsizeHint()); vbox->addWidget(runButton, AlignRight); connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex())); @@ -179,19 +179,19 @@ void KHTMLSearchConfig::loadLanguages() // add all languages to the list TQStringList langs = KGlobal::dirs()->findAllResources("locale", - TQString::fromLatin1("*/entry.desktop")); + TQString::tqfromLatin1("*/entry.desktop")); langs.sort(); for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it) { KSimpleConfig entry(*it); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::fromLatin1("Name"), KGlobal::locale()->translate("without name")); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), KGlobal::locale()->translate("without name")); TQString path = *it; - int index = path.findRev('/'); + int index = path.tqfindRev('/'); path = path.left(index); - index = path.findRev('/'); + index = path.tqfindRev('/'); path = path.mid(index+1); language->insertLanguage(path, name); } diff --git a/khelpcenter/htmlsearch/klangcombo.cpp b/khelpcenter/htmlsearch/klangcombo.cpp index 308109d12..6f4b01c42 100644 --- a/khelpcenter/htmlsearch/klangcombo.cpp +++ b/khelpcenter/htmlsearch/klangcombo.cpp @@ -39,14 +39,14 @@ KLanguageCombo::KLanguageCombo (TQWidget * parent, const char *name) void KLanguageCombo::insertLanguage(const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu, int index) { - TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")"); - TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png"))); + TQString output = name + TQString::tqfromLatin1(" (") + path + TQString::tqfromLatin1(")"); + TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/flag.png"))); insertItem(TQIconSet(flag), output, path, submenu, index); } void KLanguageCombo::changeLanguage(const TQString& name, int i) { if (i < 0 || i >= count()) return; - TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")"); + TQString output = name + TQString::tqfromLatin1(" (") + tag(i) + TQString::tqfromLatin1(")"); changeItem(output, i); } diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp index 6bb74c860..3cb642b5f 100644 --- a/khelpcenter/htmlsearch/ktagcombobox.cpp +++ b/khelpcenter/htmlsearch/ktagcombobox.cpp @@ -83,7 +83,7 @@ void KTagComboBox::internalActivate( int index ) if (current == index) return; current = index; emit activated( index ); - repaint(); + tqrepaint(); } void KTagComboBox::internalHighlight( int index ) @@ -133,7 +133,7 @@ static inline void checkInsertPos(TQPopupMenu *popup, const TQString & str, int static inline TQPopupMenu *checkInsertIndex(TQPopupMenu *popup, const TQStringList *tags, const TQString &submenu) { - int pos = tags->findIndex(submenu); + int pos = tags->tqfindIndex(submenu); TQPopupMenu *pi = 0; if (pos != -1) @@ -192,7 +192,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev) TQRect clip(2, 2, width() - 4, height() - 4); #if 0 if ( hasFocus() && style().guiStyle() != MotifStyle ) - p.setPen( colorGroup().highlightedText() ); + p.setPen( tqcolorGroup().highlightedText() ); #endif p.drawText(clip, AlignCenter | SingleLine, popup->text( current )); @@ -206,7 +206,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev) bool KTagComboBox::containsTag( const TQString &str ) const { - return tags->contains(str) > 0; + return tags-.tqcontains(str) > 0; } TQString KTagComboBox::currentTag() const @@ -233,12 +233,12 @@ void KTagComboBox::setCurrentItem(int i) { if (i < 0 || i >= count()) return; current = i; - repaint(); + tqrepaint(); } void KTagComboBox::setCurrentItem(const TQString &code) { - int i = tags->findIndex(code); + int i = tags->tqfindIndex(code); if (code.isNull()) i = 0; if (i != -1) diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp index ea6dff669..8581b25c8 100644 --- a/khelpcenter/htmlsearchconfig.cpp +++ b/khelpcenter/htmlsearchconfig.cpp @@ -51,15 +51,15 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name) TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the " "ht://dig HTML search engine. " "You can get ht://dig at the"), gb); - l->setAlignment(TQLabel::WordBreak); - l->setMinimumSize(l->sizeHint()); + l->tqsetAlignment(TQLabel::WordBreak); + l->setMinimumSize(l->tqsizeHint()); grid->addMultiCellWidget(l, 1, 1, 0, 1); TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) ); KURLLabel *url = new KURLLabel(gb); url->setURL("http://www.htdig.org"); url->setText(i18n("ht://dig home page")); - url->setAlignment(TQLabel::AlignHCenter); + url->tqsetAlignment(TQLabel::AlignHCenter); grid->addMultiCellWidget(url, 2,2, 0, 1); connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), this, TQT_SLOT(urlClicked(const TQString&))); diff --git a/khelpcenter/htmlsearchconfig.h b/khelpcenter/htmlsearchconfig.h index ef74cce5d..f1e093f13 100644 --- a/khelpcenter/htmlsearchconfig.h +++ b/khelpcenter/htmlsearchconfig.h @@ -1,7 +1,7 @@ /** * This file is part of KHelpCenter * - * Copyright (c) 2000 Matthias Hölzer-Klüpfel + * Copyright (c) 2000 Matthias H�lzer-Kl�pfel * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ class KConfig; namespace KHC { -class HtmlSearchConfig : public QWidget +class HtmlSearchConfig : public TQWidget { Q_OBJECT public: diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp index a23cce174..6097a0b33 100644 --- a/khelpcenter/infotree.cpp +++ b/khelpcenter/infotree.cpp @@ -146,10 +146,10 @@ void InfoTree::parseInfoDirFile( const TQString &infoDirFileName ) while ( !stream.eof() && !s.stripWhiteSpace().isEmpty() ) { s = stream.readLine(); if ( s[ 0 ] == '*' ) { - const int colon = s.find( ":" ); - const int openBrace = s.find( "(", colon ); - const int closeBrace = s.find( ")", openBrace ); - const int dot = s.find( ".", closeBrace ); + const int colon = s.tqfind( ":" ); + const int openBrace = s.tqfind( "(", colon ); + const int closeBrace = s.tqfind( ")", openBrace ); + const int dot = s.tqfind( ".", closeBrace ); TQString appName = s.mid( 2, colon - 2 ); TQString url = "info:/" + s.mid( openBrace + 1, closeBrace - openBrace - 1 ); diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp index aadce700a..c88e7218a 100644 --- a/khelpcenter/kcmhelpcenter.cpp +++ b/khelpcenter/kcmhelpcenter.cpp @@ -101,7 +101,7 @@ IndexProgressDialog::IndexProgressDialog( TQWidget *parent ) topLayout->setSpacing( spacingHint() ); mLabel = new TQLabel( this ); - mLabel->setAlignment( AlignHCenter ); + mLabel->tqsetAlignment( AlignHCenter ); topLayout->addWidget( mLabel ); mProgressBar = new TQProgressBar( this ); @@ -417,9 +417,9 @@ bool KCMHelpCenter::buildIndex() .arg( entry->documentType() ) ); hasError = true; } else { - indexer.replace( TQRegExp( "%i" ), entry->identifier() ); - indexer.replace( TQRegExp( "%d" ), Prefs::indexDirectory() ); - indexer.replace( TQRegExp( "%p" ), entry->url() ); + indexer.tqreplace( TQRegExp( "%i" ), entry->identifier() ); + indexer.tqreplace( TQRegExp( "%d" ), Prefs::indexDirectory() ); + indexer.tqreplace( TQRegExp( "%p" ), entry->url() ); kdDebug() << "INDEXER: " << indexer << endl; *ts << indexer << endl; @@ -611,7 +611,7 @@ void KCMHelpCenter::advanceProgress() void KCMHelpCenter::slotReceivedStdout( KProcess *, char *buffer, int buflen ) { TQString text = TQString::fromLocal8Bit( buffer, buflen ); - int pos = text.findRev( '\n' ); + int pos = text.tqfindRev( '\n' ); if ( pos < 0 ) { mStdOut.append( text ); } else { @@ -625,7 +625,7 @@ void KCMHelpCenter::slotReceivedStdout( KProcess *, char *buffer, int buflen ) void KCMHelpCenter::slotReceivedStderr( KProcess *, char *buffer, int buflen ) { TQString text = TQString::fromLocal8Bit( buffer, buflen ); - int pos = text.findRev( '\n' ); + int pos = text.tqfindRev( '\n' ); if ( pos < 0 ) { mStdErr.append( text ); } else { diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp index 633bf0085..e70065bfc 100644 --- a/khelpcenter/mainwindow.cpp +++ b/khelpcenter/mainwindow.cpp @@ -90,7 +90,7 @@ MainWindow::MainWindow() { mSplitter = new TQSplitter( this ); - mDoc = new View( mSplitter, 0, this, 0, KHTMLPart::DefaultGUI, actionCollection() ); + mDoc = new View( mSplitter, 0, TQT_TQOBJECT(this), 0, KHTMLPart::DefaultGUI, actionCollection() ); connect( mDoc, TQT_SIGNAL( setWindowCaption( const TQString & ) ), TQT_SLOT( setCaption( const TQString & ) ) ); connect( mDoc, TQT_SIGNAL( setStatusBarText( const TQString & ) ), @@ -208,8 +208,8 @@ void MainWindow::writeConfig() void MainWindow::setupActions() { - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); - KStdAction::print( this, TQT_SLOT( print() ), actionCollection(), + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection(), "printFrame" ); KAction *prevPage = new KAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQT_SLOT( prevPage() ), @@ -220,19 +220,19 @@ void MainWindow::setupActions() actionCollection(), "nextPage" ); nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) ); - KAction *home = KStdAction::home( this, TQT_SLOT( slotShowHome() ), actionCollection() ); + KAction *home = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( slotShowHome() ), actionCollection() ); home->setText(i18n("Table of &Contents")); home->setToolTip(i18n("Table of contents")); home->setWhatsThis(i18n("Go back to the table of contents")); - mCopyText = KStdAction::copy( this, TQT_SLOT(slotCopySelectedText()), actionCollection(), "copy_text"); + mCopyText = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelectedText()), actionCollection(), "copy_text"); - mLastSearchAction = new KAction( i18n("&Last Search Result"), 0, this, + mLastSearchAction = new KAction( i18n("&Last Search Result"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLastSearch() ), actionCollection(), "lastsearch" ); mLastSearchAction->setEnabled( false ); - new KAction( i18n("Build Search Index..."), 0, mNavigator, + new KAction( i18n("Build Search Index..."), 0, TQT_TQOBJECT(mNavigator), TQT_SLOT( showIndexDialog() ), actionCollection(), "build_index" ); KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); @@ -240,16 +240,16 @@ void MainWindow::setupActions() KConfig *cfg = KGlobal::config(); cfg->setGroup( "Debug" ); if ( cfg->readBoolEntry( "SearchErrorLog", false ) ) { - new KAction( i18n("Show Search Error Log"), 0, this, + new KAction( i18n("Show Search Error Log"), 0, TQT_TQOBJECT(this), TQT_SLOT( showSearchStderr() ), actionCollection(), "show_search_stderr" ); } History::self().setupActions( actionCollection() ); - new KAction( i18n( "Configure Fonts..." ), KShortcut(), this, TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" ); - new KAction( i18n( "Increase Font Sizes" ), "viewmag+", KShortcut(), this, TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" ); - new KAction( i18n( "Decrease Font Sizes" ), "viewmag-", KShortcut(), this, TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" ); + new KAction( i18n( "Configure Fonts..." ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" ); + new KAction( i18n( "Increase Font Sizes" ), "viewmag+", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" ); + new KAction( i18n( "Decrease Font Sizes" ), "viewmag-", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" ); } void MainWindow::slotCopySelectedText() @@ -325,7 +325,7 @@ void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args ) mDoc->browserExtension()->setURLArgs( args ); - if ( proto == TQString::fromLatin1("glossentry") ) { + if ( proto == TQString::tqfromLatin1("glossentry") ) { TQString decodedEntryId = KURL::decode_string( url.encodedPathAndQuery() ); slotGlossSelected( mNavigator->glossEntry( decodedEntryId ) ); mNavigator->slotSelectGlossEntry( decodedEntryId ); diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index ad308cfc6..35ebf0218 100644 --- a/khelpcenter/navigator.cpp +++ b/khelpcenter/navigator.cpp @@ -262,8 +262,8 @@ void Navigator::insertIOSlaveDocs( const TQString &name, NavigatorItem *topItem void Navigator::insertAppletDocs( NavigatorItem *topItem ) { - TQDir appletDir( locate( "data", TQString::fromLatin1( "kicker/applets/" ) ) ); - appletDir.setNameFilter( TQString::fromLatin1( "*.desktop" ) ); + TQDir appletDir( locate( "data", TQString::tqfromLatin1( "kicker/applets/" ) ) ); + appletDir.setNameFilter( TQString::tqfromLatin1( "*.desktop" ) ); TQStringList files = appletDir.entryList( TQDir::Files | TQDir::Readable ); TQStringList::ConstIterator it = files.begin(); @@ -290,14 +290,14 @@ void Navigator::createItemFromDesktopFile( NavigatorItem *topItem, void Navigator::insertInfoDocs( NavigatorItem *topItem ) { - InfoTree *infoTree = new InfoTree( this ); + InfoTree *infoTree = new InfoTree( TQT_TQOBJECT(this) ); infoTree->build( topItem ); } NavigatorItem *Navigator::insertScrollKeeperDocs( NavigatorItem *topItem, NavigatorItem *after ) { - ScrollKeeperTreeBuilder *builder = new ScrollKeeperTreeBuilder( this ); + ScrollKeeperTreeBuilder *builder = new ScrollKeeperTreeBuilder( TQT_TQOBJECT(this) ); return builder->build( topItem, after ); } @@ -337,7 +337,7 @@ void Navigator::selectItem( const KURL &url ) item = item->nextSibling() ) { NavigatorAppItem *appItem = dynamic_cast( item ); if ( appItem ) appItem->populate( true /* recursive */ ); - for ( QListViewItem *subitem = item->firstChild(); subitem; + for ( TQListViewItem *subitem = item->firstChild(); subitem; subitem = subitem->nextSibling() ) { appItem = dynamic_cast( subitem ); if ( appItem ) appItem->populate( true /* recursive */ ); @@ -407,9 +407,9 @@ void Navigator::slotItemSelected( TQListViewItem *currentItem ) // Enforce the original .docbook version, in case langLookup returns a // cached version if ( !doc.isNull() ) { - int pos = doc.find( ".html" ); + int pos = doc.tqfind( ".html" ); if ( pos >= 0 ) { - doc.replace( pos, 5, ".docbook" ); + doc.tqreplace( pos, 5, ".docbook" ); } kdDebug( 1400 ) << "slotItemSelected(): doc = " << doc << endl; @@ -552,7 +552,7 @@ void Navigator::slotSearch() // disable search Button during searches mSearchButton->setEnabled(false); - TQApplication::setOverrideCursor(waitCursor); + TQApplication::setOverrideCursor(tqwaitCursor); if ( !mSearchEngine->search( words, method, pages, scope ) ) { slotSearchFinished(); @@ -563,7 +563,7 @@ void Navigator::slotSearch() void Navigator::slotShowSearchResult( const TQString &url ) { TQString u = url; - u.replace( "%k", mSearchEdit->text() ); + u.tqreplace( "%k", mSearchEdit->text() ); emit itemSelected( u ); } diff --git a/khelpcenter/navigator.h b/khelpcenter/navigator.h index c49d5c585..c432d3a6a 100644 --- a/khelpcenter/navigator.h +++ b/khelpcenter/navigator.h @@ -52,7 +52,7 @@ class SearchEngine; class SearchWidget; class Formatter; -class Navigator : public QWidget +class Navigator : public TQWidget { Q_OBJECT public: diff --git a/khelpcenter/navigatoritem.h b/khelpcenter/navigatoritem.h index 50d2465c4..11b2f975d 100644 --- a/khelpcenter/navigatoritem.h +++ b/khelpcenter/navigatoritem.h @@ -27,7 +27,7 @@ namespace KHC { class TOC; class DocEntry; -class NavigatorItem : public QListViewItem +class NavigatorItem : public TQListViewItem { public: NavigatorItem( DocEntry *entry, TQListView *parent ); diff --git a/khelpcenter/scopeitem.h b/khelpcenter/scopeitem.h index 9b828a54f..cabbab76e 100644 --- a/khelpcenter/scopeitem.h +++ b/khelpcenter/scopeitem.h @@ -7,7 +7,7 @@ namespace KHC { -class ScopeItem : public QCheckListItem +class ScopeItem : public TQCheckListItem { public: ScopeItem( TQListView *parent, DocEntry *entry ) diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp index 20a4b0851..4ee28d21d 100644 --- a/khelpcenter/scrollkeepertreebuilder.cpp +++ b/khelpcenter/scrollkeepertreebuilder.cpp @@ -180,7 +180,7 @@ void ScrollKeeperTreeBuilder::insertDoc( NavigatorItem *parent, if ( url.left( 5 ) == "file:" ) url = url.mid( 5 ); url.prepend( "ghelp:" ); #if 0 - url.replace( TQRegExp( ".xml$" ), ".html" ); + url.tqreplace( TQRegExp( ".xml$" ), ".html" ); #endif } else if ( mimeType == "text/sgml" ) { // GNOME docs use this type. We don't have a real viewer for this. diff --git a/khelpcenter/scrollkeepertreebuilder.h b/khelpcenter/scrollkeepertreebuilder.h index 5ed69caf7..a2e3356a2 100644 --- a/khelpcenter/scrollkeepertreebuilder.h +++ b/khelpcenter/scrollkeepertreebuilder.h @@ -31,7 +31,7 @@ class TQDomNode; namespace KHC { -class ScrollKeeperTreeBuilder : public QObject +class ScrollKeeperTreeBuilder : public TQObject { Q_OBJECT public: diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp index b779afc8e..58217c031 100644 --- a/khelpcenter/searchengine.cpp +++ b/khelpcenter/searchengine.cpp @@ -93,7 +93,7 @@ void SearchTraverser::startProcess( DocEntry *entry ) void SearchTraverser::connectHandler( SearchHandler *handler ) { TQMap::Iterator it; - it = mConnectCount.find( handler ); + it = mConnectCount.tqfind( handler ); int count = 0; if ( it != mConnectCount.end() ) count = *it; if ( count == 0 ) { @@ -108,7 +108,7 @@ void SearchTraverser::connectHandler( SearchHandler *handler ) void SearchTraverser::disconnectHandler( SearchHandler *handler ) { TQMap::Iterator it; - it = mConnectCount.find( handler ); + it = mConnectCount.tqfind( handler ); if ( it == mConnectCount.end() ) { kdError() << "SearchTraverser::disconnectHandler() handler not connected." << endl; @@ -326,15 +326,15 @@ bool SearchEngine::search( TQString words, TQString method, int matches, lang = "en"; // if the string contains '&' replace with a '+' and set search method to and - if (mWords.find("&") != -1) { - mWords.replace("&", " "); + if (mWords.tqfind("&") != -1) { + mWords.tqreplace("&", " "); method = "and"; } // replace whitespace with a '+' mWords = mWords.stripWhiteSpace(); mWords = mWords.simplifyWhiteSpace(); - mWords.replace(TQRegExp("\\s"), "+"); + mWords.tqreplace(TQRegExp("\\s"), "+"); commonSearchProgram = substituteSearchQuery( commonSearchProgram ); @@ -379,8 +379,8 @@ bool SearchEngine::search( TQString words, TQString method, int matches, delete mProc; // modify the search result - mSearchResult = mSearchResult.replace("http://localhost/", "file:/"); - mSearchResult = mSearchResult.mid( mSearchResult.find( '<' ) ); + mSearchResult = mSearchResult.tqreplace("http://localhost/", "file:/"); + mSearchResult = mSearchResult.mid( mSearchResult.tqfind( '<' ) ); mView->beginSearchResult(); mView->writeSearchResult( mSearchResult ); @@ -395,11 +395,11 @@ bool SearchEngine::search( TQString words, TQString method, int matches, TQString SearchEngine::substituteSearchQuery( const TQString &query ) { TQString result = query; - result.replace( "%k", mWords ); - result.replace( "%n", TQString::number( mMatches ) ); - result.replace( "%m", mMethod ); - result.replace( "%l", mLang ); - result.replace( "%s", mScope ); + result.tqreplace( "%k", mWords ); + result.tqreplace( "%n", TQString::number( mMatches ) ); + result.tqreplace( "%m", mMethod ); + result.tqreplace( "%l", mLang ); + result.tqreplace( "%s", mScope ); return result; } @@ -409,15 +409,15 @@ TQString SearchEngine::substituteSearchQuery( const TQString &query, Operation operation, const TQString &lang ) { TQString result = query; - result.replace( "%i", identifier ); - result.replace( "%w", words.join( "+" ) ); - result.replace( "%m", TQString::number( maxResults ) ); + result.tqreplace( "%i", identifier ); + result.tqreplace( "%w", words.join( "+" ) ); + result.tqreplace( "%m", TQString::number( maxResults ) ); TQString o; if ( operation == Or ) o = "or"; else o = "and"; - result.replace( "%o", o ); - result.replace( "%d", Prefs::indexDirectory() ); - result.replace( "%l", lang ); + result.tqreplace( "%o", o ); + result.tqreplace( "%d", Prefs::indexDirectory() ); + result.tqreplace( "%l", lang ); return result; } @@ -458,7 +458,7 @@ bool SearchEngine::isRunning() const SearchHandler *SearchEngine::handler( const TQString &documentType ) const { TQMap::ConstIterator it; - it = mHandlers.find( documentType ); + it = mHandlers.tqfind( documentType ); if ( it == mHandlers.end() ) return 0; else return *it; diff --git a/khelpcenter/searchengine.h b/khelpcenter/searchengine.h index bdd1860ed..84f252746 100644 --- a/khelpcenter/searchengine.h +++ b/khelpcenter/searchengine.h @@ -64,7 +64,7 @@ class SearchTraverser : public TQObject, public DocEntryTraverser }; -class SearchEngine : public QObject +class SearchEngine : public TQObject { Q_OBJECT public: diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp index 9c34d7399..48f61e9e2 100644 --- a/khelpcenter/searchhandler.cpp +++ b/khelpcenter/searchhandler.cpp @@ -62,9 +62,9 @@ TQStringList SearchHandler::documentTypes() const TQString SearchHandler::indexCommand( const TQString &identifier ) { TQString cmd = mIndexCommand; - cmd.replace( "%i", identifier ); - cmd.replace( "%d", Prefs::indexDirectory() ); - cmd.replace( "%l", mLang ); + cmd.tqreplace( "%i", identifier ); + cmd.tqreplace( "%d", Prefs::indexDirectory() ); + cmd.tqreplace( "%l", mLang ); return cmd; } @@ -83,7 +83,7 @@ bool SearchHandler::checkBinary( const TQString &cmd ) const { TQString binary; - int pos = cmd.find( ' ' ); + int pos = cmd.tqfind( ' ' ); if ( pos < 0 ) binary = cmd; else binary = cmd.left( pos ); @@ -166,7 +166,7 @@ void SearchHandler::searchStdout( KProcess *proc, char *buffer, int len ) p = strncpy( p, buffer, len ); p[len] = '\0'; - TQMap::ConstIterator it = mProcessJobs.find( proc ); + TQMap::ConstIterator it = mProcessJobs.tqfind( proc ); if ( it != mProcessJobs.end() ) { (*it)->mResult += bufferStr.fromUtf8( p ); } @@ -179,7 +179,7 @@ void SearchHandler::searchStderr( KProcess *proc, char *buffer, int len ) if ( !buffer || len == 0 ) return; - TQMap::ConstIterator it = mProcessJobs.find( proc ); + TQMap::ConstIterator it = mProcessJobs.tqfind( proc ); if ( it != mProcessJobs.end() ) { (*it)->mError += TQString::fromUtf8( buffer, len ); } @@ -193,7 +193,7 @@ void SearchHandler::searchExited( KProcess *proc ) TQString error; DocEntry *entry = 0; - TQMap::ConstIterator it = mProcessJobs.find( proc ); + TQMap::ConstIterator it = mProcessJobs.tqfind( proc ); if ( it != mProcessJobs.end() ) { SearchJob *j = *it; entry = j->mEntry; @@ -218,7 +218,7 @@ void SearchHandler::slotJobResult( KIO::Job *job ) TQString result; DocEntry *entry = 0; - TQMap::ConstIterator it = mKioJobs.find( job ); + TQMap::ConstIterator it = mKioJobs.tqfind( job ); if ( it != mKioJobs.end() ) { SearchJob *j = *it; @@ -240,7 +240,7 @@ void SearchHandler::slotJobData( KIO::Job *job, const TQByteArray &data ) { // kdDebug() << "SearchHandler::slotJobData()" << endl; - TQMap::ConstIterator it = mKioJobs.find( job ); + TQMap::ConstIterator it = mKioJobs.tqfind( job ); if ( it != mKioJobs.end() ) { (*it)->mResult += data.data(); } diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp index 7bda95b8c..02e59936a 100644 --- a/khelpcenter/toc.cpp +++ b/khelpcenter/toc.cpp @@ -88,7 +88,7 @@ void TOC::build( const TQString &file ) } } - TQString cacheFile = fileName.replace( TQDir::separator(), "__" ); + TQString cacheFile = fileName.tqreplace( TQDir::separator(), "__" ); m_cacheFile = locateLocal( "cache", "help/" + cacheFile ); m_sourceFile = file; @@ -188,9 +188,9 @@ void TOC::fillTree() TQDomNodeList chapters = doc.documentElement().elementsByTagName( "chapter" ); for ( unsigned int chapterCount = 0; chapterCount < chapters.count(); chapterCount++ ) { TQDomElement chapElem = chapters.item( chapterCount ).toElement(); - TQDomElement chapTitleElem = childElement( chapElem, TQString::fromLatin1( "title" ) ); + TQDomElement chapTitleElem = childElement( chapElem, TQString::tqfromLatin1( "title" ) ); TQString chapTitle = chapTitleElem.text().simplifyWhiteSpace(); - TQDomElement chapRefElem = childElement( chapElem, TQString::fromLatin1( "anchor" ) ); + TQDomElement chapRefElem = childElement( chapElem, TQString::tqfromLatin1( "anchor" ) ); TQString chapRef = chapRefElem.text().stripWhiteSpace(); chapItem = new TOCChapterItem( this, m_parentItem, chapItem, chapTitle, chapRef ); @@ -199,9 +199,9 @@ void TOC::fillTree() TQDomNodeList sections = chapElem.elementsByTagName( "section" ); for ( unsigned int sectCount = 0; sectCount < sections.count(); sectCount++ ) { TQDomElement sectElem = sections.item( sectCount ).toElement(); - TQDomElement sectTitleElem = childElement( sectElem, TQString::fromLatin1( "title" ) ); + TQDomElement sectTitleElem = childElement( sectElem, TQString::tqfromLatin1( "title" ) ); TQString sectTitle = sectTitleElem.text().simplifyWhiteSpace(); - TQDomElement sectRefElem = childElement( sectElem, TQString::fromLatin1( "anchor" ) ); + TQDomElement sectRefElem = childElement( sectElem, TQString::tqfromLatin1( "anchor" ) ); TQString sectRef = sectRefElem.text().stripWhiteSpace(); sectItem = new TOCSectionItem( this, chapItem, sectItem, sectTitle, sectRef ); @@ -261,8 +261,8 @@ TOCSectionItem::TOCSectionItem( TOC *toc, TOCChapterItem *parent, TQListViewItem TQString TOCSectionItem::url() { - if ( static_cast( parent()->firstChild() ) == this ) - return static_cast( parent() )->url() + "#" + m_name; + if ( static_cast( tqparent()->firstChild() ) == this ) + return static_cast( tqparent() )->url() + "#" + m_name; return "help:" + toc()->application() + "/" + m_name + ".html"; } diff --git a/khelpcenter/treebuilder.h b/khelpcenter/treebuilder.h index 99516d1ec..d926d2f84 100644 --- a/khelpcenter/treebuilder.h +++ b/khelpcenter/treebuilder.h @@ -28,7 +28,7 @@ namespace KHC { class NavigatorItem; -class TreeBuilder : public QObject +class TreeBuilder : public TQObject { Q_OBJECT public: diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp index 64e6238ed..a28b5097f 100644 --- a/khelpcenter/view.cpp +++ b/khelpcenter/view.cpp @@ -20,9 +20,9 @@ using namespace KHC; -View::View( TQWidget *parentWidget, const char *widgetName, +View::View( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, KHTMLPart::GUIProfile prof, KActionCollection *col ) - : KHTMLPart( parentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col) + : KHTMLPart( tqparentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col) { setJScriptEnabled(false); setJavaEnabled(false); @@ -174,7 +174,7 @@ TQString View::langLookup( const TQString &fname ) // css etc) then look in other languages first. if ( ( *it ).endsWith( "docbook" ) ) { - TQString file = (*it).left((*it).findRev('/')) + "/index.docbook"; + TQString file = (*it).left((*it).tqfindRev('/')) + "/index.docbook"; info.setFile(file); if (info.exists() && info.isFile() && info.isReadable()) { @@ -328,8 +328,8 @@ bool View::eventFilter( TQObject *o, TQEvent *e ) htmlDocument().links().length() == 0 ) return KHTMLPart::eventFilter( o, e ); - TQKeyEvent *ke = static_cast( e ); - if ( ke->state() & Qt::ShiftButton && ke->key() == Key_Space ) { + TQKeyEvent *ke = TQT_TQKEYEVENT( e ); + if ( ke->state() & TQt::ShiftButton && ke->key() == Key_Space ) { // If we're on the first page, it does not make sense to go back. if ( baseURL().path().endsWith( "/index.html" ) ) return KHTMLPart::eventFilter( o, e ); @@ -361,7 +361,7 @@ KURL View::urlFromLinkNode( const DOM::Node &n ) const return href; TQString path = baseURL().path(); - path.truncate( path.findRev( '/' ) + 1 ); + path.truncate( path.tqfindRev( '/' ) + 1 ); path += href.url(); KURL url = baseURL(); diff --git a/khelpcenter/view.h b/khelpcenter/view.h index 3af2a15b8..1c5a2bf66 100644 --- a/khelpcenter/view.h +++ b/khelpcenter/view.h @@ -20,7 +20,7 @@ class View : public KHTMLPart { Q_OBJECT public: - View( TQWidget *parentWidget, const char *widgetName, + View( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, KHTMLPart::GUIProfile prof, KActionCollection *col ); diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp index 3391ca1aa..d56ff1eb2 100644 --- a/khotkeys/app/app.cpp +++ b/khotkeys/app/app.cpp @@ -112,7 +112,7 @@ int KDE_EXPORT kdemain( int argc, char** argv ) XCloseDisplay(dpy); dpy = 0; - if ((pos = displayname.findRev('.')) != -1) + if ((pos = displayname.tqfindRev('.')) != -1) displayname.remove(pos, 10); TQCString env; diff --git a/khotkeys/arts/soundrecorder_arts.cpp b/khotkeys/arts/soundrecorder_arts.cpp index e600e1730..0faf71002 100644 --- a/khotkeys/arts/soundrecorder_arts.cpp +++ b/khotkeys/arts/soundrecorder_arts.cpp @@ -95,7 +95,7 @@ Sound SoundRecorderArts::sound() Sound s; uint BytePS=BITS/8; uint length=m_data.size()/BytePS; - TQMemArray da(length); + TQMemArray da(length); s.max=0; s._fs=FS; for(uint f=0;fsetSelected( create_listview_item( selected_item->action(), - selected_item->parent() ? NULL : actions_listview, selected_item->parent(), + selected_item->tqparent() ? NULL : actions_listview, selected_item->tqparent(), selected_item, true ), true ); } @@ -222,7 +222,7 @@ void Action_list_widget::edit_listview_item( Action_list_item* item_P ) { item_P->set_action( new_action ); item_P->widthChanged( 0 ); - actions_listview->repaintItem( item_P ); + actions_listview->tqrepaintItem( item_P ); } delete dlg; } diff --git a/khotkeys/kcontrol/action_list_widget.h b/khotkeys/kcontrol/action_list_widget.h index b49a1315a..c2f32477e 100644 --- a/khotkeys/kcontrol/action_list_widget.h +++ b/khotkeys/kcontrol/action_list_widget.h @@ -61,7 +61,7 @@ class Action_list_widget typedef Action_list_widget Action_list_tab; class Action_list_item - : public QListViewItem + : public TQListViewItem { public: Action_list_item( TQListView* parent_P, Action* action_P ); diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp index 5048289df..f9f390fe2 100644 --- a/khotkeys/kcontrol/actions_listview_widget.cpp +++ b/khotkeys/kcontrol/actions_listview_widget.cpp @@ -49,7 +49,7 @@ Actions_listview_widget::Actions_listview_widget( TQWidget* parent_P, const char void Actions_listview_widget::action_name_changed( const TQString& ) { current_action()->widthChanged( 0 ); - actions_listview->repaintItem( current_action()); + actions_listview->tqrepaintItem( current_action()); } void Actions_listview_widget::set_action_data( Action_data_base* data_P, bool recent_action_P ) @@ -92,7 +92,7 @@ void Actions_listview_widget::new_action( Action_data_base* data_P ) if( dynamic_cast< Action_data_group* >( current_action()->data()) != NULL ) parent = current_action(); else - parent = current_action()->parent(); + parent = current_action()->tqparent(); } if( parent ) parent->setOpen( true ); @@ -124,7 +124,7 @@ void Actions_listview_widget::delete_action() void Actions_listview_widget::item_moved( TQListViewItem* item_P, TQListViewItem*, TQListViewItem* ) { Action_listview_item* item = static_cast< Action_listview_item* >( item_P ); - Action_listview_item* parent = static_cast< Action_listview_item* >( item->parent()); + Action_listview_item* parent = static_cast< Action_listview_item* >( item->tqparent()); if( parent == NULL ) item->data()->reparent( module->actions_root()); else if( Action_data_group* group = dynamic_cast< Action_data_group* >( parent->data())) diff --git a/khotkeys/kcontrol/actions_listview_widget.h b/khotkeys/kcontrol/actions_listview_widget.h index a5a810aa1..0f3a632f4 100644 --- a/khotkeys/kcontrol/actions_listview_widget.h +++ b/khotkeys/kcontrol/actions_listview_widget.h @@ -66,7 +66,7 @@ class Actions_listview // CHECKME a jak to bude s parent itemu, kdyz Action_data uz maji vlastni parent ? class Action_listview_item - : public QListViewItem + : public TQListViewItem { public: virtual TQString text( int column_P ) const; diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp index 86ff8f47c..3076883ca 100644 --- a/khotkeys/kcontrol/condition_list_widget.cpp +++ b/khotkeys/kcontrol/condition_list_widget.cpp @@ -165,9 +165,9 @@ void Condition_list_widget::new_selected( int type_P ) parent = NULL; } } - if( parent == NULL && selected_item != NULL && selected_item->parent() != NULL ) + if( parent == NULL && selected_item != NULL && selected_item->tqparent() != NULL ) { - parent = static_cast< Condition_list_item* >( selected_item->parent()); + parent = static_cast< Condition_list_item* >( selected_item->tqparent()); after = selected_item; } Condition_list_base* parent_cond = parent @@ -217,8 +217,8 @@ void Condition_list_widget::copy_pressed() return; conditions_listview->setSelected( create_listview_item( selected_item->condition()->copy( selected_item->condition()->parent()), - selected_item->parent() ? NULL : conditions_listview, - static_cast< Condition_list_item* >( selected_item->parent()), + selected_item->tqparent() ? NULL : conditions_listview, + static_cast< Condition_list_item* >( selected_item->tqparent()), selected_item, true ), true ); } @@ -321,14 +321,14 @@ void Condition_list_widget::edit_listview_item( Condition_list_item* item_P ) { Condition* old_cond = item_P->condition(); item_P->set_condition( new_condition ); - int pos = conditions.find( old_cond ); + int pos = conditions.tqfind( old_cond ); if( pos >= 0 ) { conditions.remove( pos ); // we own it conditions.insert( pos, new_condition ); } item_P->widthChanged( 0 ); - conditions_listview->repaintItem( item_P ); + conditions_listview->tqrepaintItem( item_P ); } #ifdef KHOTKEYS_DEBUG kdDebug( 1217 ) << "Condition_list_widget::edit_listview_item():" << endl; diff --git a/khotkeys/kcontrol/condition_list_widget.h b/khotkeys/kcontrol/condition_list_widget.h index 9dd441ae3..0c99fd46c 100644 --- a/khotkeys/kcontrol/condition_list_widget.h +++ b/khotkeys/kcontrol/condition_list_widget.h @@ -60,7 +60,7 @@ class Condition_list_widget typedef Condition_list_widget Condition_list_tab; class Condition_list_item - : public QListViewItem + : public TQListViewItem { public: Condition_list_item( TQListView* parent_P, Condition* condition_P ); diff --git a/khotkeys/kcontrol/gesturedrawer.cpp b/khotkeys/kcontrol/gesturedrawer.cpp index 817eeab89..d0d144382 100644 --- a/khotkeys/kcontrol/gesturedrawer.cpp +++ b/khotkeys/kcontrol/gesturedrawer.cpp @@ -20,7 +20,7 @@ namespace KHotKeys GestureDrawer::GestureDrawer(TQWidget *parent, const char *name) : TQFrame(parent, name), _data(TQString::null) { - setBackgroundColor( colorGroup().base()); + setBackgroundColor( tqcolorGroup().base()); setFrameStyle(TQFrame::Panel | TQFrame::Sunken); setMinimumSize(30, 30); } @@ -33,14 +33,14 @@ void GestureDrawer::setData(const TQString &data) { _data = data; - repaint(); + tqrepaint(); } void GestureDrawer::paintEvent(TQPaintEvent *ev) { // Iterate through the data points and draw a line to each of them - Q_UINT32 startCell = 0; - Q_UINT32 endCell = 0; + TQ_UINT32 startCell = 0; + TQ_UINT32 endCell = 0; TQPoint startPoint; TQPoint endPoint; @@ -51,7 +51,7 @@ void GestureDrawer::paintEvent(TQPaintEvent *ev) startCell = TQString(_data[0]).toUInt(); } - for (Q_UINT32 index = 1; index < _data.length(); ++index) + for (TQ_UINT32 index = 1; index < _data.length(); ++index) { endCell = TQString(_data[index]).toUInt(); @@ -77,14 +77,14 @@ void GestureDrawer::paintEvent(TQPaintEvent *ev) TQFrame::paintEvent(ev); } -TQPoint GestureDrawer::lookupCellCoords(Q_UINT32 cell) +TQPoint GestureDrawer::lookupCellCoords(TQ_UINT32 cell) { // First divide the widget into thirds, horizontally and vertically - Q_UINT32 w = width(); - Q_UINT32 h = height(); + TQ_UINT32 w = width(); + TQ_UINT32 h = height(); - Q_UINT32 wThird = w / 3; - Q_UINT32 hThird = h / 3; + TQ_UINT32 wThird = w / 3; + TQ_UINT32 hThird = h / 3; switch(cell) { diff --git a/khotkeys/kcontrol/gesturedrawer.h b/khotkeys/kcontrol/gesturedrawer.h index 50fe5db67..b199ab64a 100644 --- a/khotkeys/kcontrol/gesturedrawer.h +++ b/khotkeys/kcontrol/gesturedrawer.h @@ -22,7 +22,7 @@ namespace KHotKeys { -class GestureDrawer : public QFrame +class GestureDrawer : public TQFrame { Q_OBJECT public: @@ -31,13 +31,13 @@ class GestureDrawer : public QFrame void setData(const TQString &data); - virtual TQSize sizeHint() const { return TQSize(30, 30); } + virtual TQSize tqsizeHint() const { return TQSize(30, 30); } protected: void paintEvent(TQPaintEvent *ev); private: - TQPoint lookupCellCoords(Q_UINT32 cell); + TQPoint lookupCellCoords(TQ_UINT32 cell); void drawArrowHead(TQPoint &start, TQPoint &end, TQPainter &p); diff --git a/khotkeys/kcontrol/gesturerecorder.cpp b/khotkeys/kcontrol/gesturerecorder.cpp index 58a177910..b4bba18d9 100644 --- a/khotkeys/kcontrol/gesturerecorder.cpp +++ b/khotkeys/kcontrol/gesturerecorder.cpp @@ -20,7 +20,7 @@ namespace KHotKeys GestureRecorder::GestureRecorder(TQWidget *parent, const char *name) : TQFrame(parent, name), _mouseButtonDown(false) { - setBackgroundColor( colorGroup().base()); + setBackgroundColor( tqcolorGroup().base()); setFrameStyle(TQFrame::Sunken | TQFrame::Panel); setLineWidth(2); setMidLineWidth(0); @@ -32,7 +32,7 @@ GestureRecorder::~GestureRecorder() void GestureRecorder::mousePressEvent(TQMouseEvent *ev) { - if (ev->button() == TQMouseEvent::LeftButton) + if (ev->button() == Qt::LeftButton) { _mouseButtonDown = true; stroke.reset(); @@ -43,7 +43,7 @@ void GestureRecorder::mousePressEvent(TQMouseEvent *ev) void GestureRecorder::mouseReleaseEvent(TQMouseEvent *ev) { - if ((ev->button() == TQMouseEvent::LeftButton) && (_mouseButtonDown)) + if ((ev->button() == Qt::LeftButton) && (_mouseButtonDown)) { TQPoint pos = ev->pos(); stroke.record(pos.x(), pos.y()); diff --git a/khotkeys/kcontrol/gesturerecorder.h b/khotkeys/kcontrol/gesturerecorder.h index d8ca34a72..e42de2c0e 100644 --- a/khotkeys/kcontrol/gesturerecorder.h +++ b/khotkeys/kcontrol/gesturerecorder.h @@ -22,7 +22,7 @@ class TQMouseEvent; namespace KHotKeys { -class GestureRecorder : public QFrame +class GestureRecorder : public TQFrame { Q_OBJECT diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp index af2fb8cdc..ef59a4a99 100644 --- a/khotkeys/kcontrol/gesturerecordpage.cpp +++ b/khotkeys/kcontrol/gesturerecordpage.cpp @@ -43,7 +43,7 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture, "button below.\n\nDraw here:"); TQLabel *label = new TQLabel(message, this, "label"); - label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | + label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | TQLabel::AlignVCenter); _recorder = new GestureRecorder(this, "recorder"); diff --git a/khotkeys/kcontrol/gesturerecordpage.h b/khotkeys/kcontrol/gesturerecordpage.h index 99242c518..306710c0e 100644 --- a/khotkeys/kcontrol/gesturerecordpage.h +++ b/khotkeys/kcontrol/gesturerecordpage.h @@ -26,7 +26,7 @@ namespace KHotKeys class Gesture; class GestureRecorder; -class GestureRecordPage : public QVBox +class GestureRecordPage : public TQVBox { Q_OBJECT @@ -53,7 +53,7 @@ class GestureRecordPage : public QVBox TQString _gest; - Q_UINT32 _tryCount; + TQ_UINT32 _tryCount; }; } // namespace KHotKeys diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 5d540d4c9..eb38ef7cc 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -67,7 +67,7 @@ Module::Module( TQWidget* parent_P, const char* ) { setButtons( Help | Cancel | Apply | Ok ); module = this; - init_global_data( false, this ); // don't grab keys + init_global_data( false, TQT_TQOBJECT(this) ); // don't grab keys init_arts(); TQVBoxLayout* vbox = new TQVBoxLayout( this ); vbox->setSpacing( 6 ); @@ -272,14 +272,14 @@ void Module::set_gestures_exclude( Windowdef_list* windows ) void Module::import() { - TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", topLevelWidget(), + TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", tqtopLevelWidget(), i18n( "Select File with Actions to Be Imported" )); if( file.isEmpty()) return; KSimpleConfig cfg( file, true ); if( !settings.import( cfg, true )) { - KMessageBox::error( topLevelWidget(), + KMessageBox::error( tqtopLevelWidget(), i18n( "Import of the specified file failed. Most probably the file is not a valid " "file with actions." )); return; diff --git a/khotkeys/kcontrol/main_buttons_widget.cpp b/khotkeys/kcontrol/main_buttons_widget.cpp index 3532cc13f..ec0671e40 100644 --- a/khotkeys/kcontrol/main_buttons_widget.cpp +++ b/khotkeys/kcontrol/main_buttons_widget.cpp @@ -38,7 +38,7 @@ Main_buttons_widget::Main_buttons_widget( TQWidget* parent_P, const char* name_P module, TQT_SLOT( changed())); connect( delete_action_button, TQT_SIGNAL( clicked()), module, TQT_SLOT( changed())); - setMaximumHeight( sizeHint().height()); // it gets too high and I have no idea why + setMaximumHeight( tqsizeHint().height()); // it gets too high and I have no idea why } void Main_buttons_widget::enable_delete( bool enable_P ) diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp index 243543519..7f8aa1396 100644 --- a/khotkeys/kcontrol/tab_widget.cpp +++ b/khotkeys/kcontrol/tab_widget.cpp @@ -434,7 +434,7 @@ const char* const Tab_widget::tab_labels[ Tab_widget::TAB_END ] = { void Tab_widget::show_pages( const Pages_set& pages_P ) { - hide(); // this seems to be necessary, otherwise it's not repainter properly + hide(); // this seems to be necessary, otherwise it's not tqrepainter properly for( tab_pos_t i = TAB_FIRST; i < TAB_END; ++i ) diff --git a/khotkeys/kcontrol/tab_widget.h b/khotkeys/kcontrol/tab_widget.h index 84fd6af84..81fb9e4ad 100644 --- a/khotkeys/kcontrol/tab_widget.h +++ b/khotkeys/kcontrol/tab_widget.h @@ -19,7 +19,7 @@ namespace KHotKeys { class Tab_widget - : public QTabWidget + : public TQTabWidget { Q_OBJECT public: diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp index 2533b58a0..12cd12452 100644 --- a/khotkeys/kcontrol/triggers_tab.cpp +++ b/khotkeys/kcontrol/triggers_tab.cpp @@ -241,8 +241,8 @@ void Shortcut_trigger_widget::clear_data() void Shortcut_trigger_widget::capturedShortcut( const KShortcut& s_P ) { - if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget()) - || KKeyChooser::checkStandardShortcutsConflict( s_P, true, topLevelWidget())) + if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, tqtopLevelWidget()) + || KKeyChooser::checkStandardShortcutsConflict( s_P, true, tqtopLevelWidget())) return; // KHotKeys::Module::changed() module->changed(); diff --git a/khotkeys/kcontrol/triggers_tab.h b/khotkeys/kcontrol/triggers_tab.h index 824b31173..89b674a7b 100644 --- a/khotkeys/kcontrol/triggers_tab.h +++ b/khotkeys/kcontrol/triggers_tab.h @@ -58,7 +58,7 @@ class Triggers_tab }; class Trigger_list_item - : public QListViewItem + : public TQListViewItem { public: Trigger_list_item( TQListView* parent_P, Trigger* trigger_P ); @@ -80,7 +80,7 @@ class Trigger_dialog // TODO no need for such extra class? class Shortcut_trigger_widget - : public QWidget + : public TQWidget { Q_OBJECT public: diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui index ad4bcceaf..16a4ebee1 100644 --- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui +++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Action_group_tab_ui - + Action_group_tab_ui @@ -22,7 +22,7 @@ 6 - + action_group_name_label @@ -33,7 +33,7 @@ action_name_lineedit - + action_name_lineedit @@ -48,14 +48,14 @@ Fixed - + 20 20 - + disable_checkbox @@ -73,14 +73,14 @@ Fixed - + 20 20 - + comment_label diff --git a/khotkeys/kcontrol/ui/action_list_widget_ui.ui b/khotkeys/kcontrol/ui/action_list_widget_ui.ui index 696b5106a..8cd292afd 100644 --- a/khotkeys/kcontrol/ui/action_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/action_list_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Action_list_widget_ui - + Action_list_widget_ui @@ -22,7 +22,7 @@ 6 - + comment_label @@ -33,12 +33,12 @@ comment_lineedit - + comment_lineedit - + layout3 @@ -51,7 +51,7 @@ actions_listview - + Layout3 @@ -65,7 +65,7 @@ 6 - + new_button @@ -73,7 +73,7 @@ &New - + modify_button @@ -81,7 +81,7 @@ &Modify... - + copy_button @@ -89,7 +89,7 @@ &Copy - + delete_button diff --git a/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui b/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui index 7c0a88a6f..a2589fc48 100644 --- a/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui +++ b/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Actions_listview_widget_ui - + Actions_listview_widget_ui @@ -22,7 +22,7 @@ 6 - + actions_listview_groupbox @@ -72,7 +72,7 @@ - class QListViewItem; + class TQListViewItem; kdialog.h diff --git a/khotkeys/kcontrol/ui/command_url_widget_ui.ui b/khotkeys/kcontrol/ui/command_url_widget_ui.ui index 266dd90d9..041aeacf4 100644 --- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui +++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Command_url_widget_ui - + Command_url_widget_ui @@ -22,7 +22,7 @@ 6 - + layout2 @@ -30,7 +30,7 @@ unnamed - + command_url_label diff --git a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui index a64ef33c1..c8969d531 100644 --- a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Condition_list_widget_ui - + Condition_list_widget_ui @@ -22,7 +22,7 @@ 6 - + comment_label @@ -33,12 +33,12 @@ comment_lineedit - + comment_lineedit - + layout6 @@ -51,7 +51,7 @@ conditions_listview - + Layout3 @@ -65,7 +65,7 @@ 6 - + new_button @@ -73,7 +73,7 @@ &New - + modify_button @@ -81,7 +81,7 @@ &Modify... - + copy_button @@ -89,7 +89,7 @@ &Copy - + delete_button diff --git a/khotkeys/kcontrol/ui/dcop_widget_ui.ui b/khotkeys/kcontrol/ui/dcop_widget_ui.ui index ed6e90337..173e7d7aa 100644 --- a/khotkeys/kcontrol/ui/dcop_widget_ui.ui +++ b/khotkeys/kcontrol/ui/dcop_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Dcop_widget_ui - + Dcop_widget_ui @@ -22,7 +22,7 @@ 6 - + remote_app_label @@ -33,7 +33,7 @@ remote_app_lineedit - + remote_app_lineedit @@ -48,14 +48,14 @@ Expanding - + 0 20 - + remote_object_label @@ -66,7 +66,7 @@ remote_object_lineedit - + remote_object_lineedit @@ -81,14 +81,14 @@ Expanding - + 0 20 - + called_function_label @@ -99,7 +99,7 @@ called_function_lineedit - + called_function_lineedit @@ -114,14 +114,14 @@ Expanding - + 0 20 - + arguments_label @@ -132,7 +132,7 @@ arguments_lineedit - + arguments_lineedit @@ -147,14 +147,14 @@ Expanding - + 0 20 - + Layout2 @@ -178,14 +178,14 @@ Expanding - + 20 0 - + try_button @@ -203,14 +203,14 @@ Expanding - + 20 0 - + PushButton1 @@ -228,7 +228,7 @@ Expanding - + 20 0 diff --git a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui index 60dc34237..2463d3f2c 100644 --- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui @@ -1,6 +1,6 @@ General_settings_tab_ui - + General_settings_tab_ui @@ -16,7 +16,7 @@ unnamed - + disable_daemon_checkbox @@ -24,7 +24,7 @@ Disable KHotKeys daemon - + layout1 @@ -42,7 +42,7 @@ Expanding - + 40 20 @@ -67,7 +67,7 @@ Expanding - + 40 20 @@ -86,7 +86,7 @@ Expanding - + 20 40 diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui index 93f3a6a2c..3d19b3256 100644 --- a/khotkeys/kcontrol/ui/general_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_tab_ui.ui @@ -1,6 +1,6 @@ KHotKeys::General_tab_ui - + General_tab_ui @@ -22,7 +22,7 @@ 6 - + action_name_label @@ -33,12 +33,12 @@ action_name_lineedit - + action_name_lineedit - + Layout1 @@ -52,7 +52,7 @@ 6 - + action_type_label @@ -63,7 +63,7 @@ action_type_combo - + action_type_combo @@ -80,14 +80,14 @@ Fixed - + 20 20 - + disable_checkbox @@ -105,14 +105,14 @@ Fixed - + 20 20 - + comment_label diff --git a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui index 29f8f88d5..9e843764f 100644 --- a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui +++ b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Gesture_triggers_tab_ui - + Gesture_triggers_tab_ui @@ -22,7 +22,7 @@ 6 - + TextLabel1 @@ -46,14 +46,14 @@ Expanding - + 0 30 - + Layout5 @@ -77,14 +77,14 @@ Expanding - + 30 0 - + gesture_lineedit1 @@ -102,7 +102,7 @@ Expanding - + 30 0 @@ -121,7 +121,7 @@ 0 - + 100 100 @@ -138,14 +138,14 @@ Expanding - + 30 0 - + gesture_edit_button1 @@ -163,7 +163,7 @@ Expanding - + 30 0 @@ -182,14 +182,14 @@ Expanding - + 0 30 - + Layout6 @@ -213,14 +213,14 @@ Expanding - + 30 0 - + gesture_lineedit2 @@ -238,7 +238,7 @@ Expanding - + 30 0 @@ -257,7 +257,7 @@ 0 - + 100 100 @@ -274,14 +274,14 @@ Expanding - + 30 0 - + gesture_edit_button2 @@ -299,7 +299,7 @@ Expanding - + 30 0 @@ -318,14 +318,14 @@ Expanding - + 0 30 - + Layout7 @@ -349,14 +349,14 @@ Expanding - + 30 0 - + gesture_lineedit3 @@ -374,7 +374,7 @@ Expanding - + 30 0 @@ -393,7 +393,7 @@ 0 - + 100 100 @@ -410,14 +410,14 @@ Expanding - + 30 0 - + gesture_edit_button3 @@ -435,7 +435,7 @@ Expanding - + 30 0 @@ -454,7 +454,7 @@ Expanding - + 0 30 diff --git a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui index 3bee7daf0..698392402 100644 --- a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui @@ -1,6 +1,6 @@ Gestures_settings_tab_ui - + Gestures_settings_tab_ui @@ -16,7 +16,7 @@ unnamed - + mouse_gestures_globally @@ -24,7 +24,7 @@ Disable mouse gestures globally - + layout1 @@ -32,7 +32,7 @@ unnamed - + mouse_button_label @@ -43,14 +43,14 @@ mouse_button_combo - + mouse_button_combo - + layout2 @@ -58,7 +58,7 @@ unnamed - + timeout_label @@ -82,7 +82,7 @@ - + window_groupbox @@ -116,7 +116,7 @@ Expanding - + 20 50 diff --git a/khotkeys/kcontrol/ui/info_tab_ui.ui b/khotkeys/kcontrol/ui/info_tab_ui.ui index 9f82ccdcc..53868495c 100644 --- a/khotkeys/kcontrol/ui/info_tab_ui.ui +++ b/khotkeys/kcontrol/ui/info_tab_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Info_tab_ui - + Info_tab_ui @@ -25,7 +25,7 @@ 6 - + warning_label @@ -33,7 +33,7 @@ <p>This module allows configuring input actions, like mouse gestures, keyboard shortcuts for performing commands, launching applications or DCOP calls, and similar.</p> <p><b>NOTE: </b>If you are not an experienced user, you should be careful with modifying the actions, and should limit your changes mainly to enabling/disabling actions, and changing triggers.</p> - + WordBreak|AlignVCenter @@ -47,7 +47,7 @@ Expanding - + 20 20 diff --git a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui index f3947dd54..55a7d6188 100644 --- a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui +++ b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Keyboard_input_widget_ui - + Keyboard_input_widget_ui @@ -25,7 +25,7 @@ 6 - + keyboard_input_label @@ -36,7 +36,7 @@ keyboard_input_multilineedit - + Layout2 @@ -58,7 +58,7 @@ PlainText - + modify_button @@ -68,7 +68,7 @@ - + buttonGroup1 @@ -86,7 +86,7 @@ unnamed - + action_window_radio @@ -97,7 +97,7 @@ true - + active_window_radio @@ -105,7 +105,7 @@ Active window - + specific_window_radio @@ -115,7 +115,7 @@ - + window_groupbox diff --git a/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui b/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui index a46ee0a0f..f559dd7bc 100644 --- a/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui +++ b/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Main_buttons_widget_ui - + Main_buttons_widget_ui @@ -30,7 +30,7 @@ 6 - + new_action_button @@ -38,7 +38,7 @@ &New Action - + new_action_group_button @@ -46,7 +46,7 @@ New &Group - + delete_action_button @@ -68,7 +68,7 @@ Vertical - + global_settings_button diff --git a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui index ae6c613f3..ed3cc119e 100644 --- a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui +++ b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Menuentry_widget_ui - + Menuentry_widget_ui @@ -22,7 +22,7 @@ 6 - + menuentry_label @@ -33,7 +33,7 @@ command_url_lineedit - + Layout7 @@ -47,12 +47,12 @@ 6 - + menuentry_lineedit - + browse_button @@ -72,7 +72,7 @@ Expanding - + 0 20 diff --git a/khotkeys/kcontrol/ui/triggers_tab_ui.ui b/khotkeys/kcontrol/ui/triggers_tab_ui.ui index 13ac0530b..44b9d6d56 100644 --- a/khotkeys/kcontrol/ui/triggers_tab_ui.ui +++ b/khotkeys/kcontrol/ui/triggers_tab_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Triggers_tab_ui - + Triggers_tab_ui @@ -22,7 +22,7 @@ 6 - + comment_label @@ -33,12 +33,12 @@ comment_lineedit - + comment_lineedit - + layout3 @@ -51,7 +51,7 @@ triggers_listview - + Layout3 @@ -65,7 +65,7 @@ 6 - + new_button @@ -73,7 +73,7 @@ &New - + modify_button @@ -81,7 +81,7 @@ &Modify... - + copy_button @@ -89,7 +89,7 @@ &Copy - + delete_button diff --git a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui index 007610fca..71c724aff 100644 --- a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui +++ b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui @@ -1,6 +1,6 @@ Voice_input_widget_ui - + Form1 @@ -16,7 +16,7 @@ unnamed - + label @@ -28,7 +28,7 @@ 0 - + 150 0 diff --git a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui index 2c254dcc8..1a4eed270 100644 --- a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui @@ -1,6 +1,6 @@ Voice_settings_tab_ui - + Voice_settings_tab_ui @@ -16,18 +16,18 @@ unnamed - + textLabel2 In order to trigger a spoken action, you have to press the key (or combination of keys) configured below, speak the command and then press the same key again once you have finished speaking. - + WordBreak|AlignVCenter - + layout4 @@ -35,7 +35,7 @@ unnamed - + textLabel1 @@ -61,7 +61,7 @@ Expanding - + 241 21 @@ -80,14 +80,14 @@ Expanding - + 31 90 - + textLabel1_2 diff --git a/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui b/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui index 58d15e3cf..c6a8ae73e 100644 --- a/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui +++ b/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Window_trigger_widget_ui - + Window_trigger_widget_ui @@ -22,7 +22,7 @@ 6 - + GroupBox4 @@ -39,7 +39,7 @@ 6 - + window_appears_checkbox @@ -47,7 +47,7 @@ Window appears - + window_disappears_checkbox @@ -55,7 +55,7 @@ Window disappears - + window_activates_checkbox @@ -63,7 +63,7 @@ Window activates - + window_deactivates_checkbox @@ -73,7 +73,7 @@ - + window_groupbox diff --git a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui index 5e9007e9e..fca2934d7 100644 --- a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Windowdef_list_widget_ui - + Windowdef_list_widget_ui @@ -22,7 +22,7 @@ 6 - + comment_label @@ -33,12 +33,12 @@ comment_lineedit - + comment_lineedit - + layout3 @@ -51,7 +51,7 @@ windows_listview - + Layout3 @@ -65,7 +65,7 @@ 6 - + new_button @@ -73,7 +73,7 @@ &New - + modify_button @@ -81,7 +81,7 @@ &Modify... - + copy_button @@ -89,7 +89,7 @@ &Copy - + delete_button diff --git a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui index 01d54da98..6e96e06ab 100644 --- a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui +++ b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Windowdef_simple_widget_ui - + Windowdef_simple_widget_ui @@ -22,7 +22,7 @@ 6 - + comment_label @@ -33,7 +33,7 @@ comment_lineedit - + comment_lineedit @@ -48,14 +48,14 @@ Expanding - + 0 20 - + Layout1 @@ -69,7 +69,7 @@ 6 - + window_title_label @@ -80,7 +80,7 @@ window_title_lineedit - + Is Not Important @@ -122,7 +122,7 @@ - + window_title_lineedit @@ -137,14 +137,14 @@ Expanding - + 0 20 - + Layout2 @@ -158,7 +158,7 @@ 6 - + window_class_label @@ -169,7 +169,7 @@ window_class_lineedit - + Is Not Important @@ -211,7 +211,7 @@ - + window_class_lineedit @@ -226,14 +226,14 @@ Expanding - + 0 20 - + Layout3 @@ -247,7 +247,7 @@ 6 - + window_role_label @@ -258,7 +258,7 @@ window_role_lineedit - + Is Not Important @@ -300,7 +300,7 @@ - + window_role_lineedit @@ -315,14 +315,14 @@ Expanding - + 0 20 - + Layout6 @@ -346,14 +346,14 @@ Expanding - + 20 0 - + autodetect_button @@ -371,7 +371,7 @@ Expanding - + 20 0 @@ -390,14 +390,14 @@ Expanding - + 0 20 - + window_types_groupbox @@ -414,7 +414,7 @@ 6 - + type_normal_checkbox @@ -422,7 +422,7 @@ Normal - + type_dialog_checkbox @@ -430,7 +430,7 @@ Dialog - + type_desktop_checkbox @@ -438,7 +438,7 @@ Desktop - + type_dock_checkbox diff --git a/khotkeys/kcontrol/voicerecorder.cpp b/khotkeys/kcontrol/voicerecorder.cpp index 31578298d..50d1fa2f9 100644 --- a/khotkeys/kcontrol/voicerecorder.cpp +++ b/khotkeys/kcontrol/voicerecorder.cpp @@ -46,7 +46,7 @@ bool VoiceRecorder::init( KLibrary* lib ) } VoiceRecorder::VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWidget *parent, const char *name) - : Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(this)) , _state(sNotModified), _tempFile(0L) , _voiceId(voiceId) + : Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(TQT_TQOBJECT(this))) , _state(sNotModified), _tempFile(0L) , _voiceId(voiceId) { _sound=sound_P; buttonPlay->setEnabled(sound_P.size() > 50); diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp index fec07e22f..fa103e6b1 100644 --- a/khotkeys/kcontrol/voicerecordpage.cpp +++ b/khotkeys/kcontrol/voicerecordpage.cpp @@ -31,7 +31,7 @@ VoiceRecordPage::VoiceRecordPage( const TQString &voiceid_P, TQWidget *parent, c _message = i18n("Enter a code for the sound (e.g. the word you are saying) and record the same word twice."); _label = new TQLabel(_message, this, "label"); - _label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | + _label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | TQLabel::AlignVCenter); _lineEdit = new KLineEdit( this ); diff --git a/khotkeys/kcontrol/voicerecordpage.h b/khotkeys/kcontrol/voicerecordpage.h index 57d585bb9..9cb934b61 100644 --- a/khotkeys/kcontrol/voicerecordpage.h +++ b/khotkeys/kcontrol/voicerecordpage.h @@ -29,7 +29,7 @@ class Voice; class VoiceRecorder; class VoiceSignature; -class VoiceRecordPage : public QVBox +class VoiceRecordPage : public TQVBox { Q_OBJECT diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp index 471aab743..f0891af78 100644 --- a/khotkeys/kcontrol/windowdef_list_widget.cpp +++ b/khotkeys/kcontrol/windowdef_list_widget.cpp @@ -134,7 +134,7 @@ void Windowdef_list_widget::new_selected( int type_P ) void Windowdef_list_widget::copy_pressed() { windows_listview->setSelected( create_listview_item( selected_item->window(), - selected_item->parent() ? NULL : windows_listview, selected_item->parent(), + selected_item->tqparent() ? NULL : windows_listview, selected_item->tqparent(), selected_item, true ), true ); } @@ -192,7 +192,7 @@ void Windowdef_list_widget::edit_listview_item( Windowdef_list_item* item_P ) { item_P->set_window( new_window ); item_P->widthChanged( 0 ); // SELI tohle i u dalsich listview? - windows_listview->repaintItem( item_P ); + windows_listview->tqrepaintItem( item_P ); } delete dlg; } diff --git a/khotkeys/kcontrol/windowdef_list_widget.h b/khotkeys/kcontrol/windowdef_list_widget.h index b49146a85..6e923c902 100644 --- a/khotkeys/kcontrol/windowdef_list_widget.h +++ b/khotkeys/kcontrol/windowdef_list_widget.h @@ -59,7 +59,7 @@ class Windowdef_list_widget typedef Windowdef_list_widget Windowdef_list_tab; class Windowdef_list_item - : public QListViewItem + : public TQListViewItem { public: Windowdef_list_item( TQListView* parent_P, Windowdef* window_P ); diff --git a/khotkeys/kcontrol/windowdef_simple_widget.cpp b/khotkeys/kcontrol/windowdef_simple_widget.cpp index f79d81ea1..e0a6671e7 100644 --- a/khotkeys/kcontrol/windowdef_simple_widget.cpp +++ b/khotkeys/kcontrol/windowdef_simple_widget.cpp @@ -157,7 +157,7 @@ void Windowdef_simple_widget::autodetect_clicked() void Windowdef_simple_widget::autodetect() { - WindowSelector* sel = new WindowSelector( this, TQT_SLOT( autodetect_window_selected( WId ))); + WindowSelector* sel = new WindowSelector( TQT_TQOBJECT(this), TQT_SLOT( autodetect_window_selected( WId ))); sel->select(); } diff --git a/khotkeys/kcontrol/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp index d6e562df3..e2942201c 100644 --- a/khotkeys/kcontrol/windowselector.cpp +++ b/khotkeys/kcontrol/windowselector.cpp @@ -34,8 +34,8 @@ WindowSelector::WindowSelector( TQObject* receiver_P, const char* slot_P ) void WindowSelector::select() { - kapp->desktop()->grabMouse( TQCursor( crossCursor )); - kapp->installX11EventFilter( this ); + kapp->desktop()->grabMouse( TQCursor( tqcrossCursor )); + kapp->installX11EventFilter( TQT_TQWIDGET(this) ); } bool WindowSelector::x11Event( XEvent* e ) diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp index e37ef395f..a58b85c8c 100644 --- a/khotkeys/shared/actions.cpp +++ b/khotkeys/shared/actions.cpp @@ -124,7 +124,7 @@ void Command_url_action::execute() kapp->propagateSessionManager(); sm_ready = true; } -// int space_pos = command_url().find( ' ' ); +// int space_pos = command_url().tqfind( ' ' ); // if( command_url()[ 0 ] != '\'' && command_url()[ 0 ] != '"' && space_pos > -1 // && command_url()[ space_pos - 1 ] != '\\' ) // cmd = command_url().left( space_pos ); // get first 'word' @@ -286,7 +286,7 @@ void Dcop_action::execute() // one word if( pos != 0 ) args_str = args_str.mid( pos ); - int nxt_pos = args_str.find( ' ' ); + int nxt_pos = args_str.tqfind( ' ' ); args_list.append( args_str.left( nxt_pos )); // should be ok if nxt_pos is -1 args_str = nxt_pos >= 0 ? args_str.mid( nxt_pos ) : ""; } @@ -372,7 +372,7 @@ void Keyboard_input_action::execute() w = InputFocus; } int last_index = -1, start = 0; - while(( last_index = input().find( ':', last_index + 1 )) != -1 ) // find next ';' + while(( last_index = input().tqfind( ':', last_index + 1 )) != -1 ) // find next ';' { TQString key = input().mid( start, last_index - start ).stripWhiteSpace(); if( key == "Enter" && KKey( key ).keyCodeQt() == 0 ) @@ -391,7 +391,7 @@ void Keyboard_input_action::execute() TQString Keyboard_input_action::description() const { TQString tmp = input(); - tmp.replace( '\n', ' ' ); + tmp.tqreplace( '\n', ' ' ); tmp.truncate( 30 ); return i18n( "Keyboard input : " ) + tmp; } diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp index 60b1d93b4..620d8d2ed 100644 --- a/khotkeys/shared/gestures.cpp +++ b/khotkeys/shared/gestures.cpp @@ -105,7 +105,7 @@ void Gesture::active_window_changed( WId ) void Gesture::register_handler( TQObject* receiver_P, const char* slot_P ) { - if( handlers.contains( receiver_P )) + if( handlers.tqcontains( receiver_P )) return; handlers[ receiver_P ] = true; connect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )), @@ -116,7 +116,7 @@ void Gesture::register_handler( TQObject* receiver_P, const char* slot_P ) void Gesture::unregister_handler( TQObject* receiver_P, const char* slot_P ) { - if( !handlers.contains( receiver_P )) + if( !handlers.tqcontains( receiver_P )) return; handlers.remove( receiver_P ); disconnect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )), diff --git a/khotkeys/shared/gestures.h b/khotkeys/shared/gestures.h index d423be8a6..4f0f3f94c 100644 --- a/khotkeys/shared/gestures.h +++ b/khotkeys/shared/gestures.h @@ -101,7 +101,7 @@ class KDE_EXPORT Gesture // Gesture class must be TQWidget derived because of x11Event() // but it should be TQObject owned -> use a TQObject proxy that will delete it class DeleteObject - : public QObject + : public TQObject { Q_OBJECT public: diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp index f9bfec6d3..90e789282 100644 --- a/khotkeys/shared/input.cpp +++ b/khotkeys/shared/input.cpp @@ -55,7 +55,7 @@ Kbd::~Kbd() void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) { - Receiver_data& rcv = receivers[ receiver_P ]; + Receiver_data& rcv = tqreceivers[ receiver_P ]; rcv.shortcuts.append( shortcut_P ); if( rcv.active ) grab_shortcut( shortcut_P ); @@ -63,17 +63,17 @@ void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) void Kbd::remove_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) { - Receiver_data& rcv = receivers[ receiver_P ]; + Receiver_data& rcv = tqreceivers[ receiver_P ]; rcv.shortcuts.remove( shortcut_P ); if( rcv.active ) ungrab_shortcut( shortcut_P ); if( rcv.shortcuts.count() == 0 ) - receivers.remove( receiver_P ); + tqreceivers.remove( receiver_P ); } void Kbd::activate_receiver( Kbd_receiver* receiver_P ) { - Receiver_data& rcv = receivers[ receiver_P ]; + Receiver_data& rcv = tqreceivers[ receiver_P ]; if( rcv.active ) return; rcv.active = true; @@ -85,7 +85,7 @@ void Kbd::activate_receiver( Kbd_receiver* receiver_P ) void Kbd::deactivate_receiver( Kbd_receiver* receiver_P ) { - Receiver_data& rcv = receivers[ receiver_P ]; + Receiver_data& rcv = tqreceivers[ receiver_P ]; if( !rcv.active ) return; rcv.active = false; @@ -97,7 +97,7 @@ void Kbd::deactivate_receiver( Kbd_receiver* receiver_P ) void Kbd::grab_shortcut( const KShortcut& shortcut_P ) { - if( grabs.contains( shortcut_P )) + if( grabs.tqcontains( shortcut_P )) ++grabs[ shortcut_P ]; else { @@ -117,7 +117,7 @@ void Kbd::grab_shortcut( const KShortcut& shortcut_P ) void Kbd::ungrab_shortcut( const KShortcut& shortcut_P ) { - if( !grabs.contains( shortcut_P )) + if( !grabs.tqcontains( shortcut_P )) return; if( --grabs[ shortcut_P ] == 0 ) { @@ -142,12 +142,12 @@ void Kbd::key_slot( TQString key_P ) { kdDebug( 1217 ) << "Key pressed:" << key_P << endl; KShortcut shortcut( key_P ); - if( !grabs.contains( shortcut )) + if( !grabs.tqcontains( shortcut )) return; - for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = receivers.begin(); - it != receivers.end(); + for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = tqreceivers.begin(); + it != tqreceivers.end(); ++it ) - if( ( *it ).shortcuts.contains( shortcut ) && ( *it ).active + if( ( *it ).shortcuts.tqcontains( shortcut ) && ( *it ).active && it.key()->handle_key( shortcut )) return; } diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h index 22df89284..a9f19240d 100644 --- a/khotkeys/shared/input.h +++ b/khotkeys/shared/input.h @@ -33,7 +33,7 @@ class Kbd_receiver }; class Kbd - : public QObject + : public TQObject { Q_OBJECT public: @@ -58,7 +58,7 @@ class Kbd TQValueList< KShortcut > shortcuts; bool active; }; - TQMap< Kbd_receiver*, Receiver_data > receivers; + TQMap< Kbd_receiver*, Receiver_data > tqreceivers; TQMap< KShortcut, int > grabs; KGlobalAccel* kga; }; diff --git a/khotkeys/shared/khlistbox.h b/khotkeys/shared/khlistbox.h index ddb988c36..ad2cdb3b6 100644 --- a/khotkeys/shared/khlistbox.h +++ b/khotkeys/shared/khlistbox.h @@ -19,7 +19,7 @@ namespace KHotKeys { class KHListBox - : public QListBox + : public TQListBox { Q_OBJECT Q_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect ) diff --git a/khotkeys/shared/khotkeysglobal.cpp b/khotkeys/shared/khotkeysglobal.cpp index 4c6b8360c..8eb159d3c 100644 --- a/khotkeys/shared/khotkeysglobal.cpp +++ b/khotkeys/shared/khotkeysglobal.cpp @@ -65,7 +65,7 @@ TQString get_menu_entry_from_path( const TQString& path_P ) for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it ) - if( path_P.find( *it ) == 0 ) + if( path_P.tqfind( *it ) == 0 ) { TQString ret = path_P; ret.remove( 0, (*it).length()); diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp index fdab2be56..a6434be06 100644 --- a/khotkeys/shared/settings.cpp +++ b/khotkeys/shared/settings.cpp @@ -63,7 +63,7 @@ bool Settings::read_settings( KConfig& cfg_P, bool include_disabled_P, ImportTyp TQString import_id = cfg_P.readEntry( "ImportId" ); if( !import_id.isEmpty()) { - if( already_imported.contains( import_id )) + if( already_imported.tqcontains( import_id )) { if( import_P == ImportSilent || KMessageBox::warningContinueCancel( NULL, diff --git a/khotkeys/shared/sound.cpp b/khotkeys/shared/sound.cpp index c90eb2e02..cb2ef54d1 100644 --- a/khotkeys/shared/sound.cpp +++ b/khotkeys/shared/sound.cpp @@ -50,7 +50,7 @@ Sound::~Sound() void Sound::load(const TQString& filename) { kdDebug() << k_funcinfo << filename << endl; - data=TQMemArray(); + data=TQMemArray(); TQFile file(filename); if(!file.open(IO_ReadOnly)) { @@ -59,20 +59,20 @@ void Sound::load(const TQString& filename) } TQDataStream stream(&file); stream.setByteOrder( TQDataStream::LittleEndian ); - Q_INT32 magic; + TQ_INT32 magic; MAGIC("RIFF"); - READ_FROM_STREAM(Q_UINT32,ChunkSize); + READ_FROM_STREAM(TQ_UINT32,ChunkSize); MAGIC("WAVE"); MAGIC("fmt "); - READ_FROM_STREAM(Q_UINT32,ChunkSize2); - READ_FROM_STREAM(Q_INT16,AudioFormat); - READ_FROM_STREAM(Q_UINT16,NumberOfChannels); - READ_FROM_STREAM(Q_UINT32,SampleRate); + READ_FROM_STREAM(TQ_UINT32,ChunkSize2); + READ_FROM_STREAM(TQ_INT16,AudioFormat); + READ_FROM_STREAM(TQ_UINT16,NumberOfChannels); + READ_FROM_STREAM(TQ_UINT32,SampleRate); _fs=SampleRate; - READ_FROM_STREAM(Q_UINT32,ByteRate); - READ_FROM_STREAM(Q_UINT16,BlockAlign); - READ_FROM_STREAM(Q_UINT16,BitsPerSample); + READ_FROM_STREAM(TQ_UINT32,ByteRate); + READ_FROM_STREAM(TQ_UINT16,BlockAlign); + READ_FROM_STREAM(TQ_UINT16,BitsPerSample); MAGIC("data"); READ_FROM_STREAM(TQByteArray,SoundData); NumberOfChannels=1; //Wav i play are broken @@ -90,10 +90,10 @@ void Sound::load(const TQString& filename) max=0; for(unsigned long int f=0;f> 8; + TQ_UINT16 val= (signed short int) ( (data.at(f) * ((double)(1<<13)/(signed)max) ) ); + SoundData.tqat( 2*f )= val & 0x00FF; + SoundData.tqat(2*f+1)= (val & 0xFF00) >> 8; // kdDebug( 1217 ) << k_funcinfo << data.at(f) << " / " << max << " = " << val << " | " << SoundData[ 2*f ] << " "<< SoundData[ 2*f+1 ] << endl; } - Q_UINT16 NumberOfChannels=2; - Q_UINT32 SampleRate=_fs; + TQ_UINT16 NumberOfChannels=2; + TQ_UINT32 SampleRate=_fs; SMAGIC("RIFF"); - //READ_FROM_STREAM(Q_UINT32,ChunkSize); - stream << (Q_UINT32)(36+ SoundData.size()); + //READ_FROM_STREAM(TQ_UINT32,ChunkSize); + stream << (TQ_UINT32)(36+ SoundData.size()); SMAGIC("WAVE"); SMAGIC("fmt "); - //READ_FROM_STREAM(Q_UINT32,ChunkSize2); - stream << (Q_UINT32)(16); - //READ_FROM_STREAM(Q_INT16,AudioFormat); - stream << (Q_INT16)(1); - //READ_FROM_STREAM(Q_UINT16,NumberOfChannels); - stream << (Q_UINT16)(NumberOfChannels); - //READ_FROM_STREAM(Q_UINT32,SampleRate); - stream << (Q_UINT32)(SampleRate); - //READ_FROM_STREAM(Q_UINT32,ByteRate); - stream << (Q_UINT32)(NumberOfChannels*SampleRate*16/8); - //READ_FROM_STREAM(Q_UINT16,BlockAlign); - stream << (Q_UINT16)(16/8 *NumberOfChannels); - //READ_FROM_STREAM(Q_UINT16,BitsPerSample); - stream << (Q_UINT16)(16); + //READ_FROM_STREAM(TQ_UINT32,ChunkSize2); + stream << (TQ_UINT32)(16); + //READ_FROM_STREAM(TQ_INT16,AudioFormat); + stream << (TQ_INT16)(1); + //READ_FROM_STREAM(TQ_UINT16,NumberOfChannels); + stream << (TQ_UINT16)(NumberOfChannels); + //READ_FROM_STREAM(TQ_UINT32,SampleRate); + stream << (TQ_UINT32)(SampleRate); + //READ_FROM_STREAM(TQ_UINT32,ByteRate); + stream << (TQ_UINT32)(NumberOfChannels*SampleRate*16/8); + //READ_FROM_STREAM(TQ_UINT16,BlockAlign); + stream << (TQ_UINT16)(16/8 *NumberOfChannels); + //READ_FROM_STREAM(TQ_UINT16,BitsPerSample); + stream << (TQ_UINT16)(16); SMAGIC("data"); //READ_FROM_STREAM(TQByteArray,SoundData); stream << SoundData; diff --git a/khotkeys/shared/sound.h b/khotkeys/shared/sound.h index 2c2d97d93..6453563de 100644 --- a/khotkeys/shared/sound.h +++ b/khotkeys/shared/sound.h @@ -50,8 +50,8 @@ public: return _fs; } - TQMemArray data; - Q_UINT32 max; + TQMemArray data; + TQ_UINT32 max; uint _fs; }; diff --git a/khotkeys/shared/soundrecorder.h b/khotkeys/shared/soundrecorder.h index c00f73527..c7e55fc22 100644 --- a/khotkeys/shared/soundrecorder.h +++ b/khotkeys/shared/soundrecorder.h @@ -34,7 +34,7 @@ namespace KHotKeys /** @author Olivier Goffart */ -class KDE_EXPORT SoundRecorder : public QObject +class KDE_EXPORT SoundRecorder : public TQObject { Q_OBJECT public: diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp index 7cac2b98c..b3042f00f 100644 --- a/khotkeys/shared/triggers.cpp +++ b/khotkeys/shared/triggers.cpp @@ -225,7 +225,7 @@ void Window_trigger::window_added( WId window_P ) void Window_trigger::window_removed( WId window_P ) { - if( existing_windows.contains( window_P )) + if( existing_windows.tqcontains( window_P )) { bool matches = existing_windows[ window_P ]; kdDebug( 1217 ) << "Window_trigger::w_removed() : " << matches << endl; @@ -244,7 +244,7 @@ void Window_trigger::window_removed( WId window_P ) void Window_trigger::active_window_changed( WId window_P ) { bool was_match = false; - if( existing_windows.contains( last_active_window )) + if( existing_windows.tqcontains( last_active_window )) was_match = existing_windows[ last_active_window ]; if( active && was_match && ( window_actions & WINDOW_DEACTIVATES )) { @@ -253,7 +253,7 @@ void Window_trigger::active_window_changed( WId window_P ) } /* bool matches = windows()->match( Window_data( window_P )); existing_windows[ window_P ] = matches;*/ - bool matches = existing_windows.contains( window_P ) + bool matches = existing_windows.tqcontains( window_P ) ? existing_windows[ window_P ] : false; if( active && matches && ( window_actions & WINDOW_ACTIVATES )) { @@ -272,7 +272,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P ) return; kdDebug( 1217 ) << "Window_trigger::w_changed()" << endl; bool was_match = false; - if( existing_windows.contains( window_P )) + if( existing_windows.tqcontains( window_P )) was_match = existing_windows[ window_P ]; bool matches = windows()->match( Window_data( window_P )); existing_windows[ window_P ] = matches; diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp index a6515fecf..e19f66eec 100644 --- a/khotkeys/shared/voices.cpp +++ b/khotkeys/shared/voices.cpp @@ -79,7 +79,7 @@ void Voice::enable( bool enabled_P ) void Voice::register_handler( Voice_trigger *trigger_P ) { - if( !_references.contains( trigger_P )) + if( !_references.tqcontains( trigger_P )) _references.append(trigger_P); } @@ -179,7 +179,7 @@ void Voice::slot_sound_recorded(const Sound &sound_P) //kdDebug(1217) << k_funcinfo << keyNative.key().toString() << endl; - if(_shortcut.contains(keyNative)) + if(_shortcut.tqcontains(keyNative)) { if(pEvent->type == XKeyPress && !_recording ) { diff --git a/khotkeys/shared/voices.h b/khotkeys/shared/voices.h index f03d2b040..0f8496d8a 100644 --- a/khotkeys/shared/voices.h +++ b/khotkeys/shared/voices.h @@ -28,7 +28,7 @@ class Voice_trigger; class VoiceSignature; -class KDE_EXPORT Voice : public QObject +class KDE_EXPORT Voice : public TQObject { Q_OBJECT public: diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp index b8e86f694..a1394b731 100644 --- a/khotkeys/shared/windows.cpp +++ b/khotkeys/shared/windows.cpp @@ -339,7 +339,7 @@ bool Windowdef_simple::is_substr_match( const TQString& str1_P, const TQString& case NOT_IMPORTANT : return true; case CONTAINS : - return str1_P.contains( str2_P ) > 0; + return str1_P.tqcontains( str2_P ) > 0; case IS : return str1_P == str2_P; case REGEXP : @@ -348,7 +348,7 @@ bool Windowdef_simple::is_substr_match( const TQString& str1_P, const TQString& return rg.search( str1_P ) >= 0; } case CONTAINS_NOT : - return str1_P.contains( str2_P ) == 0; + return str1_P.tqcontains( str2_P ) == 0; case IS_NOT : return str1_P != str2_P; case REGEXP_NOT : diff --git a/khotkeys/shared/windows.h b/khotkeys/shared/windows.h index d145efa87..8aad308c9 100644 --- a/khotkeys/shared/windows.h +++ b/khotkeys/shared/windows.h @@ -35,7 +35,7 @@ class Windowdef_list; /*class Action_data_base;*/ class KDE_EXPORT Windows - : public QObject + : public TQObject { Q_OBJECT public: diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp index c99efda49..91456ed70 100644 --- a/khotkeys/update/update.cpp +++ b/khotkeys/update/update.cpp @@ -46,7 +46,7 @@ int main( int argc, char* argv[] ) kdWarning() << "File " << id << " not found!" << endl; return 1; } - init_global_data( false, &app ); + init_global_data( false, TQT_TQOBJECT(&app) ); Settings settings; settings.read_settings( true ); KConfig cfg( file, true ); diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui index 4a20312ec..ea0135ceb 100644 --- a/kicker/applets/clock/analog.ui +++ b/kicker/applets/clock/analog.ui @@ -1,6 +1,6 @@ AnalogWidget - + AnalogWidget @@ -19,7 +19,7 @@ 0 - + ButtonGroup2_3_2 @@ -30,7 +30,7 @@ unnamed - + kcfg_AnalogShowDate @@ -38,7 +38,7 @@ Dat&e - + kcfg_AnalogShowSeconds @@ -49,7 +49,7 @@ true - + kcfg_AnalogShowDayOfWeek @@ -57,7 +57,7 @@ Da&y of week - + kcfg_AnalogShowFrame @@ -75,7 +75,7 @@ Expanding - + 40 20 @@ -84,7 +84,7 @@ - + groupBox1 @@ -95,7 +95,7 @@ unnamed - + layout9 @@ -125,7 +125,7 @@ - + foregroundAnalogLabel @@ -149,14 +149,14 @@ Expanding - + 16 20 - + backgroundAnalogLabel @@ -181,7 +181,7 @@ - + shadowAnalogLabel @@ -197,7 +197,7 @@ - + TextLabel1_3 @@ -208,7 +208,7 @@ kcfg_AnalogAntialias - + None @@ -241,14 +241,14 @@ Expanding - + 310 20 - + kcfg_AnalogLCDStyle @@ -269,7 +269,7 @@ Expanding - + 20 50 diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 26f1ae4c0..072bd6161 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -95,46 +95,46 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent, setIcon(SmallIcon("date")); settings = new SettingsWidgetImp(prefs, zone, 0, "General"); - connect(settings->kcfg_Type, TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int))); + connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int))); - settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::palette().active().background()); - settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::palette().active().background()); + settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); + settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); // Digital digitalPage = new DigitalWidget(0, "DigitalClock"); settings->widgetStack->addWidget(digitalPage, 1); - digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::palette().active().background()); + digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); // Analog analogPage = new AnalogWidget(0, "AnalogClock"); settings->widgetStack->addWidget(analogPage, 2); - analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::palette().active().background()); + analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); // Fuzzy fuzzyPage = new FuzzyWidget(0, "FuzzyClock"); settings->widgetStack->addWidget(fuzzyPage, 3); - fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::palette().active().background()); + fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); - connect(settings->kcfg_PlainShowDate, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(settings->kcfg_PlainShowDayOfWeek, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(settings->kcfg_PlainShowDayOfWeek), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(digitalPage->kcfg_DigitalShowDayOfWeek, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDayOfWeek), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(analogPage->kcfg_AnalogShowDate, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDate), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(analogPage->kcfg_AnalogShowDayOfWeek, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDayOfWeek), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(fuzzyPage->kcfg_FuzzyShowDate, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDate), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDayOfWeek), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - addPage(settings, i18n("General"), TQString::fromLatin1("package_settings")); + addPage(settings, i18n("General"), TQString::tqfromLatin1("package_settings")); } void KConfigDialogSingle::updateSettings() @@ -253,7 +253,7 @@ void PlainClock::updateClock() void PlainClock::loadSettings() { setFrameStyle(_prefs->plainShowFrame() ? Panel | Sunken : NoFrame); - setAlignment(AlignVCenter | AlignHCenter | SingleLine); + tqsetAlignment(AlignVCenter | AlignHCenter | SingleLine); setFont(_prefs->plainFont()); } @@ -397,7 +397,7 @@ void DigitalClock::paintEvent(TQPaintEvent*) p.drawTiledPixmap(0, 0, width(), height(), lcdPattern); } else if (_prefs->digitalBackgroundColor() != - KApplication::palette().active().background()) + KApplication::tqpalette().active().background()) { p.fillRect(0, 0, width(), height(), _prefs->digitalBackgroundColor()); } @@ -564,7 +564,7 @@ void AnalogClock::paintEvent( TQPaintEvent * ) paint.drawTiledPixmap(0, 0, spWidth, spHeight, lcdPattern); } - else if (_prefs->analogBackgroundColor() != KApplication::palette().active().background()) + else if (_prefs->analogBackgroundColor() != KApplication::tqpalette().active().background()) { _spPx->fill(_prefs->analogBackgroundColor()); } @@ -817,9 +817,9 @@ void FuzzyClock::drawContents(TQPainter *p) } newTimeStr = normalFuzzy[sector]; - int phStart = newTimeStr.find("%"); + int phStart = newTimeStr.tqfind("%"); if (phStart >= 0) { // protect yourself from translations - int phLength = newTimeStr.find(" ", phStart) - phStart; + int phLength = newTimeStr.tqfind(" ", phStart) - phStart; // larrosa: we want the exact length, in case the translation needs it, // in other case, we would cut off the end of the translation. @@ -832,13 +832,13 @@ void FuzzyClock::drawContents(TQPainter *p) realHour = 12 - ((_time.hour() + deltaHour) % 12 + 1); if (realHour==0) { newTimeStr = normalFuzzyOne[sector]; - phStart = newTimeStr.find("%"); + phStart = newTimeStr.tqfind("%"); // larrosa: Note that length is the same, // so we only have to update phStart } if (phStart >= 0) - newTimeStr.replace(phStart, phLength, hourNames[realHour]); - newTimeStr.replace(0, 1, TQString(newTimeStr.at(0).upper())); + newTimeStr.tqreplace(phStart, phLength, hourNames[realHour]); + newTimeStr.tqreplace(0, 1, TQString(newTimeStr.tqat(0).upper())); } } else if (_prefs->fuzzyness() == 3) { newTimeStr = dayTime[_time.hour() / 3]; @@ -865,7 +865,7 @@ void FuzzyClock::drawContents(TQPainter *p) TQRect tr; - if (_applet->getOrientation() == Vertical) + if (_applet->getOrientation() == Qt::Vertical) { p->rotate(90); tr = TQRect(4, -2, height() - 8, -(width()) + 2); @@ -919,12 +919,12 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, setBackgroundOrigin(AncestorOrigin); _dayOfWeek = new TQLabel(this); - _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak); + _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); _dayOfWeek->setBackgroundOrigin(AncestorOrigin); _dayOfWeek->installEventFilter(this); // catch mouse clicks _date = new TQLabel(this); - _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak); + _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); _date->setBackgroundOrigin(AncestorOrigin); _date->installEventFilter(this); // catch mouse clicks @@ -991,18 +991,18 @@ int ClockApplet::widthForHeight(int h) const bool mustShowDate = showDate || (zone->zoneIndex() != 0); if (mustShowDate) { - _date->setAlignment(AlignVCenter | AlignHCenter); + _date->tqsetAlignment(AlignVCenter | AlignHCenter); if (!dateToSide) { - shareDateHeight = _date->sizeHint().height(); + shareDateHeight = _date->tqsizeHint().height(); } } if (showDayOfWeek) { - _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter); + _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter); if (!dateToSide) { - shareDayOfWeekHeight = _dayOfWeek->sizeHint().height(); + shareDayOfWeekHeight = _dayOfWeek->tqsizeHint().height(); } } @@ -1018,8 +1018,8 @@ int ClockApplet::widthForHeight(int h) const } else { - int dateWidth = mustShowDate ? _date->sizeHint().width() + 4 : 0; - int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->sizeHint().width() + 4 : 0; + int dateWidth = mustShowDate ? _date->tqsizeHint().width() + 4 : 0; + int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->tqsizeHint().width() + 4 : 0; if (dateToSide) { @@ -1075,13 +1075,13 @@ int ClockApplet::widthForHeight(int h) const _clock->widget()->move(0, 0); if (showDayOfWeek) { - _dayOfWeek->setFixedSize(w, _dayOfWeek->sizeHint().height()); + _dayOfWeek->setFixedSize(w, _dayOfWeek->tqsizeHint().height()); _dayOfWeek->move(0, _clock->widget()->height()); } if (mustShowDate) { - _date->setFixedSize(w, _date->sizeHint().height()); + _date->setFixedSize(w, _date->tqsizeHint().height()); _date->move(0, _clock->widget()->height() + shareDayOfWeekHeight); } } @@ -1105,16 +1105,16 @@ int ClockApplet::heightForWidth(int w) const // add 4 pixels in height for each of date+dayOfWeek, if visible if (showDayOfWeek) { - if (_dayOfWeek->minimumSizeHint().width() > w) + if (_dayOfWeek->tqminimumSizeHint().width() > w) { - _dayOfWeek->setAlignment(AlignVCenter | WordBreak); + _dayOfWeek->tqsetAlignment(AlignVCenter | WordBreak); } else { - _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak); + _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); } - _dayOfWeek->setFixedSize(w, _dayOfWeek->minimumSizeHint().height()); + _dayOfWeek->setFixedSize(w, _dayOfWeek->tqminimumSizeHint().height()); _dayOfWeek->move(0, clockHeight); clockHeight += _dayOfWeek->height(); @@ -1127,24 +1127,24 @@ int ClockApplet::heightForWidth(int w) const // display on panel that is too narrow and then they made it wider const_cast(this)->updateDateLabel(false); - if (_date->minimumSizeHint().width() > w) + if (_date->tqminimumSizeHint().width() > w) { TQString dateStr = _date->text(); // if we're too wide to fit, replace the first non-digit from the end with a space - int p = dateStr.findRev(TQRegExp("[^0-9]")); + int p = dateStr.tqfindRev(TQRegExp("[^0-9]")); if (p > 0) { _date->setText(dateStr.insert(p, '\n')); } } - if (_date->minimumSizeHint().width() > w) + if (_date->tqminimumSizeHint().width() > w) { - _date->setAlignment(AlignVCenter | WordBreak); + _date->tqsetAlignment(AlignVCenter | WordBreak); } else { - _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak); + _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); } _date->setFixedSize(w, _date->heightForWidth(w)); _date->move(0, clockHeight); @@ -1180,7 +1180,7 @@ void ClockApplet::preferences(bool timezone) void ClockApplet::updateFollowBackground() { - TQColor globalBgroundColor = KApplication::palette().active().background(); + TQColor globalBgroundColor = KApplication::tqpalette().active().background(); TQColor bgColor; switch (_prefs->type()) @@ -1283,7 +1283,7 @@ void ClockApplet::reconfigure() _clock->widget()->installEventFilter(this); // catch mouse clicks _clock->widget()->show(); - _clock->forceUpdate(); /* force repaint */ + _clock->forceUpdate(); /* force tqrepaint */ if (showDayOfWeek) { @@ -1317,7 +1317,7 @@ void ClockApplet::setTimerTo60() void ClockApplet::setBackground() { - TQColor globalBgroundColor = KApplication::palette().active().background(); + TQColor globalBgroundColor = KApplication::tqpalette().active().background(); TQColor fgColor, bgColor; if (!_clock) @@ -1382,7 +1382,7 @@ void ClockApplet::globalPaletteChange() if (!m_dateFollowBackgroundSetting && !m_followBackgroundSetting) return; - TQColor globalBgroundColor = KApplication::palette().active().background(); + TQColor globalBgroundColor = KApplication::tqpalette().active().background(); if (m_dateFollowBackgroundSetting) _prefs->setDateBackgroundColor(globalBgroundColor); @@ -1552,15 +1552,15 @@ void ClockApplet::aboutToShowContextMenu() menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) ); KLocale *loc = KGlobal::locale(); - TQDateTime dt = TQDateTime::currentDateTime(); - dt = dt.addSecs(TZoffset); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); + dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset)); KPopupMenu *copyMenu = new KPopupMenu( menu ); copyMenu->insertItem(loc->formatDateTime(dt), 201); - copyMenu->insertItem(loc->formatDate(dt.date()), 202); - copyMenu->insertItem(loc->formatDate(dt.date(), true), 203); - copyMenu->insertItem(loc->formatTime(dt.time()), 204); - copyMenu->insertItem(loc->formatTime(dt.time(), true), 205); + copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date())), 202); + copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date()), true), 203); + copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time())), 204); + copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time()), true), 205); copyMenu->insertItem(dt.date().toString(), 206); copyMenu->insertItem(dt.time().toString(), 207); copyMenu->insertItem(dt.toString(), 208); @@ -1579,7 +1579,7 @@ void ClockApplet::aboutToShowContextMenu() } else { - zoneMenu->insertItem(i18n(zone->zone(i).utf8()).replace("_", " "), 500 + i); + zoneMenu->insertItem(i18n(zone->zone(i).utf8()).tqreplace("_", " "), 500 + i); } } zoneMenu->setItemChecked(500 + zone->zoneIndex(),true); @@ -1621,12 +1621,12 @@ void ClockApplet::slotCopyMenuActivated( int id ) TQTime ClockApplet::clockGetTime() { - return TQTime::currentTime().addSecs(TZoffset); + return TQT_TQTIME_OBJECT(TQTime::currentTime().addSecs(TZoffset)); } TQDate ClockApplet::clockGetDate() { - return TQDateTime::currentDateTime().addSecs(TZoffset).date(); + return TQT_TQDATE_OBJECT(TQDateTime::tqcurrentDateTime().addSecs(TZoffset).date()); } void ClockApplet::showZone(int z) @@ -1634,7 +1634,7 @@ void ClockApplet::showZone(int z) zone->setZone(z); TZoffset = zone->calc_TZ_offset( zone->zone() ); updateDateLabel(); - _clock->forceUpdate(); /* force repaint */ + _clock->forceUpdate(); /* force tqrepaint */ } void ClockApplet::nextZone() @@ -1653,13 +1653,13 @@ void ClockApplet::mousePressEvent(TQMouseEvent *ev) { switch (ev->button()) { - case TQMouseEvent::LeftButton: + case Qt::LeftButton: toggleCalendar(); break; - case TQMouseEvent::RightButton: + case Qt::RightButton: openContextMenu(); break; - case TQMouseEvent::MidButton: + case Qt::MidButton: nextZone(); TQToolTip::remove(_clock->widget()); break; @@ -1686,10 +1686,10 @@ void ClockApplet::wheelEvent(TQWheelEvent* e) // catch the mouse clicks of our child widgets bool ClockApplet::eventFilter( TQObject *o, TQEvent *e ) { - if (( o == _clock->widget() || o == _date || o == _dayOfWeek) && + if (( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_clock->widget()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_date) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_dayOfWeek)) && e->type() == TQEvent::MouseButtonPress ) { - mousePressEvent(static_cast(e) ); + mousePressEvent(TQT_TQMOUSEEVENT(e) ); return true; } @@ -1710,7 +1710,7 @@ void ClockApplet::updateDateLabel(bool reLayout) if (zone->zoneIndex() != 0) { TQString zone_s = i18n(zone->zone().utf8()); - _date->setText(zone_s.mid(zone_s.find('/') + 1).replace("_", " ")); + _date->setText(zone_s.mid(zone_s.tqfind('/') + 1).tqreplace("_", " ")); _date->setShown(true); } else @@ -1748,7 +1748,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data) if (!activeZone.isEmpty()) { activeZone = i18n(activeZone.utf8()); - data.subtext.append("
    ").append(activeZone.mid(activeZone.find('/') + 1).replace("_", " ")); + data.subtext.append("
    ").append(activeZone.mid(activeZone.tqfind('/') + 1).tqreplace("_", " ")); } } else @@ -1771,7 +1771,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data) if (activeIndex == i) { - data.message = m_zone.mid(m_zone.find('/') + 1).replace("_", " "); + data.message = m_zone.mid(m_zone.tqfind('/') + 1).tqreplace("_", " "); data.message += " " + _time + "
    " + _date; } else @@ -1782,7 +1782,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data) } else { - data.subtext += "" + m_zone.mid(m_zone.find('/') + 1).replace("_", " ") + ""; + data.subtext += "" + m_zone.mid(m_zone.tqfind('/') + 1).tqreplace("_", " ") + ""; } data.subtext += " " + _time + ", " + _date + "
    "; } @@ -1851,7 +1851,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) (m_clock->type() == Prefs::EnumType::Analog) ) { // show full time (incl. hour) as tooltip for Fuzzy clock - tipText = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset)); + tipText = KGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::tqcurrentDateTime().addSecs(m_clock->TZoffset))); } else { diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h index 144fb50c6..498ce4b9d 100644 --- a/kicker/applets/clock/clock.h +++ b/kicker/applets/clock/clock.h @@ -246,7 +246,7 @@ class FuzzyClock : public TQFrame, public ClockWidget bool alreadyDrawing; }; -class ClockAppletToolTip : public QToolTip +class ClockAppletToolTip : public TQToolTip { public: ClockAppletToolTip( ClockApplet* clock ); diff --git a/kicker/applets/clock/clockapplet.kcfg b/kicker/applets/clock/clockapplet.kcfg index fb38d6583..ed375d03a 100644 --- a/kicker/applets/clock/clockapplet.kcfg +++ b/kicker/applets/clock/clockapplet.kcfg @@ -20,11 +20,11 @@ - KApplication::palette().active().text() + KApplication::tqpalette().active().text() - KApplication::palette().active().background() + KApplication::tqpalette().active().background() @@ -63,11 +63,11 @@ defFont.setBold(true); - KApplication::palette().active().text() + KApplication::tqpalette().active().text() - KApplication::palette().active().background() + KApplication::tqpalette().active().background() @@ -89,15 +89,15 @@ defFont.setBold(true); - KApplication::palette().active().text() + KApplication::tqpalette().active().text() - KApplication::palette().active().background() + KApplication::tqpalette().active().background() - KApplication::palette().active().mid() + KApplication::tqpalette().active().mid() @@ -127,15 +127,15 @@ defFont.setBold(true); - KApplication::palette().active().text() + KApplication::tqpalette().active().text() - KApplication::palette().active().background() + KApplication::tqpalette().active().background() - KApplication::palette().active().mid() + KApplication::tqpalette().active().mid() @@ -168,11 +168,11 @@ defFont=KGlobalSettings::generalFont(); - KApplication::palette().active().text() + KApplication::tqpalette().active().text() - KApplication::palette().active().background() + KApplication::tqpalette().active().background() diff --git a/kicker/applets/clock/datepicker.cpp b/kicker/applets/clock/datepicker.cpp index 3864db556..3f5d5b4ed 100644 --- a/kicker/applets/clock/datepicker.cpp +++ b/kicker/applets/clock/datepicker.cpp @@ -33,9 +33,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. DatePicker::DatePicker(TQWidget *parent, const TQDate& date, Prefs* _prefs) : TQVBox( parent, 0, _prefs->calendarFullWindow() - ? (WType_TopLevel | WDestructiveClose | + ? (WFlags)(WType_TopLevel | WDestructiveClose | WStyle_StaysOnTop) - : (WStyle_Customize | WStyle_NoBorder | + : (WFlags)(WStyle_Customize | WStyle_NoBorder | WType_TopLevel | WDestructiveClose | WStyle_StaysOnTop) ), prefs(_prefs) diff --git a/kicker/applets/clock/datepicker.h b/kicker/applets/clock/datepicker.h index f2e8a3397..60ca765f7 100644 --- a/kicker/applets/clock/datepicker.h +++ b/kicker/applets/clock/datepicker.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KDatePicker; class Prefs; -class DatePicker : public QVBox +class DatePicker : public TQVBox { public: DatePicker(TQWidget*, const TQDate&, Prefs* _prefs); diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui index 256bca99b..ab90a6438 100644 --- a/kicker/applets/clock/digital.ui +++ b/kicker/applets/clock/digital.ui @@ -1,6 +1,6 @@ DigitalWidget - + DigitalWidget @@ -19,7 +19,7 @@ 0 - + ButtonGroup2_3 @@ -30,7 +30,7 @@ unnamed - + kcfg_DigitalShowDate @@ -41,7 +41,7 @@ true     - + kcfg_DigitalShowSeconds @@ -49,7 +49,7 @@ Seco&nds     - + kcfg_DigitalShowDayOfWeek @@ -57,7 +57,7 @@ Da&y of week - + kcfg_DigitalBlink @@ -65,7 +65,7 @@ Blin&king dots - + kcfg_DigitalShowFrame @@ -83,7 +83,7 @@ Expanding - + 20 20 @@ -92,7 +92,7 @@ - + groupBox1 @@ -103,7 +103,7 @@ unnamed - + kcfg_DigitalLCDStyle @@ -114,7 +114,7 @@ false - + layout14 @@ -122,7 +122,7 @@ unnamed - + Foreground_ColorL @@ -147,7 +147,7 @@ - + backgroundDigitalLabel @@ -193,14 +193,14 @@ Expanding - + 110 20 - + Shadow_ColorL @@ -226,7 +226,7 @@ Expanding - + 20 20 diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui index 04e910340..ebe6af9fc 100644 --- a/kicker/applets/clock/fuzzy.ui +++ b/kicker/applets/clock/fuzzy.ui @@ -1,6 +1,6 @@ FuzzyWidget - + FuzzyWidget @@ -19,7 +19,7 @@ 0 - + GroupBox1 @@ -42,7 +42,7 @@ 6 - + kcfg_FuzzyShowDate @@ -53,7 +53,7 @@ true - + kcfg_FuzzyShowDayOfWeek @@ -61,7 +61,7 @@ Da&y of week - + kcfg_FuzzyShowFrame @@ -79,7 +79,7 @@ Expanding - + 40 20 @@ -88,7 +88,7 @@ - + groupBox2 @@ -109,14 +109,14 @@ Expanding - + 20 30 - + textLabel1 @@ -124,7 +124,7 @@ Font: - + layout11 @@ -132,7 +132,7 @@ unnamed - + TextLabel1_2_3_4_3 @@ -153,14 +153,14 @@ Expanding - + 51 20 - + TextLabel1_4_3_2 @@ -189,7 +189,7 @@ - + Layout7_3 @@ -197,7 +197,7 @@ unnamed - + TextLabel4_3 @@ -205,7 +205,7 @@ Low - + kcfg_Fuzzyness @@ -231,7 +231,7 @@ 1 - + TextLabel5_3 @@ -241,7 +241,7 @@ - + TextLabel3_3 diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui index 215aa5433..53e9c80cd 100644 --- a/kicker/applets/clock/settings.ui +++ b/kicker/applets/clock/settings.ui @@ -1,6 +1,6 @@ SettingsWidget - + SettingsWidget @@ -19,11 +19,11 @@ 0 - + tabs - + tab @@ -34,7 +34,7 @@ unnamed - + layout14 @@ -42,7 +42,7 @@ unnamed - + TextLabel1 @@ -59,7 +59,7 @@ clockCombo - + Plain Clock @@ -102,7 +102,7 @@ Expanding - + 20 20 @@ -111,14 +111,14 @@ - + widgetStack 0 - + page @@ -132,7 +132,7 @@ 0 - + ButtonGroup2_3_2_2 @@ -143,7 +143,7 @@ unnamed - + kcfg_PlainShowDate @@ -154,7 +154,7 @@ true - + kcfg_PlainShowSeconds @@ -162,7 +162,7 @@ &Seconds - + kcfg_PlainShowDayOfWeek @@ -170,7 +170,7 @@ Da&y of week - + kcfg_PlainShowFrame @@ -188,7 +188,7 @@ Expanding - + 20 20 @@ -197,7 +197,7 @@ - + groupBox2 @@ -208,7 +208,7 @@ unnamed - + TextLabel1_3_3_2 @@ -224,7 +224,7 @@ Font: - + TextLabel1_2_3_4_3_2 @@ -260,7 +260,7 @@ - + TextLabel1_4_3_2_2 @@ -284,7 +284,7 @@ Expanding - + 230 20 @@ -306,7 +306,7 @@ Expanding - + 20 20 @@ -318,7 +318,7 @@ - + dateBox @@ -337,7 +337,7 @@ - + textLabel1_3 @@ -353,7 +353,7 @@ - + textLabel2 @@ -371,14 +371,14 @@ Expanding - + 343 20 - + layout2 @@ -386,7 +386,7 @@ unnamed - + textLabel4 @@ -421,7 +421,7 @@ Expanding - + 20 100 @@ -430,7 +430,7 @@ - + tab diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp index 320d84b4c..48cce1ccb 100644 --- a/kicker/applets/clock/zone.cpp +++ b/kicker/applets/clock/zone.cpp @@ -105,7 +105,7 @@ void Zone::readZoneList(KListView *listView ) if (!comment.isEmpty()) comment = i18n(comment.utf8()); - const TQStringList KontCity = TQStringList::split("/", i18n(tzName.utf8()).replace("_", " ")); + const TQStringList KontCity = TQStringList::split("/", i18n(tzName.utf8()).tqreplace("_", " ")); TQListViewItem* Kontinent = KontinentMap[KontCity[0]]; if (!Kontinent) { KontinentMap[KontCity[0]] = new TQListViewItem(listView, KontCity[0]); @@ -117,7 +117,7 @@ void Zone::readZoneList(KListView *listView ) li->setText(1, comment); li->setText(2, tzName); /* store complete path in ListView */ - if (_remotezonelist.findIndex(tzName) != -1) + if (_remotezonelist.tqfindIndex(tzName) != -1) li->setOn(true); // locate the flag from /l10n/%1/flag.png @@ -151,7 +151,7 @@ void Zone::getSelectedZonelist(KListView *listView) root = root->nextSibling(); continue; } - root = root->parent(); + root = root->tqparent(); if (root) root = root->nextSibling(); } diff --git a/kicker/applets/launcher/configdlgbase.ui b/kicker/applets/launcher/configdlgbase.ui index bfb1bc4e6..49916ebeb 100644 --- a/kicker/applets/launcher/configdlgbase.ui +++ b/kicker/applets/launcher/configdlgbase.ui @@ -1,6 +1,6 @@ ConfigDlgBase - + ConfigDlgBase @@ -19,7 +19,7 @@ 0 - + kcfg_DragEnabled @@ -27,7 +27,7 @@ Allow drag and drop - + groupBox2 @@ -38,7 +38,7 @@ unnamed - + kcfg_ConserveSpace @@ -49,7 +49,7 @@ Do not expand icons to the size of the panel - + textLabel1_2 @@ -57,7 +57,7 @@ Icon size: - + iconDim @@ -75,7 +75,7 @@ Expanding - + 332 20 @@ -84,7 +84,7 @@ - + autoAdjustGroup @@ -95,7 +95,7 @@ unnamed - + layout1 @@ -103,7 +103,7 @@ unnamed - + kcfg_HistoryHorizon @@ -130,38 +130,38 @@ Expanding - + 140 20 - + textLabel1 Short Term - + AlignCenter - + textLabel2 Long Term - + AlignCenter - + textLabel3 @@ -184,7 +184,7 @@ Expanding - + 50 20 @@ -196,7 +196,7 @@ kcfg_AutoAdjustMaxItems - + textLabel3_2 @@ -204,7 +204,7 @@ Minimum number of applications: - + kcfg_AutoAdjustEnabled diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp index 0eebec315..7dcb16098 100644 --- a/kicker/applets/launcher/quickaddappsmenu.cpp +++ b/kicker/applets/launcher/quickaddappsmenu.cpp @@ -53,7 +53,7 @@ QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQS void QuickAddAppsMenu::slotExec(int id) { - if (!entryMap_.contains(id)) return; + if (!entryMap_.tqcontains(id)) return; KSycocaEntry * e = entryMap_[id]; KService::Ptr service = static_cast(e); emit addAppBefore(locate("apps", service->desktopEntryPath()),_sender); diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 2ac0742ca..6e68e2ce1 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -67,7 +67,7 @@ QuickURL::QuickURL(const TQString &u) if (_menuId.endsWith(".desktop")) { // Strip path TQString s = _menuId; - s = s.mid(s.findRev('/')+1); + s = s.mid(s.tqfindRev('/')+1); s = s.left(s.length()-8); _service = KService::serviceByStorageId(s); if (!_service) { @@ -121,7 +121,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group, { // Load icon TQPixmap pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state); // Resize to fit button - pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQImage::ScaleMin)); + pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQ_ScaleMin)); return pxmap; } @@ -140,7 +140,7 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction, TQToolTip::add(this, _qurl->name()); resize(int(DEFAULT_ICON_DIM),int(DEFAULT_ICON_DIM)); - TQBrush bgbrush(colorGroup().brush(TQColorGroup::Background)); + TQBrush bgbrush(tqcolorGroup().brush(TQColorGroup::Background)); QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu( parent, this, _qurl->url()); @@ -152,7 +152,7 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction, this, TQT_SLOT(removeApp())); m_stickyAction = new KToggleAction(i18n("Never Remove Automatically"), - KShortcut(), this); + KShortcut(), TQT_TQOBJECT(this)); connect(m_stickyAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotStickyToggled(bool))); m_stickyAction->plug(_popup, 2); @@ -197,9 +197,9 @@ void QuickButton::resizeEvent(TQResizeEvent *e) void QuickButton::mousePressEvent(TQMouseEvent *e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) _popup->popup(e->globalPos()); - else if (e->button() == LeftButton) { + else if (e->button() == Qt::LeftButton) { _dragPos = e->pos(); TQButton::mousePressEvent(e); } @@ -207,7 +207,7 @@ void QuickButton::mousePressEvent(TQMouseEvent *e) void QuickButton::mouseMoveEvent(TQMouseEvent *e) { - if ((e->state() & LeftButton) == 0) return; + if ((e->state() & Qt::LeftButton) == 0) return; TQPoint p(e->pos() - _dragPos); if (p.manhattanLength() <= KGlobalSettings::dndEventDelay()) return; diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index a278b39c9..9c1228a2d 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -108,7 +108,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions, m_dragButtons = 0; m_configAction = new KAction(i18n("Configure Quicklauncher..."), "configure", KShortcut(), - this, TQT_SLOT(slotConfigure()), this); + TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this)); m_saveTimer = new TQTimer(this, "m_saveTimer"); connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig())); @@ -503,7 +503,7 @@ void QuickLauncher::about() void QuickLauncher::mousePressEvent(TQMouseEvent *e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) { m_popup->popup(e->globalPos()); } @@ -828,7 +828,7 @@ void QuickLauncher::loadConfig() for (n=0; nsize()); ++n) { QuickButton* button = (*m_buttons)[n]; - if (volatileButtons.contains(button->menuId()) == false) + if (volatileButtons.tqcontains(button->menuId()) == false) { button->setSticky(true); } @@ -1040,19 +1040,19 @@ void QuickLauncher::updateStickyHighlightLayer() m_stickyHighlightLayer = TQImage(width(), height(), 32); m_stickyHighlightLayer.setAlphaBuffer(true); int pix, tlPix, brPix, w(width()), h(height()); - QRgb transparent(qRgba(0, 0, 0, 0)); + QRgb transparent(tqRgba(0, 0, 0, 0)); for (int y = h-1; y >= 0; --y) { for (int x = w-1; x >= 0; --x) { - pix = qRed(areaLayer.pixel(x, y)); + pix = tqRed(areaLayer.pixel(x, y)); if (pix == 0) { - tlPix = (y>0 && x>0) ? qRed(areaLayer.pixel(x-1,y-1)) : 255; - brPix = (y0 && x>0) ? tqRed(areaLayer.pixel(x-1,y-1)) : 255; + brPix = (yauthorize("logout")) logoutButton->hide(); - lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); - logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); + lockButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); + logoutButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); @@ -113,17 +113,17 @@ Lockout::~Lockout() // direction and wasting a lot of space. void Lockout::checkLayout( int height ) const { - TQSize s = minimumSizeHint(); + TQSize s = tqminimumSizeHint(); TQBoxLayout::Direction direction = layout->direction(); if ( direction == TQBoxLayout::LeftToRight && - ( ( orientation() == Vertical && s.width() - 2 >= height ) || - ( orientation() == Horizontal && s.width() - 2 < height ) ) ) { + ( ( orientation() == Qt::Vertical && s.width() - 2 >= height ) || + ( orientation() == Qt::Horizontal && s.width() - 2 < height ) ) ) { layout->setDirection( TQBoxLayout::TopToBottom ); } else if ( direction == TQBoxLayout::TopToBottom && - ( ( orientation() == Vertical && s.height() - 2 < height ) || - ( orientation() == Horizontal && s.height() - 2 >= height ) ) ) { + ( ( orientation() == Qt::Vertical && s.height() - 2 < height ) || + ( orientation() == Qt::Horizontal && s.height() - 2 >= height ) ) ) { layout->setDirection( TQBoxLayout::LeftToRight ); } } @@ -131,13 +131,13 @@ void Lockout::checkLayout( int height ) const int Lockout::widthForHeight( int height ) const { checkLayout( height ); - return sizeHint().width(); + return tqsizeHint().width(); } int Lockout::heightForWidth( int width ) const { checkLayout( width ); - return sizeHint().height(); + return tqsizeHint().height(); } void Lockout::lock() @@ -146,7 +146,7 @@ void Lockout::lock() int kicker_screen_number = qt_xscreen(); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", ""); + kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); } void Lockout::logout() @@ -177,9 +177,9 @@ void Lockout::mouseMoveEvent(TQMouseEvent* e) void Lockout::propagateMouseEvent(TQMouseEvent* e) { if ( !isTopLevel() ) { - TQMouseEvent me(e->type(), mapTo( topLevelWidget(), e->pos() ), + TQMouseEvent me(e->type(), mapTo( tqtopLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); - TQApplication::sendEvent( topLevelWidget(), &me ); + TQApplication::sendEvent( tqtopLevelWidget(), &me ); } } @@ -193,10 +193,10 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e ) KConfig *conf = config(); conf->setGroup("lockout"); - TQMouseEvent *me = static_cast( e ); - if( me->button() == TQMouseEvent::RightButton ) + TQMouseEvent *me = TQT_TQMOUSEEVENT( e ); + if( me->button() == Qt::RightButton ) { - if( o == lockButton ) + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lockButton) ) { TQPopupMenu *popup = new TQPopupMenu(); @@ -219,7 +219,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e ) return true; } - else if ( o == logoutButton ) + else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(logoutButton) ) { TQPopupMenu *popup = new TQPopupMenu(); diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index b137b5d5c..25b5869ff 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -154,7 +154,7 @@ void MediaApplet::arrangeButtons() MediumButton *button = *it; button_size = std::max(button_size, - orientation() == Vertical ? + orientation() == Qt::Vertical ? button->heightForWidth(width()) : button->widthForHeight(height()) ); // button->widthForHeight(height()) : @@ -162,7 +162,7 @@ void MediaApplet::arrangeButtons() } int kicker_size; - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) { kicker_size = width(); } @@ -200,7 +200,7 @@ void MediaApplet::arrangeButtons() ++pack_count; - if(orientation() == Vertical) + if(orientation() == Qt::Vertical) { if (pack_count < max_packed_buttons) { @@ -285,7 +285,7 @@ void MediaApplet::slotNewItems(const KFileItemList &entries) } } - if(!found && !mExcludedList.contains(it.current()->url().url()) ) + if(!found && !mExcludedList.tqcontains(it.current()->url().url()) ) { MediumButton *button = new MediumButton(this, *it.current()); button->show(); @@ -336,7 +336,7 @@ void MediaApplet::slotRefreshItems(const KFileItemList &entries) if(button->fileItem().url()==(*it.current()).url()) { - if(mExcludedTypesList.contains(mimetype)) + if(mExcludedTypesList.tqcontains(mimetype)) { mButtonList.remove(button); delete button; @@ -350,7 +350,7 @@ void MediaApplet::slotRefreshItems(const KFileItemList &entries) } } - if(!found && !mExcludedTypesList.contains(mimetype) && !mExcludedList.contains(it.current()->url().url()) ) + if(!found && !mExcludedTypesList.tqcontains(mimetype) && !mExcludedList.tqcontains(it.current()->url().url()) ) { MediumButton *button = new MediumButton(this, *it.current()); button->show(); @@ -425,7 +425,7 @@ void MediaApplet::reloadList() void MediaApplet::mousePressEvent(TQMouseEvent *e) { - if(e->button()==RightButton) + if(e->button()==Qt::RightButton) { KPopupMenu menu(this); diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index 0fae43441..1e71fbd6f 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -45,13 +45,13 @@ #include MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) - : PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem), mOpenTimer(0, + : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0, "MediumButton::mOpenTimer") { - KAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()), + KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), &mActions, "pasteto"); a->setShortcut(0); - a = KStdAction::copy(this, TQT_SLOT(slotCopy()), &mActions, "copy"); + a = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), &mActions, "copy"); a->setShortcut(0); setBackgroundOrigin(AncestorOrigin); @@ -145,7 +145,7 @@ void MediumButton::slotCopy() { KonqDrag * obj = KonqDrag::newDrag(mFileItem.url(), false); - TQApplication::clipboard()->setData( obj ); + TQApplication::tqclipboard()->setData( obj ); } void MediumButton::dragEnterEvent(TQDragEnterEvent* e) diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp index 8d9cdcc94..3833f5062 100644 --- a/kicker/applets/media/preferencesdialog.cpp +++ b/kicker/applets/media/preferencesdialog.cpp @@ -26,7 +26,7 @@ #include #include -class MediumTypeItem : public QCheckListItem +class MediumTypeItem : public TQCheckListItem { public: MediumTypeItem(TQListView *parent, const TQString name, @@ -40,7 +40,7 @@ private: TQString mMimeType; }; -class MediumItem : public QCheckListItem +class MediumItem : public TQCheckListItem { public: MediumItem(TQListView *parent, const TQString name, @@ -125,7 +125,7 @@ void PreferencesDialog::setExcludedMediumTypes(TQStringList excludedTypesList) { if ((*it)->name().startsWith("media/")) { - bool ok=excludedTypesList.contains((*it)->name())==0; + bool ok=excludedTypesList.tqcontains((*it)->name())==0; MediumTypeItem *item = new MediumTypeItem(mpMediumTypesListView, (*it)->comment(), (*it)->name()); item->setOn(ok); } @@ -156,7 +156,7 @@ void PreferencesDialog::setExcludedMedia(TQStringList excludedList) { ++it; - bool ok = excludedList.contains(file->url().url())==0; + bool ok = excludedList.tqcontains(file->url().url())==0; MediumItem *item = new MediumItem(mpMediaListView, file->text(), *file); item->setOn(ok); diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index 472f3bd0d..662859bd5 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. This is because TQMenuBar tries really hard to keep its preffered size, se even if the X window for the menubar has the size enforced by this applet, Qt thinks it has the size Qt wants. This results in parts - of the menubar not being repainted. Also, old KMenuBar always forced + of the menubar not being tqrepainted. Also, old KMenuBar always forced with to be the width of the screen, so even if the menubar has only few entries, this applet will still indicate the menubar doesn't fit completely in it. There's no way to fix this, besides upgrading @@ -266,7 +266,7 @@ void Applet::positionChange( Position ) // Kicker's frame). void Applet::updateTopEdgeOffset() { - TQPoint p = topLevelWidget()->mapToGlobal( TQPoint( 0, 0 )); + TQPoint p = tqtopLevelWidget()->mapToGlobal( TQPoint( 0, 0 )); if( p.y() <= 2 ) // 2 = work also when running in appletproxy topEdgeOffset = mapToGlobal( TQPoint( 0, 0 )).y() - p.y(); else @@ -489,12 +489,12 @@ void MenuEmbed::setMinimumSize( int w, int h ) void MenuEmbed::setBackground() { - const TQPixmap *pbg = parentWidget()->backgroundPixmap(); + const TQPixmap *pbg = tqparentWidget()->backgroundPixmap(); if (pbg) { TQPixmap bg(width(), height()); - bg.fill(parentWidget(), pos()); + bg.fill(tqparentWidget(), pos()); setPaletteBackgroundPixmap(bg); setBackgroundOrigin(WidgetOrigin); } diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index dc2431e15..6975af0c0 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -114,7 +114,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, setFont( KGlobalSettings::taskbarFont() ); - m_kwin = new KWinModule(this); + m_kwin = new KWinModule(TQT_TQOBJECT(this)); m_activeWindow = m_kwin->activeWindow(); m_curDesk = m_kwin->currentDesktop(); @@ -365,8 +365,8 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) if( m_desktopLayoutOwner == NULL ) { // must own manager selection before setting global desktop layout int screen = DefaultScreen( qt_xdisplay()); - m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(), - screen, this ); + m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).tqarg( screen ).latin1(), + screen, TQT_TQOBJECT(this) ); if( !m_desktopLayoutOwner->claim( false )) { delete m_desktopLayoutOwner; @@ -381,7 +381,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) void KMiniPager::resizeEvent(TQResizeEvent*) { - bool horiz = orientation() == Horizontal; + bool horiz = orientation() == Qt::Horizontal; int deskNum = m_desktops.count(); int rowNum = m_settings->numberOfRows(); @@ -723,7 +723,7 @@ void KMiniPager::aboutToShowContextMenu() rowMenu->insertItem(i18n("two rows or columns", "&2"), 2 + rowOffset); rowMenu->insertItem( i18n("three rows or columns", "&3"), 3 + rowOffset); connect(rowMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); - showMenu->insertItem((orientation()==Horizontal) ? i18n("&Rows"): + showMenu->insertItem((orientation()==Qt::Horizontal) ? i18n("&Rows"): i18n("&Columns"), rowMenu); @@ -865,7 +865,7 @@ void KMiniPager::slotDesktopNamesChanged() { TQString name = m_kwin->desktopName(i); (*it)->setDesktopName(name); - (*it)->repaint(); + (*it)->tqrepaint(); TQToolTip::remove((*it)); TQToolTip::add((*it), name); } diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index 10a5aa8c9..77d751a07 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -157,8 +157,8 @@ bool KMiniPagerButton::shouldPaintWindow( KWin::WindowInfo *info ) const TQRect r = mapGeometryToViewport(*info); if (!info->hasState(NET::Sticky) && - !TQApplication::desktop()->geometry().contains(r.topLeft()) && - !TQApplication::desktop()->geometry().contains(r.topRight())) + !TQApplication::desktop()->tqgeometry().tqcontains(r.topLeft()) && + !TQApplication::desktop()->tqgeometry().tqcontains(r.topRight())) return false; } @@ -404,16 +404,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp) // transparent windows get an 1 pixel frame... if (on) { - bp->setPen(colorGroup().midlight()); + bp->setPen(tqcolorGroup().midlight()); } else if (down) { - bp->setPen(KickerLib::blendColors(colorGroup().mid(), - colorGroup().midlight())); + bp->setPen(KickerLib::blendColors(tqcolorGroup().mid(), + tqcolorGroup().midlight())); } else { - bp->setPen(colorGroup().dark()); + bp->setPen(tqcolorGroup().dark()); } bp->drawRect(0, 0, w, h); @@ -424,16 +424,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp) if (on) { - background = colorGroup().brush(TQColorGroup::Midlight); + background = tqcolorGroup().brush(TQColorGroup::Midlight); } else if (down) { - background = KickerLib::blendColors(colorGroup().mid(), - colorGroup().midlight()); + background = TQBrush(KickerLib::blendColors(tqcolorGroup().mid(), + tqcolorGroup().midlight())); } else { - background = colorGroup().brush(TQColorGroup::Mid); + background = tqcolorGroup().brush(TQColorGroup::Mid); } bp->fillRect(0, 0, w, h, background); @@ -462,12 +462,12 @@ void KMiniPagerButton::drawButton(TQPainter *bp) if (kwin->activeWindow() == info->win()) { - TQBrush brush = colorGroup().brush(TQColorGroup::Highlight); - qDrawShadeRect(bp, r, colorGroup(), false, 1, 0, &brush); + TQBrush brush = tqcolorGroup().brush(TQColorGroup::Highlight); + qDrawShadeRect(bp, r, tqcolorGroup(), false, 1, 0, &brush); } else { - TQBrush brush = colorGroup().brush(TQColorGroup::Button); + TQBrush brush = tqcolorGroup().brush(TQColorGroup::Button); if (on) { @@ -475,7 +475,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) } bp->fillRect(r, brush); - qDrawShadeRect(bp, r, colorGroup(), true, 1, 0); + qDrawShadeRect(bp, r, tqcolorGroup(), true, 1, 0); } if (m_pager->windowIcons() && r.width() > 15 && r.height() > 15) @@ -498,11 +498,11 @@ void KMiniPagerButton::drawButton(TQPainter *bp) // makes it look a bit more finished. if (on) { - bp->setPen(colorGroup().midlight()); + bp->setPen(tqcolorGroup().midlight()); } else { - bp->setPen(colorGroup().mid()); + bp->setPen(tqcolorGroup().mid()); } bp->drawRect(0, 0, w, h); @@ -515,7 +515,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) if (transparent || liveBkgnd) { - bp->setPen(on ? colorGroup().midlight() : colorGroup().buttonText()); + bp->setPen(on ? tqcolorGroup().midlight() : tqcolorGroup().buttonText()); m_pager->shadowEngine()->drawText(*bp, TQRect(0, 0, w, h), AlignCenter, label, size()); } else @@ -523,15 +523,15 @@ void KMiniPagerButton::drawButton(TQPainter *bp) } if (m_inside) - KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), colorGroup().foreground()); + KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), tqcolorGroup().foreground()); } void KMiniPagerButton::mousePressEvent(TQMouseEvent * e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) { // prevent LMB down -> RMB down -> LMB up sequence - if ((e->state() & MouseButtonMask ) == NoButton) + if ((e->state() & Qt::MouseButtonMask ) == Qt::NoButton) { emit showMenu(e->globalPos(), m_desktop); return; @@ -586,9 +586,9 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e) TQPixmap windowImage(ww, wh); TQPainter bp(&windowImage, this); - bp.setPen(colorGroup().foreground()); + bp.setPen(tqcolorGroup().foreground()); bp.drawRect(0, 0, ww, wh); - bp.fillRect(1, 1, ww - 2, wh - 2, colorGroup().background()); + bp.fillRect(1, 1, ww - 2, wh - 2, tqcolorGroup().background()); Task::List tasklist; tasklist.append(m_currentWindow); @@ -747,7 +747,7 @@ void KMiniPagerButton::slotToggled( bool b ) bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e) { - if (o && o == m_lineEdit && + if (o && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) && (e->type() == TQEvent::FocusOut || e->type() == TQEvent::Hide)) { m_pager->kwin()->setDesktopName( m_desktop, m_lineEdit->text() ); diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index 44f2229ec..05a64b94b 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -72,7 +72,7 @@ NaughtyApplet::NaughtyApplet TQVBoxLayout * layout = new TQVBoxLayout(this); layout->addWidget(button_); - monitor_ = new NaughtyProcessMonitor(2, 20, this); + monitor_ = new NaughtyProcessMonitor(2, 20, TQT_TQOBJECT(this)); connect ( @@ -105,7 +105,7 @@ NaughtyApplet::~NaughtyApplet() void NaughtyApplet::slotWarn(ulong pid, const TQString & name) { - if (ignoreList_.contains(name)) + if (ignoreList_.tqcontains(name)) return; TQString s = i18n("A program called '%1' is slowing down the others " diff --git a/kicker/applets/naughty/NaughtyConfigDialog.cpp b/kicker/applets/naughty/NaughtyConfigDialog.cpp index 57146778d..8b6948a04 100644 --- a/kicker/applets/naughty/NaughtyConfigDialog.cpp +++ b/kicker/applets/naughty/NaughtyConfigDialog.cpp @@ -85,7 +85,7 @@ NaughtyConfigDialog::threshold() const return uint(kini_threshold_->value()); } - QStringList + TQStringList NaughtyConfigDialog::ignoreList() const { TQStringList retval; diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp index 6228cfba1..e8cdaf60f 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp +++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp @@ -164,7 +164,7 @@ NaughtyProcessMonitor::slotTimeout() void NaughtyProcessMonitor::_process(ulong pid, uint load) { - if (!d->loadMap_.contains(pid)) + if (!d->loadMap_.tqcontains(pid)) { d->loadMap_.insert(pid, load); return; @@ -172,12 +172,12 @@ NaughtyProcessMonitor::_process(ulong pid, uint load) uint oldLoad = d->loadMap_[pid]; bool misbehaving = (load - oldLoad) > 40 * (d->interval_ / 1000); - bool wasMisbehaving = d->scoreMap_.contains(pid); + bool wasMisbehaving = d->scoreMap_.tqcontains(pid); if (misbehaving) if (wasMisbehaving) { - d->scoreMap_.replace(pid, d->scoreMap_[pid] + 1); + d->scoreMap_.tqreplace(pid, d->scoreMap_[pid] + 1); if (canKill(pid)) emit(runawayProcess(pid, processName(pid))); } @@ -187,7 +187,7 @@ NaughtyProcessMonitor::_process(ulong pid, uint load) if (wasMisbehaving) d->scoreMap_.remove(pid); - d->loadMap_.replace(pid, load); + d->loadMap_.tqreplace(pid, load); } // Here begins the set of system-specific methods. @@ -221,7 +221,7 @@ NaughtyProcessMonitor::canKill(ulong pid) const return geteuid() == a; #elif defined(__OpenBSD__) // simply check if entry exists in the uid map and use it - if (!d->uidMap_.contains(pid)) + if (!d->uidMap_.tqcontains(pid)) return false ; return geteuid () == d->uidMap_[pid] ; @@ -231,7 +231,7 @@ NaughtyProcessMonitor::canKill(ulong pid) const #endif } - QString + TQString NaughtyProcessMonitor::processName(ulong pid) const { #if defined(__linux__) || defined(__OpenBSD__) @@ -255,7 +255,7 @@ NaughtyProcessMonitor::processName(ulong pid) const } // Now strip 'kdeinit:' prefix. - TQString unicode(TQString::fromLocal8Bit(s)); + TQString tqunicode(TQString::fromLocal8Bit(s)); #elif defined(__OpenBSD__) int mib[4] ; @@ -280,16 +280,16 @@ NaughtyProcessMonitor::processName(ulong pid) const } // Now strip 'kdeinit:' prefix. - TQString unicode(TQString::fromLocal8Bit(argv[0])); + TQString tqunicode(TQString::fromLocal8Bit(argv[0])); free (argv) ; #endif - TQStringList parts(TQStringList::split(' ', unicode)); + TQStringList parts(TQStringList::split(' ', tqunicode)); TQString processName = parts[0] == "kdeinit:" ? parts[1] : parts[0]; - int lastSlash = processName.findRev('/'); + int lastSlash = processName.tqfindRev('/'); // Get basename, if there's a path. if (-1 != lastSlash) @@ -449,7 +449,7 @@ NaughtyProcessMonitor::getLoad(ulong pid, uint & load) const return true; #elif defined(__OpenBSD__) // use cache - if (!d->cacheLoadMap_.contains(pid)) + if (!d->cacheLoadMap_.tqcontains(pid)) return false ; load = d->cacheLoadMap_[pid] ; diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.h b/kicker/applets/naughty/NaughtyProcessMonitor.h index cc5c91cfc..c21cb393b 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.h +++ b/kicker/applets/naughty/NaughtyProcessMonitor.h @@ -25,7 +25,7 @@ class NaughtyProcessMonitorPrivate; -class NaughtyProcessMonitor : public QObject +class NaughtyProcessMonitor : public TQObject { Q_OBJECT diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index 94f30f33a..8f441a397 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -92,7 +92,7 @@ RunApplet::RunApplet(const TQString& configFile, Type type, int actions, _filterData = new KURIFilterData(); - _hbox = new TQHBox( 0, 0, WStyle_Customize | WType_Popup ); + _hbox = new TQHBox( 0, 0, (WFlags)(WStyle_Customize | WType_Popup) ); _hbox->setFixedSize(120, 22); } @@ -115,20 +115,20 @@ RunApplet::~RunApplet() void RunApplet::resizeEvent(TQResizeEvent*) { - if(orientation() == Horizontal) + if(orientation() == Qt::Horizontal) { _btn->hide(); _input->reparent(this, TQPoint(0,0), true); _label->setGeometry(0,0, width(), _label->height()); - if(height() >= _input->sizeHint().height() + _label->height()) + if(height() >= _input->tqsizeHint().height() + _label->height()) { - int inputVOffset = height() - _input->sizeHint().height() - 2; - int labelHeight = _label->sizeHint().height(); + int inputVOffset = height() - _input->tqsizeHint().height() - 2; + int labelHeight = _label->tqsizeHint().height(); _label->setGeometry(0, inputVOffset - labelHeight, width(), labelHeight); _input->setGeometry(0, inputVOffset, - width(), _input->sizeHint().height()); + width(), _input->tqsizeHint().height()); _label->show(); } else @@ -138,7 +138,7 @@ void RunApplet::resizeEvent(TQResizeEvent*) // make it as high as the combobox naturally wants to be // but no taller than the panel is! // don't forget to center it vertically either. - int newHeight = _input->sizeHint().height(); + int newHeight = _input->tqsizeHint().height(); if (newHeight > height()) newHeight = height(); _input->setGeometry(0, (height() - newHeight) / 2, @@ -184,7 +184,7 @@ void RunApplet::setButtonText() int RunApplet::widthForHeight(int ) const { - return _label->sizeHint().width(); + return _label->tqsizeHint().width(); } int RunApplet::heightForWidth(int ) const @@ -288,7 +288,7 @@ void RunApplet::run_command(const TQString& command) return; hide: - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) _hbox->hide(); needsFocus(focusNeeded); } diff --git a/kicker/applets/swallow/prefwidgetbase.ui b/kicker/applets/swallow/prefwidgetbase.ui index bd2673efa..1d3ef95bf 100644 --- a/kicker/applets/swallow/prefwidgetbase.ui +++ b/kicker/applets/swallow/prefwidgetbase.ui @@ -110,7 +110,7 @@ Expanding - + 20 20 diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index 7112c706a..d5a231363 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -261,7 +261,7 @@ static void parseCommand(KProcess *proc, TQString cmd) cmd += " "; - pos = cmd.find(' '); + pos = cmd.tqfind(' '); *proc << cmd.left(pos); cmd.remove(0,pos); cmd = cmd.stripWhiteSpace(); diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index ad44b640f..e8ab4b567 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -85,7 +85,7 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac setBackgroundOrigin(AncestorOrigin); - kwin_module = new KWinModule(this); + kwin_module = new KWinModule(TQT_TQOBJECT(this)); // kApplication notifies us of settings changes. added to support // disabling of frame effect on mouse hover @@ -228,7 +228,7 @@ void SystemTrayApplet::preferences() for (; it != itEnd; ++it) { TQString name = KWin::windowInfo((*it)->embeddedWinId()).name(); - if(!shownListBox->findItem(name, Qt::ExactMatch | Qt::CaseSensitive)) + if(!shownListBox->tqfindItem(name, TQt::ExactMatch | TQt::CaseSensitive)) { shownListBox->insertItem(KWin::icon((*it)->embeddedWinId(), 22, 22, true), name); } @@ -239,7 +239,7 @@ void SystemTrayApplet::preferences() for (; it != itEnd; ++it) { TQString name = KWin::windowInfo((*it)->embeddedWinId()).name(); - if(!hiddenListBox->findItem(name, Qt::ExactMatch | Qt::CaseSensitive)) + if(!hiddenListBox->tqfindItem(name, TQt::ExactMatch | TQt::CaseSensitive)) { hiddenListBox->insertItem(KWin::icon((*it)->embeddedWinId(), 22, 22, true), name); } @@ -288,7 +288,7 @@ void SystemTrayApplet::applySettings() item; item = item->next()) { - if( windowNameToClass.contains(item->text())) + if( windowNameToClass.tqcontains(item->text())) m_sortOrderIconList.append(windowNameToClass[item->text()]); else m_sortOrderIconList.append(item->text()); @@ -301,7 +301,7 @@ void SystemTrayApplet::applySettings() item; item = item->next()) { - if( windowNameToClass.contains(item->text())) + if( windowNameToClass.tqcontains(item->text())) m_hiddenIconList.append(windowNameToClass[item->text()]); else m_hiddenIconList.append(item->text()); @@ -350,7 +350,7 @@ void SystemTrayApplet::checkAutoRetract() return; } - if (!geometry().contains(mapFromGlobal(TQCursor::pos()))) + if (!tqgeometry().tqcontains(mapFromGlobal(TQCursor::pos()))) { m_autoRetractTimer->stop(); if (m_autoRetract) @@ -386,15 +386,15 @@ void SystemTrayApplet::showExpandButton(bool show) m_expandButton->installEventFilter(this); refreshExpandButton(); - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) { m_expandButton->setFixedSize(width() - 4, - m_expandButton->sizeHint() + m_expandButton->tqsizeHint() .height()); } else { - m_expandButton->setFixedSize(m_expandButton->sizeHint() + m_expandButton->setFixedSize(m_expandButton->tqsizeHint() .width(), height() - 4); } @@ -551,8 +551,8 @@ bool SystemTrayApplet::isWinManaged(WId w) bool SystemTrayApplet::shouldHide(WId w) { - return m_hiddenIconList.find(KWin::windowInfo(w).name()) != m_hiddenIconList.end() - || m_hiddenIconList.find('!'+KWin::windowInfo(w,0,NET::WM2WindowClass).windowClassClass()) + return m_hiddenIconList.tqfind(KWin::windowInfo(w).name()) != m_hiddenIconList.end() + || m_hiddenIconList.tqfind('!'+KWin::windowInfo(w,0,NET::WM2WindowClass).windowClassClass()) != m_hiddenIconList.end(); } @@ -628,7 +628,7 @@ void SystemTrayApplet::refreshExpandButton() Qt::ArrowType a; - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) a = m_showHidden ? Qt::DownArrow : Qt::UpArrow; else a = (m_showHidden ^ kapp->reverseLayout()) ? Qt::RightArrow : Qt::LeftArrow; @@ -672,7 +672,7 @@ void SystemTrayApplet::updateTrayWindows() WId wid = (*emb)->embeddedWinId(); if ((wid == 0) || ((*emb)->kdeTray() && - !kwin_module->systemTrayWindows().contains(wid))) + !kwin_module->systemTrayWindows().tqcontains(wid))) { (*emb)->deleteLater(); emb = m_shownWins.erase(emb); @@ -689,7 +689,7 @@ void SystemTrayApplet::updateTrayWindows() WId wid = (*emb)->embeddedWinId(); if ((wid == 0) || ((*emb)->kdeTray() && - !kwin_module->systemTrayWindows().contains(wid))) + !kwin_module->systemTrayWindows().tqcontains(wid))) { (*emb)->deleteLater(); emb = m_hiddenWins.erase(emb); @@ -782,16 +782,16 @@ int SystemTrayApplet::maxIconHeight() const bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e) { - if (watched == m_expandButton) + if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_expandButton)) { TQPoint p; if (e->type() == TQEvent::ContextMenu) { - p = static_cast(e)->globalPos(); + p = TQT_TQCONTEXTMENUEVENT(e)->globalPos(); } else if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = static_cast(e); + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); if (me->button() == Qt::RightButton) { p = me->globalPos(); @@ -804,7 +804,7 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e) contextMenu->insertItem(SmallIcon("configure"), i18n("Configure System Tray..."), this, TQT_SLOT(configure())); - contextMenu->exec(static_cast(e)->globalPos()); + contextMenu->exec(TQT_TQCONTEXTMENUEVENT(e)->globalPos()); delete contextMenu; return true; @@ -830,7 +830,7 @@ int SystemTrayApplet::widthForHeight(int h) const me->setFixedHeight(h); } - return sizeHint().width(); + return tqsizeHint().width(); } int SystemTrayApplet::heightForWidth(int w) const @@ -849,7 +849,7 @@ int SystemTrayApplet::heightForWidth(int w) const me->setFixedWidth(w); } - return sizeHint().height(); + return tqsizeHint().height(); } void SystemTrayApplet::moveEvent( TQMoveEvent* ) @@ -886,13 +886,13 @@ void SystemTrayApplet::layoutTray() if (m_expandButton) { - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) { - m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint().height()); + m_expandButton->setFixedSize(width() - 4, m_expandButton->tqsizeHint().height()); } else { - m_expandButton->setFixedSize(m_expandButton->sizeHint().width(), height() - 4); + m_expandButton->setFixedSize(m_expandButton->tqsizeHint().width(), height() - 4); } } @@ -910,7 +910,7 @@ void SystemTrayApplet::layoutTray() // This fix makes the workarounds in the heightForWidth() and widthForHeight() methods unneeded. // - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) { int iconWidth = maxIconWidth() + ICON_MARGIN; // +2 for the margins that implied by the layout heightWidth = width() - ICON_MARGIN; @@ -1051,7 +1051,7 @@ TrayEmbed::TrayEmbed( bool kdeTray, TQWidget* parent ) void TrayEmbed::getIconSize(int defaultIconSize) { - TQSize minSize = minimumSizeHint(); + TQSize minSize = tqminimumSizeHint(); int width = minSize.width(); int height = minSize.height(); @@ -1067,12 +1067,12 @@ void TrayEmbed::getIconSize(int defaultIconSize) void TrayEmbed::setBackground() { - const TQPixmap *pbg = parentWidget()->backgroundPixmap(); + const TQPixmap *pbg = tqparentWidget()->backgroundPixmap(); if (pbg) { TQPixmap bg(width(), height()); - bg.fill(parentWidget(), pos()); + bg.fill(tqparentWidget(), pos()); setPaletteBackgroundPixmap(bg); setBackgroundOrigin(WidgetOrigin); } diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index 55e5d113f..ebeec601f 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -82,7 +82,7 @@ int TaskbarApplet::widthForHeight(int h) const KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->sizeHint(d, TQSize(200, h)).width(); + return container->tqsizeHint(d, TQSize(200, h)).width(); } int TaskbarApplet::heightForWidth(int w) const @@ -97,7 +97,7 @@ int TaskbarApplet::heightForWidth(int w) const KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->sizeHint(d, TQSize(w, 200)).height(); + return container->tqsizeHint(d, TQSize(w, 200)).height(); } void TaskbarApplet::preferences() diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp index 18962b2ea..d363f3879 100644 --- a/kicker/applets/trash/trashapplet.cpp +++ b/kicker/applets/trash/trashapplet.cpp @@ -126,7 +126,7 @@ void TrashApplet::resizeEvent( TQResizeEvent * ) mButton->widthForHeight( height() ) ); - if(orientation() == Vertical) + if(orientation() == Qt::Vertical) { mButton->resize( width(), size ); } diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp index 19e6be02b..166e9164f 100644 --- a/kicker/applets/trash/trashbutton.cpp +++ b/kicker/applets/trash/trashbutton.cpp @@ -32,14 +32,14 @@ #include TrashButton::TrashButton(TQWidget *parent) - : PanelPopupButton(parent), mActions(this, this), + : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(KFileItem::Unknown, KFileItem::Unknown, "trash:/") { KIO::UDSEntry entry; KIO::NetAccess::stat("trash:/", entry, 0L); mFileItem.assign(KFileItem(entry, "trash:/")); - KAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()), + KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), &mActions, "paste"); a->setShortcut(0); diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index d3b625f80..95dcccbc9 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -57,10 +57,10 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, : KPanelExtension(configFile, type, actions, parent, name) { dragging_container = 0; - kwin_module = new KWinModule(this); + kwin_module = new KWinModule(TQT_TQOBJECT(this)); connect( kwin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); - setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); loadContainerConfig(); } @@ -77,7 +77,7 @@ DockBarExtension::~DockBarExtension() if (dragging_container) delete dragging_container; } -TQSize DockBarExtension::sizeHint(Position p, TQSize) const +TQSize DockBarExtension::tqsizeHint(Position p, TQSize) const { if (p == Left || p == Right) return TQSize(DockContainer::sz(), DockContainer::sz() * containers.count()); @@ -174,7 +174,7 @@ void DockBarExtension::layoutContainers() it != containers.constEnd(); ++it) { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) (*it)->move(DockContainer::sz() * i, 0); else (*it)->move(0, DockContainer::sz() * i); @@ -246,7 +246,7 @@ void DockBarExtension::addContainer(DockContainer* c, int pos) void DockBarExtension::removeContainer(DockContainer* c) { - DockContainer::Vector::iterator it = qFind(containers.begin(), containers.end(), c); + DockContainer::Vector::iterator it = tqFind(containers.begin(), containers.end(), c); if (it == containers.end()) { @@ -335,7 +335,7 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p) it != containers.constEnd(); ++it, ++i) { - if ((*it)->geometry().contains(p)) + if ((*it)->tqgeometry().tqcontains(p)) { return i; } @@ -345,17 +345,17 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p) } void DockBarExtension::mousePressEvent(TQMouseEvent *e ) { - if (e->button() == LeftButton) { + if (e->button() == Qt::LeftButton) { // Store the position of the mouse clic. mclic_pos = e->pos(); - } else if (e->button() == RightButton) { + } else if (e->button() == Qt::RightButton) { int pos = findContainerAtPoint(e->pos()); if (pos != -1) containers.at(pos)->popupMenu(e->globalPos()); } } void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) { - if (e->button() != LeftButton) return; + if (e->button() != Qt::LeftButton) return; if (dragging_container) { releaseMouse(); original_container->embed(dragging_container->embeddedWinId()); @@ -366,7 +366,7 @@ void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) { } void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { - if (! (e->state() & LeftButton) ) return; + if (! (e->state() & Qt::LeftButton) ) return; if (dragging_container == 0) { // Check whether the user has moved far enough. int delay = TQApplication::startDragDistance(); @@ -393,7 +393,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { int pdrag1,pdrag2,psz; pdrag1 = dragpos.x() - barpos.x() + DockContainer::sz()/2; pdrag2 = dragpos.y() - barpos.y() + DockContainer::sz()/2; - if (orientation() == Vertical) { + if (orientation() == Qt::Vertical) { int tmp = pdrag1; pdrag1 = pdrag2; pdrag2 = tmp; psz = height(); } else psz = width(); @@ -403,7 +403,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { pdrag1 = dragged_container_original_pos; - DockContainer::Vector::iterator it = qFind(containers.begin(), containers.end(), original_container); + DockContainer::Vector::iterator it = tqFind(containers.begin(), containers.end(), original_container); if (it == containers.end()) { diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h index e735ec708..eada2583b 100644 --- a/kicker/extensions/dockbar/dockbarextension.h +++ b/kicker/extensions/dockbar/dockbarextension.h @@ -40,7 +40,7 @@ public: virtual ~DockBarExtension(); - TQSize sizeHint(Position, TQSize maxSize) const; + TQSize tqsizeHint(Position, TQSize maxSize) const; Position preferedPosition() const { return Right; } protected slots: diff --git a/kicker/extensions/dockbar/dockcontainer.cpp b/kicker/extensions/dockbar/dockcontainer.cpp index d363b6b30..1d281619a 100644 --- a/kicker/extensions/dockbar/dockcontainer.cpp +++ b/kicker/extensions/dockbar/dockcontainer.cpp @@ -41,9 +41,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. DockContainer::DockContainer( TQString command, TQWidget *parent, TQString resname, TQString resclass, bool undocked_style ) : TQFrame( parent, resname.ascii(), - undocked_style ? WStyle_Customize | + undocked_style ? (WFlags)(WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | - WStyle_NoBorder | WX11BypassWM : 0 ), + WStyle_NoBorder | WX11BypassWM) : (WFlags)0 ), _embeddedWinId(0), _command(command), _resName(resname), diff --git a/kicker/extensions/dockbar/dockcontainer.h b/kicker/extensions/dockbar/dockcontainer.h index d1968fa28..278b8e450 100644 --- a/kicker/extensions/dockbar/dockcontainer.h +++ b/kicker/extensions/dockbar/dockcontainer.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -class DockContainer : public QFrame +class DockContainer : public TQFrame { Q_OBJECT diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp index d32f0a1dd..d0fb3ef55 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.cpp +++ b/kicker/extensions/kasbar/kasaboutdlg.cpp @@ -118,7 +118,7 @@ void KasAboutDialog::addDemoBar() box->setSpacing( spacingHint() ); box->setMargin( marginHint() ); - KasBar *bar = new KasBar( Horizontal, box ); + KasBar *bar = new KasBar( Qt::Horizontal, box ); bar->setItemSize( KasBar::Large ); bar->setMasked( false ); @@ -131,7 +131,7 @@ void KasAboutDialog::addDemoBar() ci->setCustomPopup( true ); connect( ci, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQT_SLOT(togglePopup()) ); - KasBar *groupbar = bar->createChildBar( ( bar->orientation() == Horizontal ) ? Vertical : Horizontal, pop ); + KasBar *groupbar = bar->createChildBar( ( bar->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop ); KasItem *i = 0; KasClockItem *clk = new KasClockItem( groupbar ); diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index bf2b64ba3..72dca2567 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -80,7 +80,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) : TQWidget( parent, name, f ), master_(0), orient( o ), - direction_( o == Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), + direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), itemUnderMouse_( 0 ), boxesPerLine_(10), // Temp value inDrag( false ), @@ -93,7 +93,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) rootPix( 0 ), enableTint_( false ), tintAmount_( 0.1 ), - tintColour_( colorGroup().mid() ), + tintColour_( tqcolorGroup().mid() ), useMask_( true ), res(0) { @@ -102,14 +102,14 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) setMouseTracking( true ); setMaxBoxes( 0 ); - connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); + connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) ); } KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f ) : TQWidget( parent, name, f ), master_(master), orient( o ), - direction_( o == Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), + direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), itemUnderMouse_( 0 ), boxesPerLine_(10), // Temp value inDrag( false ), @@ -122,7 +122,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam rootPix( 0 ), enableTint_( false ), tintAmount_( 0.1 ), - tintColour_( colorGroup().mid() ), + tintColour_( tqcolorGroup().mid() ), useMask_( true ), res(0) { @@ -130,7 +130,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam items.setAutoDelete( true ); setMouseTracking( true ); setMaxBoxes( 0 ); - connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); + connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) ); } KasBar::~KasBar() @@ -255,7 +255,7 @@ void KasBar::setTint( bool enable ) } emit configChanged(); - repaint( true ); + tqrepaint( true ); } } @@ -269,7 +269,7 @@ void KasBar::setTint( double amount, TQColor color ) emit configChanged(); if ( rootPix->isAvailable() ) - rootPix->repaint( true ); + rootPix->tqrepaint( true ); } } @@ -318,9 +318,9 @@ void KasBar::setDirection( Direction dir ) return; if ( ( dir == TQBoxLayout::LeftToRight ) || ( dir == TQBoxLayout::RightToLeft ) ) - orient = Horizontal; + orient = Qt::Horizontal; else - orient = Vertical; + orient = Qt::Vertical; direction_ = dir; emit directionChanged(); @@ -332,7 +332,7 @@ void KasBar::setOrientation( Orientation o ) if ( orient == o ) return; - if ( o == Horizontal ) + if ( o == Qt::Horizontal ) setDirection( TQBoxLayout::LeftToRight ); else setDirection( TQBoxLayout::TopToBottom ); @@ -375,9 +375,9 @@ void KasBar::setDetached( bool detach ) emit detachedChanged( detached ); } -TQSize KasBar::sizeHint( Orientation o, TQSize sz ) +TQSize KasBar::tqsizeHint( Orientation o, TQSize sz ) { - if ( o == Horizontal ) + if ( o == Qt::Horizontal ) setBoxesPerLine( sz.width() / itemExtent() ); else setBoxesPerLine( sz.height() / itemExtent() ); @@ -396,7 +396,7 @@ TQSize KasBar::sizeHint( Orientation o, TQSize sz ) ++r; TQSize s; - if( o == Horizontal ) { + if( o == Qt::Horizontal ) { s.setWidth( c*itemExtent() ); s.setHeight( r*itemExtent() ); } @@ -434,7 +434,7 @@ void KasBar::updateLayout() ++r; TQSize sz; - if ( orient == Horizontal ) + if ( orient == Qt::Horizontal ) sz = TQSize( c * itemExtent(), r * itemExtent() ); else sz = TQSize( r * itemExtent(), c * itemExtent() ); @@ -445,11 +445,11 @@ void KasBar::updateLayout() setUpdatesEnabled( updates ); - TQWidget *top = topLevelWidget(); + TQWidget *top = tqtopLevelWidget(); TQRegion mask; KasItem *i; - if ( orient == Horizontal ) { + if ( orient == Qt::Horizontal ) { for ( i = items.first(); i; i = items.next() ) { int x = (items.at() % c) * itemExtent(); @@ -646,7 +646,7 @@ void KasBar::updateItem( KasItem *i ) update( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) ); } -void KasBar::repaintItem(KasItem *i, bool erase ) +void KasBar::tqrepaintItem(KasItem *i, bool erase ) { if ( !i ) return; @@ -658,7 +658,7 @@ void KasBar::repaintItem(KasItem *i, bool erase ) paintBackground( &p, TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) ); i->paint( &p, pos.x(), pos.y() ); - repaint( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ), transparent_ || erase ); + tqrepaint( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ), transparent_ || erase ); } KasItem* KasBar::itemAt(const TQPoint &p) @@ -670,7 +670,7 @@ KasItem* KasBar::itemAt(const TQPoint &p) cr.setTopLeft( i->pos() ); cr.setSize( TQSize( itemExtent(), itemExtent() ) ); - if(cr.contains(p)) + if(cr.tqcontains(p)) return i; } diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index 8ff745475..e1fabddae 100644 --- a/kicker/extensions/kasbar/kasbar.h +++ b/kicker/extensions/kasbar/kasbar.h @@ -77,7 +77,7 @@ typedef TQPtrList KasItemList; /** * The main view for KasBar. */ -class KDE_EXPORT KasBar : public QWidget +class KDE_EXPORT KasBar : public TQWidget { Q_OBJECT Q_PROPERTY( int maxBoxes READ maxBoxes ) @@ -89,8 +89,8 @@ class KDE_EXPORT KasBar : public QWidget friend class KasItem; public: - KasBar( Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 ); - KasBar( Orientation o, KasBar *master, + KasBar( Qt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 ); + KasBar( Qt::Orientation o, KasBar *master, TQWidget* parent=0, const char* name=0, WFlags f=0 ); virtual ~KasBar(); @@ -104,7 +104,7 @@ public: KasBar *master() const { return master_; } /** Creates a child bar of the kasbar. The child will inherit the appearance options. */ - virtual KasBar *createChildBar( Orientation o, TQWidget *parent, const char *name=0 ); + virtual KasBar *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 ); /** Factory method that returns the singleton resources object. */ virtual KasResources *resources(); @@ -121,7 +121,7 @@ public: void clear(); KasItem *take( KasItem *i ) { return items.take( indexOf(i) ); } KasItem *itemAt( uint i ) { return items.at( i ); } - int indexOf( KasItem *i ) { return items.find( i ); } + int indexOf( KasItem *i ) { return items.tqfind( i ); } KasItemList *itemList() { return &items; } @@ -141,8 +141,8 @@ public: int maxBoxes() const { return maxBoxes_; } uint boxesPerLine() const { return boxesPerLine_; } - void setOrientation( Orientation o ); - Orientation orientation() const { return orient; } + void setOrientation( Qt::Orientation o ); + Qt::Orientation orientation() const { return orient; } void setDirection( Direction dir ); Direction direction() const { return direction_; } @@ -152,7 +152,7 @@ public: bool isDrag() const { return inDrag; } - TQSize sizeHint( Orientation, TQSize max ); + TQSize tqsizeHint( Qt::Orientation, TQSize max ); // // Look and feel options @@ -188,7 +188,7 @@ public: void updateItem( KasItem *i ); /** Redraws the specified item. */ - void repaintItem(KasItem *i, bool erase = true ); + void tqrepaintItem(KasItem *i, bool erase = true ); /** Returns the item at p or 0. */ KasItem* itemAt(const TQPoint &p); @@ -287,7 +287,7 @@ private: TQPixmap offscreen; KasBar *master_; KasItemList items; - Orientation orient; + Qt::Orientation orient; Direction direction_; KasItem *itemUnderMouse_; uint boxesPerLine_; diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index ffd1b766e..3360b95cb 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -83,12 +83,12 @@ int main( int argc, char **argv ) kdDebug(1345) << "Kasbar starting..." << endl; - int wflags = Qt::WStyle_Customize | Qt::WX11BypassWM | Qt::WStyle_DialogBorder | Qt::WStyle_StaysOnTop; + int wflags = TQt::WStyle_Customize | TQt::WX11BypassWM | TQt::WStyle_DialogBorder | TQt::WStyle_StaysOnTop; KasBar *kasbar; KConfig conf( "kasbarrc" ); if ( args->isSet("test") ) { - kasbar = new KasBar( Qt::Vertical, 0, "testkas", wflags ); + kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags ); kasbar->setItemSize( KasBar::Large ); kasbar->append( new KasClockItem(kasbar) ); kasbar->append( new KasItem(kasbar) ); @@ -97,7 +97,7 @@ int main( int argc, char **argv ) kasbar->addTestItems(); } else { - KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", wflags ); + KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags ); kastasker->setConfig( &conf ); kastasker->setStandAlone( true ); kasbar = kastasker; diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 3bc3dcd1b..c63d6e277 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -121,8 +121,8 @@ void KasBarExtension::setDetached( bool detach ) if ( detach ) { - int wflags = Qt::WStyle_Customize | Qt::WX11BypassWM | Qt::WStyle_DialogBorder | Qt::WStyle_StaysOnTop; - kasbar->reparent( 0, wflags, kasbar->detachedPosition(), true ); + int wflags = TQt::WStyle_Customize | TQt::WX11BypassWM | TQt::WStyle_DialogBorder | TQt::WStyle_StaysOnTop; + kasbar->reparent( 0, (WFlags)wflags, kasbar->detachedPosition(), true ); updateGeometry(); resize( detachedSize() ); } @@ -141,33 +141,33 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ ) { updateGeometry(); resize( kasbar->size() ); - repaint( true ); + tqrepaint( true ); } TQSize KasBarExtension::detachedSize() { - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) return TQSize( kasbar->itemExtent()/2, 0 ); else return TQSize( 0, kasbar->itemExtent()/2 ); } -TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const +TQSize KasBarExtension::tqsizeHint(Position p, TQSize maxSize ) const { - Orientation o = Horizontal; + Orientation o = Qt::Horizontal; if ( p == Left || p == Right ) - o = Vertical; + o = Qt::Vertical; if ( detached_ ) { - if ( o == Vertical ) + if ( o == Qt::Vertical ) return TQSize( kasbar->itemExtent()/2, 0 ); else return TQSize( 0, kasbar->itemExtent()/2 ); } - return kasbar->sizeHint( o, maxSize ); + return kasbar->tqsizeHint( o, maxSize ); } void KasBarExtension::positionChange( Position /* position */) diff --git a/kicker/extensions/kasbar/kasbarextension.h b/kicker/extensions/kasbar/kasbarextension.h index 7fbb4fbc6..e5e3142df 100644 --- a/kicker/extensions/kasbar/kasbarextension.h +++ b/kicker/extensions/kasbar/kasbarextension.h @@ -76,7 +76,7 @@ public: virtual ~KasBarExtension(); - TQSize sizeHint( Position, TQSize maxSize ) const; + TQSize tqsizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const { return Right; } virtual void positionChange( Position position ); diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index f025af857..518245d4b 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -23,7 +23,7 @@ #include "kasclockitem.h" #include "kasclockitem.moc" -class LCD : public QLCDNumber +class LCD : public TQLCDNumber { public: LCD( TQWidget *parent, const char *name=0 ) @@ -45,7 +45,7 @@ KasClockItem::KasClockItem( KasBar *parent ) lcd = new LCD( parent ); lcd->hide(); - lcd->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + lcd->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); lcd->setBackgroundMode( NoBackground ); lcd->setFrameStyle( TQFrame::NoFrame ); lcd->setSegmentStyle( TQLCDNumber::Flat ); @@ -89,7 +89,7 @@ void KasClockItem::paint( TQPainter *p ) p->save(); p->translate( 3, 15 ); - lcd->setPaletteForegroundColor( kasbar()->colorGroup().mid() ); + lcd->setPaletteForegroundColor( kasbar()->tqcolorGroup().mid() ); lcd->draw( p ); p->restore(); diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index 6e03e8e3c..12058a3c7 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -255,7 +255,7 @@ void KasGroupItem::updatePopup() KasPopup *KasGroupItem::createPopup() { KasPopup *pop = new KasPopup( this ); - bar = kasbar()->createChildBar( ( kasbar()->orientation() == Horizontal ) ? Vertical : Horizontal, pop ); + bar = kasbar()->createChildBar( ( kasbar()->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop ); connect( pop, TQT_SIGNAL(shown()), TQT_SLOT(updatePopup()) ); diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 8fd795363..3c6147b1a 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -179,11 +179,11 @@ void KasItem::mouseEnter() void KasItem::mouseReleaseEvent( TQMouseEvent *ev ) { - if ( ev->button() == LeftButton ) + if ( ev->button() == Qt::LeftButton ) emit leftButtonClicked( ev ); - else if ( ev->button() == RightButton ) + else if ( ev->button() == Qt::RightButton ) emit rightButtonClicked( ev ); - else if ( ev->button() == MidButton ) + else if ( ev->button() == Qt::MidButton ) emit middleButtonClicked( ev ); } @@ -301,7 +301,7 @@ void KasItem::paintFrame( TQPainter *p ) if ( !frame ) return; - qDrawShadePanel(p, 0, 0, extent(), extent(), colorGroup(), false, 2); + qDrawShadePanel(p, 0, 0, extent(), extent(), tqcolorGroup(), false, 2); TQPen pen; @@ -547,15 +547,15 @@ void KasItem::paint( TQPainter *p, int x, int y ) p->restore(); } -void KasItem::repaint() +void KasItem::tqrepaint() { - repaint( true ); + tqrepaint( true ); } -void KasItem::repaint( bool erase ) +void KasItem::tqrepaint( bool erase ) { if ( kas->isVisible() ) - kas->repaintItem( this, erase ); + kas->tqrepaintItem( this, erase ); } void KasItem::update() diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h index c16a5f6d3..08f5436d4 100644 --- a/kicker/extensions/kasbar/kasitem.h +++ b/kicker/extensions/kasbar/kasitem.h @@ -74,7 +74,7 @@ class KasPopup; * * @author Richard Moore, rich@kde.org */ -class KDE_EXPORT KasItem : public QObject +class KDE_EXPORT KasItem : public TQObject { Q_OBJECT @@ -170,8 +170,8 @@ public: void paintModified( TQPainter *p ); public slots: - void repaint(); - void repaint( bool erase ); + void tqrepaint(); + void tqrepaint( bool erase ); void update(); void setActive( bool yes ); @@ -217,7 +217,7 @@ protected: TQFontMetrics fontMetrics() const { return kas->fontMetrics(); } /** Gets the color group from the parent. */ - const TQColorGroup &colorGroup() const { return kas->colorGroup(); } + const TQColorGroup &tqcolorGroup() const { return kas->tqcolorGroup(); } /** Factory method that creates a popup widget for the item. */ virtual KasPopup *createPopup(); diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp index 7b6939760..e36d2d18d 100644 --- a/kicker/extensions/kasbar/kasloaditem.cpp +++ b/kicker/extensions/kasbar/kasloaditem.cpp @@ -95,7 +95,7 @@ void KasLoadItem::paint( TQPainter *p ) KasItem::paint( p ); - TQColor light = kasbar()->colorGroup().highlight(); + TQColor light = kasbar()->tqcolorGroup().highlight(); TQColor dark = light.dark(); KPixmap pix; @@ -103,7 +103,7 @@ void KasLoadItem::paint( TQPainter *p ) KPixmapEffect::gradient( pix, light, dark, KPixmapEffect::DiagonalGradient ); p->drawPixmap( 2, extent()-2-h, pix ); - p->setPen( kasbar()->colorGroup().mid() ); + p->setPen( kasbar()->tqcolorGroup().mid() ); for ( double pos = 0.2 ; pos < 1.0 ; pos += 0.2 ) { int ypos = (int) floor((extent()-2) - (dh*maxValue*pos)); p->drawLine( 2, ypos, extent()-3, ypos ); diff --git a/kicker/extensions/kasbar/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp index 7538dfbb2..0edc0a77a 100644 --- a/kicker/extensions/kasbar/kaspopup.cpp +++ b/kicker/extensions/kasbar/kaspopup.cpp @@ -60,7 +60,7 @@ #include "kaspopup.moc" KasPopup::KasPopup( KasItem *item, const char *name ) - : TQHBox( 0, name, WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), + : TQHBox( 0, name, (WFlags)(WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | WStyle_NoBorder | WX11BypassWM) ), item_( item ), kasbar_( item->kasbar() ) { @@ -95,22 +95,22 @@ TQPoint KasPopup::calcPosition( KasItem *item, int w, int h ) int x = pos.x(); int y = pos.y(); - if ( kasbar->orientation() == Horizontal ) { - if ( y < ( qApp->desktop()->height() / 2 ) ) + if ( kasbar->orientation() == Qt::Horizontal ) { + if ( y < ( tqApp->desktop()->height() / 2 ) ) y = y + kasbar->itemExtent(); else y = y - h; - if ( (x + w) > qApp->desktop()->width() ) + if ( (x + w) > tqApp->desktop()->width() ) x = x - w + kasbar->itemExtent(); } else { - if ( x < ( qApp->desktop()->width() / 2 ) ) + if ( x < ( tqApp->desktop()->width() / 2 ) ) x = x + kasbar->itemExtent(); else x = x - w; - if ( (y + h) > qApp->desktop()->height() ) + if ( (y + h) > tqApp->desktop()->height() ) y = y - h + kasbar->itemExtent(); } diff --git a/kicker/extensions/kasbar/kaspopup.h b/kicker/extensions/kasbar/kaspopup.h index 811202b62..38abbbc28 100644 --- a/kicker/extensions/kasbar/kaspopup.h +++ b/kicker/extensions/kasbar/kaspopup.h @@ -69,7 +69,7 @@ class KasBar; * * @author Richard Moore, rich@kde.org */ -class KasPopup : public QHBox +class KasPopup : public TQHBox { Q_OBJECT diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index e81b0aacb..6dd39517f 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -227,7 +227,7 @@ void KasPrefsDialog::addBackgroundPage() TQLabel *tintStrengthLabel = new TQLabel( i18n("Tint &strength: "), tintAmtBox ); int percent = (int) (kasbar->tintAmount() * 100.0); - tintAmount = new TQSlider( 0, 100, 1, percent, Horizontal, tintAmtBox ); + tintAmount = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, tintAmtBox ); tintAmount->setTracking( true ); connect( tintAmount, TQT_SIGNAL( valueChanged( int ) ), kasbar, TQT_SLOT( setTintAmount( int ) ) ); @@ -261,7 +261,7 @@ void KasPrefsDialog::addThumbsPage() "cause performance problems." ) ); TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox ); int percent = (int) (kasbar->thumbnailSize() * 100.0); - thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Horizontal, thumbSizeBox ); + thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, thumbSizeBox ); connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ), kasbar, TQT_SLOT( setThumbnailSize( int ) ) ); thumbSizeLabel->setBuddy( thumbSizeSlider ); diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp index 78b25e8c0..3450b1549 100644 --- a/kicker/extensions/kasbar/kasresources.cpp +++ b/kicker/extensions/kasbar/kasresources.cpp @@ -308,7 +308,7 @@ KPixmap KasResources::activeBg() if ( actBg.isNull() ) { actBg.resize( kasbar->itemExtent(), kasbar->itemExtent() ); KPixmapEffect::gradient( actBg, - kasbar->colorGroup().light(), kasbar->colorGroup().mid(), + kasbar->tqcolorGroup().light(), kasbar->tqcolorGroup().mid(), KPixmapEffect::DiagonalGradient ); } @@ -320,7 +320,7 @@ KPixmap KasResources::inactiveBg() if ( inactBg.isNull() ) { inactBg.resize( kasbar->itemExtent(), kasbar->itemExtent() ); KPixmapEffect::gradient( inactBg, - kasbar->colorGroup().mid(), kasbar->colorGroup().dark(), + kasbar->tqcolorGroup().mid(), kasbar->tqcolorGroup().dark(), KPixmapEffect::DiagonalGradient ); } diff --git a/kicker/extensions/kasbar/kasresources.h b/kicker/extensions/kasbar/kasresources.h index cda153c30..bada9786b 100644 --- a/kicker/extensions/kasbar/kasresources.h +++ b/kicker/extensions/kasbar/kasresources.h @@ -73,7 +73,7 @@ class KasBar; * * @author Richard Moore, rich@kde.org */ -class KasResources : public QObject +class KasResources : public TQObject { Q_OBJECT diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index a087f40ff..851b7d915 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -152,62 +152,62 @@ KPopupMenu *KasTasker::contextMenu() menu = new KPopupMenu; showAllWindowsAction = new KToggleAction( i18n("Show &All Windows"), KShortcut(), - this, "toggle_show_all_windows" ); + TQT_TQOBJECT(this), "toggle_show_all_windows" ); showAllWindowsAction->setChecked( showAllWindows() ); showAllWindowsAction->plug( menu ); connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) ); - connect( this, TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) ); + connect( TQT_TQOBJECT(this), TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) ); groupWindowsAction = new KToggleAction( i18n("&Group Windows"), KShortcut(), - this, "toggle_group_windows" ); + TQT_TQOBJECT(this), "toggle_group_windows" ); groupWindowsAction->setChecked( groupWindows() ); groupWindowsAction->plug( menu ); connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) ); - connect( this, TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) ); + connect( TQT_TQOBJECT(this), TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) ); - showClockAction = new KToggleAction( i18n("Show &Clock"), KShortcut(), this, "toggle_show_clock" ); + showClockAction = new KToggleAction( i18n("Show &Clock"), KShortcut(), TQT_TQOBJECT(this), "toggle_show_clock" ); showClockAction->setChecked( showClock() ); showClockAction->plug( menu ); connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) ); - connect( this, TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) ); + connect( TQT_TQOBJECT(this), TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) ); - showLoadAction = new KToggleAction( i18n("Show &Load Meter"), KShortcut(), this, "toggle_show_load" ); + showLoadAction = new KToggleAction( i18n("Show &Load Meter"), KShortcut(), TQT_TQOBJECT(this), "toggle_show_load" ); showLoadAction->setChecked( showLoad() ); showLoadAction->plug( menu ); connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) ); - connect( this, TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) ); + connect( TQT_TQOBJECT(this), TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) ); menu->insertSeparator(); if ( !standalone_ ) { - toggleDetachedAction = new KToggleAction( i18n("&Floating"), KShortcut(), this, "toggle_detached" ); + toggleDetachedAction = new KToggleAction( i18n("&Floating"), KShortcut(), TQT_TQOBJECT(this), "toggle_detached" ); toggleDetachedAction->setChecked( isDetached() ); toggleDetachedAction->plug( menu ); connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) ); - connect( this, TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) ); + connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) ); } rotateBarAction = new KAction( i18n("R&otate Bar"), TQString("rotate"), KShortcut(), - this, TQT_SLOT( toggleOrientation() ), - this, "rotate_bar" ); + TQT_TQOBJECT(this), TQT_SLOT( toggleOrientation() ), + TQT_TQOBJECT(this), "rotate_bar" ); rotateBarAction->plug( menu ); - connect( this, TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) ); + connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) ); connect( rotateBarAction, TQT_SIGNAL(activated()), TQT_SLOT(writeConfigLater()) ); - menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQT_SLOT( refreshAll() ) ); + menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), TQT_TQOBJECT(this), TQT_SLOT( refreshAll() ) ); menu->insertSeparator(); - menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQT_SLOT( showPreferences() ) ); + menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), TQT_TQOBJECT(this), TQT_SLOT( showPreferences() ) ); // Help menu KPopupMenu *help = new KPopupMenu; - help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQT_SLOT( showAbout() ) ); + help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), TQT_TQOBJECT(this), TQT_SLOT( showAbout() ) ); menu->insertItem( SmallIcon("help"), i18n("&Help"), help ); if ( standalone_ ) { menu->insertSeparator(); - menu->insertItem( SmallIcon("exit"), i18n("&Quit"), qApp, TQT_SLOT( quit() ) ); + menu->insertItem( SmallIcon("exit"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) ); } } @@ -587,7 +587,7 @@ void KasTasker::readConfig( KConfig *conf ) setItemSize( conf->readNumEntry( "ItemSize", KasBar::Medium ) ); setTint( conf->readBoolEntry( "EnableTint", false ) ); - setTintColor( conf->readColorEntry( "TintColor", &Qt::black ) ); + setTintColor( conf->readColorEntry( "TintColor", &TQt::black ) ); setTintAmount( conf->readDoubleNumEntry( "TintAmount", 0.1 ) ); setTransparent( conf->readBoolEntry( "Transparent", true ) ); setPaintInactiveFrames( conf->readBoolEntry( "PaintInactiveFrames", true ) ); @@ -598,14 +598,14 @@ void KasTasker::readConfig( KConfig *conf ) conf->setGroup("Colors"); KasResources *res = resources(); - res->setLabelPenColor( conf->readColorEntry( "LabelPenColor", &Qt::white ) ); - res->setLabelBgColor( conf->readColorEntry( "LabelBgColor", &Qt::black ) ); - res->setInactivePenColor( conf->readColorEntry( "InactivePenColor", &Qt::black ) ); - res->setInactiveBgColor( conf->readColorEntry( "InactiveBgColor", &Qt::white ) ); - res->setActivePenColor( conf->readColorEntry( "ActivePenColor", &Qt::black ) ); - res->setActiveBgColor( conf->readColorEntry( "ActiveBgColor", &Qt::white ) ); - res->setProgressColor( conf->readColorEntry( "ProgressColor", &Qt::green ) ); - res->setAttentionColor( conf->readColorEntry( "AttentionColor", &Qt::red ) ); + res->setLabelPenColor( conf->readColorEntry( "LabelPenColor", &TQt::white ) ); + res->setLabelBgColor( conf->readColorEntry( "LabelBgColor", &TQt::black ) ); + res->setInactivePenColor( conf->readColorEntry( "InactivePenColor", &TQt::black ) ); + res->setInactiveBgColor( conf->readColorEntry( "InactiveBgColor", &TQt::white ) ); + res->setActivePenColor( conf->readColorEntry( "ActivePenColor", &TQt::black ) ); + res->setActiveBgColor( conf->readColorEntry( "ActiveBgColor", &TQt::white ) ); + res->setProgressColor( conf->readColorEntry( "ProgressColor", &TQt::green ) ); + res->setAttentionColor( conf->readColorEntry( "AttentionColor", &TQt::red ) ); // // Thumbnail Settings @@ -635,7 +635,7 @@ void KasTasker::readConfig( KConfig *conf ) conf->setGroup("Layout"); setDirection( (Direction) conf->readNumEntry( "Direction", TQBoxLayout::LeftToRight ) ); - setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Horizontal ) ); + setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Qt::Horizontal ) ); setMaxBoxes( conf->readUnsignedNumEntry( "MaxBoxes", 0 ) ); TQPoint pos(100, 100); diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h index b90e4ddeb..d3491ba98 100644 --- a/kicker/extensions/kasbar/kastasker.h +++ b/kicker/extensions/kasbar/kastasker.h @@ -91,14 +91,14 @@ class KDE_EXPORT KasTasker : public KasBar public: /** Create a KasTasker widget. */ - KasTasker( Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); + KasTasker( Qt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); /** * Create a KasTasker widget that is slaved to another KasTasker. The * created widget will inherit the settings of the parent, but will * not connect to the signals of the TaskManager. */ - KasTasker( Orientation o, KasTasker *master, + KasTasker( Qt::Orientation o, KasTasker *master, TQWidget *parent=0, const char *name=0, WFlags f=0 ); /** Cleans up. */ @@ -107,7 +107,7 @@ public: /** Factory method that returns the default menu for items in the bar. */ virtual KPopupMenu *contextMenu(); - virtual KasTasker *createChildBar( Orientation o, TQWidget *parent, const char *name=0 ); + virtual KasTasker *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 ); /** * Returns true if this is the top KasTasker. Note that it is possible for diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index c9ec7bdd0..64dda4185 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -135,7 +135,7 @@ TQPixmap KasTaskItem::icon() TQPixmap thumb = task_->thumbnail(); TQSize sz = thumb.size(); - sz.scale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], TQSize::ScaleMin ); + sz.tqscale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], TQSize::ScaleMin ); TQImage img = thumb.convertToImage(); img = img.smoothScale( sz ); @@ -390,7 +390,7 @@ void KasTaskItem::showPropertiesDialog() tabs->addTab( createTaskProps( task_, tabs ), i18n("Task") ); tabs->addTab( createTaskProps( this, tabs ), i18n("Item") ); - tabs->addTab( createTaskProps( kasbar(), tabs, false ), i18n("Bar") ); + tabs->addTab( createTaskProps( TQT_TQOBJECT(kasbar()), tabs, false ), i18n("Bar") ); #if 0 tabs->addTab( createNETProps( tabs ), i18n("NET") ); @@ -422,7 +422,7 @@ TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool taskprops->addColumn( i18n("Value") ); // Create List Items - TQMetaObject *mo = target->metaObject(); + TQMetaObject *mo = target->tqmetaObject(); for ( int i = 0; i < mo->numProperties( recursive ); i++ ) { const TQMetaProperty *p = mo->property(i, recursive); @@ -443,9 +443,9 @@ TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data ) while ( pos >= 0 ) { pos = re.search( s, pos ); if ( pos >= 0 ) { - TQVariant val = data->property( re.cap(1).latin1() ); + TQVariant val = data->property( TQString(re.cap(1)).latin1() ); TQString v = val.asString(); - s.replace( pos, re.matchedLength(), v ); + s.tqreplace( pos, re.matchedLength(), v ); pos = pos + v.length(); } } @@ -456,7 +456,7 @@ TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data ) TQWidget *KasTaskItem::createX11Props( TQWidget *parent ) { TQVBox *vb2 = new TQVBox( parent ); - vb2->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); + vb2->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); vb2->setSpacing( KDialog::spacingHint() ); vb2->setMargin( KDialog::marginHint() ); diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp index 25c096a65..9a59e1603 100644 --- a/kicker/extensions/kasbar/kastaskpopup.cpp +++ b/kicker/extensions/kasbar/kastaskpopup.cpp @@ -91,7 +91,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) } KPixmapEffect::gradient( titleBg, - Qt::black, colorGroup().mid(), + Qt::black, tqcolorGroup().mid(), KPixmapEffect::DiagonalGradient ); connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) ); diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp index 401c67fbd..3e29403f4 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -57,7 +57,7 @@ SidebarExtension::SidebarExtension( const TQString& configFile, "konq_sidebar", m_sbWrapper, "SideBar_View", - this, + TQT_TQOBJECT(this), "Sidebar","universal"); KParts::BrowserExtension *be=KParts::BrowserExtension::childObject(p); @@ -94,7 +94,7 @@ void SidebarExtension::needLayoutUpdate(bool exp) { m_currentWidth=24; m_resizeHandle->hide(); } - topLevelWidget()->setFixedWidth(m_currentWidth); + tqtopLevelWidget()->setFixedWidth(m_currentWidth); emit updateLayout(); } @@ -117,7 +117,7 @@ bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) { return true; } else if (e->type()==TQEvent::MouseButtonRelease) { m_resizing=false; - m_expandedSize=topLevelWidget()->width(); + m_expandedSize=tqtopLevelWidget()->width(); needLayoutUpdate(true); return true; } else if (e->type()==TQEvent::MouseMove) { @@ -126,14 +126,14 @@ bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) { if (p==Left) { int diff=((TQMouseEvent*)e)->globalX()-m_x; if (abs(diff)>3) { - topLevelWidget()->setFixedWidth(topLevelWidget()->width()+diff); + tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()+diff); m_x=((TQMouseEvent*)e)->globalX(); } } else if (p==Right) { int diff=((TQMouseEvent*)e)->globalX()-m_x; if (abs(diff)>3) { - topLevelWidget()->setFixedWidth(topLevelWidget()->width()-diff); - topLevelWidget()->move(topLevelWidget()->x()+diff,topLevelWidget()->y()); + tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()-diff); + tqtopLevelWidget()->move(tqtopLevelWidget()->x()+diff,tqtopLevelWidget()->y()); m_x=((TQMouseEvent*)e)->globalX(); } } @@ -148,7 +148,7 @@ KPanelExtension::Position SidebarExtension::preferedPosition() const { return KPanelExtension::Left; } -TQSize SidebarExtension::sizeHint(Position, TQSize maxSize ) const +TQSize SidebarExtension::tqsizeHint(Position, TQSize maxSize ) const { return TQSize(m_currentWidth,maxSize.height()); } diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h index 4d0d1646b..9f28854b9 100644 --- a/kicker/extensions/sidebar/sidebarextension.h +++ b/kicker/extensions/sidebar/sidebarextension.h @@ -36,7 +36,7 @@ public: virtual ~SidebarExtension(); - TQSize sizeHint( Position, TQSize maxSize ) const; + TQSize tqsizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const; virtual void positionChange( Position position ); diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index e0deb768e..56e6ea3ce 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -101,7 +101,7 @@ void TaskBarExtension::positionChange( Position p ) m_container->popupDirectionChange(KPanelApplet::Right); break; case Floating: - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { m_container->popupDirectionChange(KPanelApplet::Down); } @@ -123,17 +123,17 @@ void TaskBarExtension::preferences() m_container->preferences(); } -TQSize TaskBarExtension::sizeHint(Position p, TQSize maxSize) const +TQSize TaskBarExtension::tqsizeHint(Position p, TQSize maxSize) const { if (p == Left || p == Right) maxSize.setWidth(sizeInPixels()); else maxSize.setHeight(sizeInPixels()); -// kdDebug(1210) << "TaskBarExtension::sizeHint( Position, TQSize )" << endl; +// kdDebug(1210) << "TaskBarExtension::tqsizeHint( Position, TQSize )" << endl; // kdDebug(1210) << " width: " << size.width() << endl; // kdDebug(1210) << "height: " << size.height() << endl; - return m_container->sizeHint(p, maxSize); + return m_container->tqsizeHint(p, maxSize); } void TaskBarExtension::configure() @@ -155,7 +155,7 @@ void TaskBarExtension::setBackgroundTheme() } else { - m_rootPixmap->repaint(true); + m_rootPixmap->tqrepaint(true); } double tint = double(KickerSettings::tintValue()) / 100; @@ -185,7 +185,7 @@ void TaskBarExtension::setBackgroundTheme() { TQImage bgImage = m_bgImage; - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) { if (KickerSettings::rotateBackground()) { @@ -213,7 +213,7 @@ void TaskBarExtension::setBackgroundTheme() { KickerLib::colorize(bgImage); } - setPaletteBackgroundPixmap(bgImage); + setPaletteBackgroundPixmap(TQPixmap(bgImage)); } } diff --git a/kicker/extensions/taskbar/taskbarextension.h b/kicker/extensions/taskbar/taskbarextension.h index 2848e80c7..92c065beb 100644 --- a/kicker/extensions/taskbar/taskbarextension.h +++ b/kicker/extensions/taskbar/taskbarextension.h @@ -49,7 +49,7 @@ public: int actions = 0, TQWidget *parent = 0, const char *name = 0 ); ~TaskBarExtension(); - TQSize sizeHint( Position, TQSize maxSize ) const; + TQSize tqsizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const { return Bottom; } protected: diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp index 2e2cb5a2d..4a8c9a7af 100644 --- a/kicker/kicker/buttons/browserbutton.cpp +++ b/kicker/kicker/buttons/browserbutton.cpp @@ -103,7 +103,7 @@ void BrowserButton::dropEvent( TQDropEvent *ev ) { KURL path ( topMenu->path() ); _menuTimer->stop(); - KFileItem item( path, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( path, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, path, ev, this ); PanelButton::dropEvent(ev); } diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp index 9f23741e5..71bcaa2e5 100644 --- a/kicker/kicker/buttons/desktopbutton.cpp +++ b/kicker/kicker/buttons/desktopbutton.cpp @@ -77,7 +77,7 @@ void DesktopButton::dragEnterEvent( TQDragEnterEvent *ev ) void DesktopButton::dropEvent( TQDropEvent *ev ) { KURL dPath ( KGlobalSettings::desktopPath() ); - KFileItem item( dPath, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( dPath, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, dPath, ev, this ); PanelButton::dropEvent(ev); } diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp index 9c9f438ac..b8144d735 100644 --- a/kicker/kicker/buttons/knewbutton.cpp +++ b/kicker/kicker/buttons/knewbutton.cpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include @@ -63,14 +63,14 @@ KNewButton::KNewButton( TQWidget* parent ) m_mouseInside = false; m_drag = false; - setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignRight)); + setIconAlignment((TQ_Alignment)(AlignTop|AlignRight)); setAcceptDrops(true); setIcon("kmenu-suse"); setDrawArrow(false); m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng")); m_movie->connectUpdate(this, TQT_SLOT(updateMovie())); - m_movie->connectStatus(this, TQT_SLOT(slotStatus(int))); + m_movie->connectStatus(TQT_TQOBJECT(this), TQT_SLOT(slotStatus(int))); m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&))); TQApplication::desktop()->screen()->installEventFilter(this); @@ -99,7 +99,7 @@ TQColor KNewButton::borderColor() const QRgb rgb = img.pixel(orientation() == Qt::Horizontal ? img.width() - i - 1 : i, 2); - if (qGreen(rgb) > 0x50) + if (tqGreen(rgb) > 0x50) return rgb; } @@ -134,24 +134,24 @@ void KNewButton::setPopupDirection(KPanelApplet::Direction d) switch (d) { case KPanelApplet::Left: - setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignLeft)); + setIconAlignment((TQ_Alignment)(AlignTop|AlignLeft)); m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng")); break; case KPanelApplet::Right: - setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignRight)); + setIconAlignment((TQ_Alignment)(AlignTop|AlignRight)); m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng")); break; case KPanelApplet::Up: - setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignHCenter)); + setIconAlignment((TQ_Alignment)(AlignTop|AlignHCenter)); m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng")); break; case KPanelApplet::Down: - setIconAlignment((Qt::AlignmentFlags)(AlignBottom|AlignHCenter)); + setIconAlignment((TQ_Alignment)(AlignBottom|AlignHCenter)); m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_flipped.mng")); } m_movie->connectUpdate(this, TQT_SLOT(updateMovie())); - m_movie->connectStatus(this, TQT_SLOT(slotStatus(int))); + m_movie->connectStatus(TQT_TQOBJECT(this), TQT_SLOT(slotStatus(int))); m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&))); } @@ -214,8 +214,8 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e) e->type() == TQEvent::MouseButtonPress || e->type() == TQEvent::MouseButtonDblClick ) { - TQMouseEvent *me = static_cast(e); - if (rect().contains(mapFromGlobal(me->globalPos()))) + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + if (TQT_TQRECT_OBJECT(rect()).tqcontains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup && m_openTimer != -1 && (me->button() & Qt::LeftButton) ) @@ -225,8 +225,8 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e) if (KickerSettings::kickoffDrawGeekoEye() && e->type() == TQEvent::MouseMove) { - TQMouseEvent *me = static_cast(e); - if ((me->state() & MouseButtonMask) == NoButton) + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + if ((me->state() & Qt::MouseButtonMask) == Qt::NoButton) drawEye(); } @@ -286,7 +286,7 @@ void KNewButton::drawEye() } m_active_pixmap = pixmap.xForm(matrix); - repaint(false); + tqrepaint(false); } #undef eye_x #undef eye_y @@ -355,9 +355,9 @@ void KNewButton::mouseMoveEvent(TQMouseEvent* e) { KButton::mouseMoveEvent(e); - m_mouseInside = m_sloppyRegion.contains(e->pos()); + m_mouseInside = m_sloppyRegion.tqcontains(e->pos()); - if ( m_sloppyRegion.contains(e->pos())) + if ( m_sloppyRegion.tqcontains(e->pos())) { if (m_hoverTimer == -1 && KickerSettings::openOnHover()) m_hoverTimer = startTimer(kMax(200,TQApplication::doubleClickInterval()/2)); @@ -420,16 +420,16 @@ void KNewButton::slotExecMenu() { switch (popupDirection()) { case KPanelApplet::Left: - qScrollEffect(m_popup, QEffects::LeftScroll); + qScrollEffect(m_popup, TQEffects::LeftScroll); break; case KPanelApplet::Up: - qScrollEffect(m_popup, QEffects::UpScroll); + qScrollEffect(m_popup, TQEffects::UpScroll); break; case KPanelApplet::Right: - qScrollEffect(m_popup, QEffects::RightScroll); + qScrollEffect(m_popup, TQEffects::RightScroll); break; case KPanelApplet::Down: - qScrollEffect(m_popup, QEffects::DownScroll); + qScrollEffect(m_popup, TQEffects::DownScroll); break; } } diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp index 29b7ddb2e..e91a06f37 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.cpp +++ b/kicker/kicker/buttons/nonkdeappbutton.cpp @@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // our own definition #include "nonkdeappbutton.h" -// we include the "moc" file so that the KDE build system knows to create it +// we include the "tqmoc" file so that the KDE build system knows to create it #include "nonkdeappbutton.moc" // this is one of the two constructors. gets called when creating a new button diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index f5f398136..621038002 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -75,14 +75,14 @@ AppletHandle::AppletHandle(AppletContainer* parent) int AppletHandle::heightForWidth( int /* w */ ) const { - int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int size = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } int AppletHandle::widthForHeight( int /* h */ ) const { - int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int size = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } @@ -200,7 +200,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) // a hack for applets that have out-of-process // elements (e.g the systray) so that the handle // doesn't flicker when moving over those elements - if (w->rect().contains(w->mapFromGlobal(TQCursor::pos()))) + if (TQT_TQRECT_OBJECT(w->rect()).tqcontains(w->mapFromGlobal(TQCursor::pos()))) { nowDrawIt = true; } @@ -220,12 +220,12 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) return TQWidget::eventFilter( o, e ); } - else if (o == m_dragBar) + else if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_dragBar)) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* ev = static_cast(e); - if (ev->button() == LeftButton || ev->button() == MidButton) + TQMouseEvent* ev = TQT_TQMOUSEEVENT(e); + if (ev->button() == Qt::LeftButton || ev->button() == Qt::MidButton) { emit moveApplet(m_applet->mapFromGlobal(ev->globalPos())); } @@ -234,8 +234,8 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) if (m_menuButton && e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* ev = static_cast(e); - if (ev->button() == RightButton) + TQMouseEvent* ev = TQT_TQMOUSEEVENT(e); + if (ev->button() == Qt::RightButton) { if (!m_menuButton->isDown()) { @@ -269,7 +269,7 @@ void AppletHandle::checkHandleHover() { if (!m_handleHoverTimer || (m_menuButton && m_menuButton->isOn()) || - m_applet->geometry().contains(m_applet->mapToParent( + m_applet->tqgeometry().tqcontains(m_applet->mapToParent( m_applet->mapFromGlobal(TQCursor::pos())))) { return; @@ -282,7 +282,7 @@ void AppletHandle::checkHandleHover() bool AppletHandle::onMenuButton(const TQPoint& point) const { - return m_menuButton && (childAt(mapFromGlobal(point)) == m_menuButton); + return m_menuButton && (tqchildAt(mapFromGlobal(point)) == m_menuButton); } void AppletHandle::toggleMenuButtonOff() @@ -308,11 +308,11 @@ AppletHandleDrag::AppletHandleDrag(AppletHandle* parent) setBackgroundOrigin( AncestorOrigin ); } -TQSize AppletHandleDrag::minimumSizeHint() const +TQSize AppletHandleDrag::tqminimumSizeHint() const { - int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int wh = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); - if (m_parent->orientation() == Horizontal) + if (m_parent->orientation() == Qt::Horizontal) { return TQSize(wh, 0); } @@ -322,7 +322,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const TQSizePolicy AppletHandleDrag::sizePolicy() const { - if (m_parent->orientation() == Horizontal) + if (m_parent->orientation() == Qt::Horizontal) { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); } @@ -360,15 +360,15 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *) TQStyle::SFlags flags = TQStyle::Style_Default; flags |= TQStyle::Style_Enabled; - if (m_parent->orientation() == Horizontal) + if (m_parent->orientation() == Qt::Horizontal) { flags |= TQStyle::Style_Horizontal; } TQRect r = rect(); - style().drawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, - colorGroup(), flags); + tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, + tqcolorGroup(), flags); } else { @@ -382,12 +382,12 @@ AppletHandleButton::AppletHandleButton(AppletHandle *parent) { } -TQSize AppletHandleButton::minimumSizeHint() const +TQSize AppletHandleButton::tqminimumSizeHint() const { - int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int height = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int width = height; - if (m_parent->orientation() == Horizontal) + if (m_parent->orientation() == Qt::Horizontal) { return TQSize(width, height); } diff --git a/kicker/kicker/core/applethandle.h b/kicker/kicker/core/applethandle.h index 5eff46717..a49319dc6 100644 --- a/kicker/kicker/core/applethandle.h +++ b/kicker/kicker/core/applethandle.h @@ -35,7 +35,7 @@ class TQTimer; class AppletHandleDrag; class AppletHandleButton; -class AppletHandle : public QWidget +class AppletHandle : public TQWidget { Q_OBJECT @@ -85,16 +85,16 @@ class AppletHandle : public QWidget bool m_inside; }; -class AppletHandleDrag : public QWidget +class AppletHandleDrag : public TQWidget { Q_OBJECT public: AppletHandleDrag(AppletHandle* parent); - TQSize minimumSizeHint() const; - TQSize minimumSize() const { return minimumSizeHint(); } - TQSize sizeHint() const { return minimumSize(); } + TQSize tqminimumSizeHint() const; + TQSize tqminimumSize() const { return tqminimumSizeHint(); } + TQSize tqsizeHint() const { return tqminimumSize(); } TQSizePolicy sizePolicy() const; protected: @@ -113,9 +113,9 @@ class AppletHandleButton : public SimpleArrowButton public: AppletHandleButton(AppletHandle *parent); - TQSize minimumSizeHint() const; - TQSize minimumSize() const { return minimumSizeHint(); } - TQSize sizeHint() const { return minimumSize(); } + TQSize tqminimumSizeHint() const; + TQSize tqminimumSize() const { return tqminimumSizeHint(); } + TQSize tqsizeHint() const { return tqminimumSize(); } TQSizePolicy sizePolicy() const; private: diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index 77c6d1912..ad17182b0 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -79,7 +79,7 @@ AppletContainer::AppletContainer(const AppletInfo& info, _appletframe->setFrameStyle(TQFrame::NoFrame); _appletframe->installEventFilter(this); - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0); } @@ -92,7 +92,7 @@ AppletContainer::AppletContainer(const AppletInfo& info, _layout->addSpacing(APPLET_MARGIN); _handle = new AppletHandle(this); - _layout->addWidget(_handle, 0); + _layout->addWidget(TQT_TQWIDGET(_handle), 0); connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)), this, TQT_SLOT(moveApplet(const TQPoint&))); connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu())); @@ -117,7 +117,7 @@ AppletContainer::AppletContainer(const AppletInfo& info, _valid = true; _applet->setPosition((KPanelApplet::Position)KickerLib::directionToPosition(popupDirection())); - _applet->setAlignment((KPanelApplet::Alignment)alignment()); + _applet->tqsetAlignment((KPanelApplet::Alignment)tqalignment()); _actions = _applet->actions(); _type = _applet->type(); @@ -191,7 +191,7 @@ void AppletContainer::resetLayout() { _handle->resetLayout(); - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { _layout->setDirection( TQBoxLayout::LeftToRight ); } @@ -225,7 +225,7 @@ void AppletContainer::showAppletMenu() Kicker::the()->setInsertionPoint(_handle->mapToGlobal(_handle->rect().center())); - switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, _handle))) + switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(_handle)))) { case PanelAppletOpMenu::Move: moveApplet(_handle->mapToParent(_handle->rect().center())); @@ -275,14 +275,14 @@ void AppletContainer::slotRemoved(KConfig* config) void AppletContainer::activateWindow() { - KWin::forceActiveWindow(topLevelWidget()->winId()); + KWin::forceActiveWindow(tqtopLevelWidget()->winId()); } void AppletContainer::focusRequested(bool focus) { if (focus) { - KWin::forceActiveWindow(topLevelWidget()->winId()); + KWin::forceActiveWindow(tqtopLevelWidget()->winId()); } emit maintainFocus(focus); @@ -298,7 +298,7 @@ void AppletContainer::doSaveConfiguration( KConfigGroup& config, bool layoutOnly ) const { // immutability is checked by ContainerBase - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { config.writeEntry( "WidthForHeightHint", widthForHeight(height()) ); } @@ -354,14 +354,14 @@ void AppletContainer::slotDelayedDestruct() delete this; } -void AppletContainer::alignmentChange(KPanelExtension::Alignment a) +void AppletContainer::tqalignmentChange(KPanelExtension::Alignment a) { if (!_applet) { return; } - _applet->setAlignment( (KPanelApplet::Alignment)a ); + _applet->tqsetAlignment( (KPanelApplet::Alignment)a ); } int AppletContainer::widthForHeight(int h) const @@ -471,7 +471,7 @@ void AppletContainer::setImmutable(bool immutable) } else if (!_handle->isVisibleTo(this)) { - TQToolTip::add(_handle, _info.name()); + TQToolTip::add(TQT_TQWIDGET(_handle), _info.name()); _handle->show(); setBackground(); } diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h index 019e52c96..fea4d92a1 100644 --- a/kicker/kicker/core/container_applet.h +++ b/kicker/kicker/core/container_applet.h @@ -84,7 +84,7 @@ public slots: protected: virtual void doLoadConfiguration( KConfigGroup& ); virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const; - virtual void alignmentChange(KPanelExtension::Alignment a); + virtual void tqalignmentChange(KPanelExtension::Alignment a); virtual TQPopupMenu* createOpMenu(); diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index bb3d7d984..2747905cd 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -37,8 +37,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const char * name ) : TQWidget( parent, name ) , _dir(KPanelApplet::Up) - , _orient(Horizontal) - , _alignment(KPanelExtension::LeftTop) + , _orient(Qt::Horizontal) + , _tqalignment(KPanelExtension::LeftTop) , _fspace(0) , _moveOffset(TQPoint(0,0)) , _aid(TQString::null) @@ -72,7 +72,7 @@ void BaseContainer::setImmutable(bool immutable) void BaseContainer::loadConfiguration( KConfigGroup& group ) { - setFreeSpace( QMIN( group.readDoubleNumEntry( "FreeSpace2", 0 ), 1 ) ); + setFreeSpace( TQMIN( group.readDoubleNumEntry( "FreeSpace2", 0 ), 1 ) ); doLoadConfiguration( group ); } @@ -110,15 +110,15 @@ void BaseContainer::slotRemoved(KConfig* config) config->sync(); } -void BaseContainer::setAlignment(KPanelExtension::Alignment a) +void BaseContainer::tqsetAlignment(KPanelExtension::Alignment a) { - if (_alignment == a) + if (_tqalignment == a) { return; } - _alignment = a; - alignmentChange(a); + _tqalignment = a; + tqalignmentChange(a); } TQPopupMenu* BaseContainer::opMenu() diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h index 1c218b103..078926a07 100644 --- a/kicker/kicker/core/container_base.h +++ b/kicker/kicker/core/container_base.h @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KConfigGroup; class TQPopupMenu; -class BaseContainer : public QWidget +class BaseContainer : public TQWidget { Q_OBJECT @@ -73,7 +73,7 @@ public: KPanelApplet::Direction popupDirection() const { return _dir; } KPanelExtension::Orientation orientation() const { return _orient; } - KPanelExtension::Alignment alignment() const { return _alignment; } + KPanelExtension::Alignment tqalignment() const { return _tqalignment; } virtual void setBackground() {} @@ -97,7 +97,7 @@ public slots: virtual void setPopupDirection(KPanelApplet::Direction d) { _dir = d; } virtual void setOrientation(KPanelExtension::Orientation o) { _orient = o; } - void setAlignment(KPanelExtension::Alignment a); + void tqsetAlignment(KPanelExtension::Alignment a); signals: void removeme(BaseContainer*); @@ -111,14 +111,14 @@ protected: virtual void doLoadConfiguration( KConfigGroup& ) {} virtual void doSaveConfiguration( KConfigGroup&, bool /* layoutOnly */ ) const {} - virtual void alignmentChange(KPanelExtension::Alignment) {} + virtual void tqalignmentChange(KPanelExtension::Alignment) {} virtual TQPopupMenu* createOpMenu() = 0; TQPopupMenu *appletOpMenu() const { return _appletOpMnu; } KPanelApplet::Direction _dir; KPanelExtension::Orientation _orient; - KPanelExtension::Alignment _alignment; + KPanelExtension::Alignment _tqalignment; double _fspace; TQPoint _moveOffset; TQString _aid; diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index bb0249843..0cd7d6f19 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -215,7 +215,7 @@ void ButtonContainer::dragButton(const TQPixmap icon) bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) { - if (o == _button && e->type() == TQEvent::MouseButtonPress) + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_button) && e->type() == TQEvent::MouseButtonPress) { static bool sentinal = false; @@ -225,10 +225,10 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) } sentinal = true; - TQMouseEvent* me = static_cast(e); + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); switch (me->button()) { - case MidButton: + case Qt::MidButton: { if (isImmutable()) { @@ -242,7 +242,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) return true; } - case RightButton: + case Qt::RightButton: { if (!kapp->authorizeKAction("kicker_rmb") || isImmutable()) @@ -252,8 +252,8 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) TQPopupMenu* menu = opMenu(); connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) ); - TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this, - (orientation() == Horizontal) ? + TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(this), + (orientation() == Qt::Horizontal) ? TQPoint(0, 0) : me->pos()); Kicker::the()->setInsertionPoint(me->globalPos()); diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 52e85bd7e..0c22245bc 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -70,7 +70,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ExtensionContainer::ExtensionContainer(const AppletInfo& info, const TQString& extensionId, TQWidget *parent) - : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder), + : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), (WFlags)(WStyle_Customize | WStyle_NoBorder)), m_settings(KSharedConfig::openConfig(info.configFile())), m_hideMode(ManualHide), m_unhideTriggeredAt(UnhideTrigger::None), @@ -97,7 +97,7 @@ ExtensionContainer::ExtensionContainer(KPanelExtension* extension, const AppletInfo& info, const TQString& extensionId, TQWidget *parent) - : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder), + : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), (WFlags)(WStyle_Customize | WStyle_NoBorder)), m_settings(KSharedConfig::openConfig(info.configFile())), _autoHidden(false), _userHidden(Unhidden), @@ -136,7 +136,7 @@ void ExtensionContainer::init() connect(UnhideTrigger::the(), TQT_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)), this, TQT_SLOT(unhideTriggered(UnhideTrigger::Trigger,int))); - _popupWidgetFilter = new PopupWidgetFilter( this ); + _popupWidgetFilter = new PopupWidgetFilter( TQT_TQOBJECT(this) ); connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer())); // layout @@ -212,7 +212,7 @@ ExtensionContainer::~ExtensionContainer() { } -TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &maxSize) const +TQSize ExtensionContainer::tqsizeHint(KPanelExtension::Position p, const TQSize &maxSize) const { int width = 0; int height = 0; @@ -262,7 +262,7 @@ TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &m if (m_extension) { - size = m_extension->sizeHint(p, maxSize - size) + size; + size = m_extension->tqsizeHint(p, maxSize - size) + size; } return size.boundedTo(maxSize); @@ -293,7 +293,7 @@ void ExtensionContainer::readConfig() } positionChange(position()); - alignmentChange(alignment()); + tqalignmentChange(tqalignment()); setSize(static_cast(m_settings.size()), m_settings.customSize()); @@ -471,7 +471,7 @@ void ExtensionContainer::moveMe() KPanelExtension::Right, KPanelExtension::Top, KPanelExtension::Bottom }; - KPanelExtension::Alignment alignments[] = { KPanelExtension::LeftTop, + KPanelExtension::Alignment tqalignments[] = { KPanelExtension::LeftTop, KPanelExtension::Center, KPanelExtension::RightBottom }; @@ -488,20 +488,20 @@ void ExtensionContainer::moveMe() // on other parameters this can lead to Bad Things(tm) // // we need to find a way to do this that doesn't result in - // sizeHint's getting called on the extension =/ + // tqsizeHint's getting called on the extension =/ // // or else we need to change the semantics for applets so that // they don't get their "you're changing position" signals through // heightForWidth/widthForHeight rects.append(UserRectSel::PanelStrut(initialGeometry(positions[i], - alignments[j], s), - s, positions[i], alignments[j])); + tqalignments[j], s), + s, positions[i], tqalignments[j])); } } } UserRectSel::PanelStrut newStrut = UserRectSel::select(rects, rect().center(), m_highlightColor); - arrange(newStrut.m_pos, newStrut.m_alignment, newStrut.m_screen); + arrange(newStrut.m_pos, newStrut.m_tqalignment, newStrut.m_screen); _is_lmb_down = false; @@ -556,12 +556,12 @@ void ExtensionContainer::enableMouseOverEffects() KickerTip::enableTipping(true); TQPoint globalPos = TQCursor::pos(); TQPoint localPos = mapFromGlobal(globalPos); - TQWidget* child = childAt(localPos); + TQWidget* child = tqchildAt(localPos); if (child) { TQMouseEvent* e = new TQMouseEvent(TQEvent::Enter, localPos, globalPos, 0, 0); - qApp->sendEvent(child, e); + tqApp->sendEvent(child, e); } } @@ -658,7 +658,7 @@ void ExtensionContainer::unhideTriggered(UnhideTrigger::Trigger tr, int Xinerama // Otherwise hide mode is automatic. The code below is slightly // complex so as to keep the same behavior as it has always had: // only unhide when the cursor position is within the widget geometry. - // We can't just do geometry().contains(TQCursor::pos()) because + // We can't just do geometry().tqcontains(TQCursor::pos()) because // now we hide the panel completely off screen. int x = TQCursor::pos().x(); @@ -702,7 +702,7 @@ void ExtensionContainer::autoHideTimeout() { // kdDebug(1210) << "PanelContainer::autoHideTimeout() " << name() << endl; // Hack: If there is a popup open, don't autohide until it closes. - TQWidget* popup = TQApplication::activePopupWidget(); + TQWidget* popup = TQT_TQWIDGET(TQApplication::activePopupWidget()); if (popup) { @@ -732,7 +732,7 @@ void ExtensionContainer::autoHideTimeout() TQRect r = geometry(); TQPoint p = TQCursor::pos(); - if (!r.contains(p) && + if (!r.tqcontains(p) && (m_settings.unhideLocation() == UnhideTrigger::None || !shouldUnhideForTrigger(m_unhideTriggeredAt))) { @@ -766,7 +766,7 @@ void ExtensionContainer::autoHide(bool hide) blockUserInput(true); TQPoint oldpos = pos(); - TQRect newextent = initialGeometry( position(), alignment(), xineramaScreen(), hide, Unhidden ); + TQRect newextent = initialGeometry( position(), tqalignment(), xineramaScreen(), hide, Unhidden ); TQPoint newpos = newextent.topLeft(); if (hide) @@ -821,8 +821,8 @@ void ExtensionContainer::autoHide(bool hide) move(oldpos.x() - i, newpos.y()); } - qApp->syncX(); - qApp->processEvents(); + tqApp->syncX(); + tqApp->processEvents(); } } else @@ -839,8 +839,8 @@ void ExtensionContainer::autoHide(bool hide) move(newpos.x(), oldpos.y() - i); } - qApp->syncX(); - qApp->processEvents(); + tqApp->syncX(); + tqApp->processEvents(); } } } @@ -878,7 +878,7 @@ void ExtensionContainer::animatedHide(bool left) } TQPoint oldpos = pos(); - TQRect newextent = initialGeometry(position(), alignment(), xineramaScreen(), false, newState); + TQRect newextent = initialGeometry(position(), tqalignment(), xineramaScreen(), false, newState); TQPoint newpos(newextent.topLeft()); if (newState != Unhidden) @@ -920,8 +920,8 @@ void ExtensionContainer::animatedHide(bool left) { move(newpos.x(), oldpos.y() - i); } - qApp->syncX(); - qApp->processEvents(); + tqApp->syncX(); + tqApp->processEvents(); } } else @@ -937,8 +937,8 @@ void ExtensionContainer::animatedHide(bool left) { move(oldpos.x() - i, newpos.y()); } - qApp->syncX(); - qApp->processEvents(); + tqApp->syncX(); + tqApp->processEvents(); } } } @@ -948,8 +948,8 @@ void ExtensionContainer::animatedHide(bool left) _userHidden = newState; actuallyUpdateLayout(); - qApp->syncX(); - qApp->processEvents(); + tqApp->syncX(); + tqApp->processEvents(); // save our hidden status so that when kicker starts up again // we'll come back in the same state @@ -965,7 +965,7 @@ bool ExtensionContainer::reserveStrut() const return !m_extension || m_extension->reserveStrut(); } -KPanelExtension::Alignment ExtensionContainer::alignment() const +KPanelExtension::Alignment ExtensionContainer::tqalignment() const { // KConfigXT really needs to get support for vars that are enums that // are defined in other classes @@ -983,7 +983,7 @@ void ExtensionContainer::updateWindowManager() int w = 0; int h = 0; - TQRect geom = initialGeometry(position(), alignment(), xineramaScreen()); + TQRect geom = initialGeometry(position(), tqalignment(), xineramaScreen()); TQRect virtRect(TQApplication::desktop()->geometry()); TQRect screenRect(TQApplication::desktop()->screenGeometry(xineramaScreen())); @@ -1106,11 +1106,11 @@ void ExtensionContainer::blockUserInput( bool block ) // eventfilter discard those events. if ( block ) { - qApp->installEventFilter( this ); + tqApp->installEventFilter( this ); } else { - qApp->removeEventFilter( this ); + tqApp->removeEventFilter( this ); } _block_user_input = block; @@ -1177,7 +1177,7 @@ int ExtensionContainer::arrangeHideButtons() _layout->setEnabled(false); } - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) { int maxWidth = width(); @@ -1221,11 +1221,11 @@ int ExtensionContainer::arrangeHideButtons() _layout->remove(_ltHB); if (kapp->reverseLayout()) { - _layout->addWidget(_ltHB, 1, 2, vertAlignment); + _layout->addWidget(_ltHB, 1, 2, (TQ_Alignment)vertAlignment); } else { - _layout->addWidget(_ltHB, 1, 0, leftAlignment | vertAlignment); + _layout->addWidget(_ltHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment)); } } @@ -1236,11 +1236,11 @@ int ExtensionContainer::arrangeHideButtons() _layout->remove(_rbHB); if (kapp->reverseLayout()) { - _layout->addWidget(_rbHB, 1, 0, leftAlignment | vertAlignment); + _layout->addWidget(_rbHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment)); } else { - _layout->addWidget(_rbHB, 1, 2, vertAlignment); + _layout->addWidget(_rbHB, 1, 2, (TQ_Alignment)vertAlignment); } } } @@ -1270,7 +1270,7 @@ int ExtensionContainer::setupBorderSpace() TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen()); TQRect h = geometry(); - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) { if (h.top() > 0) { @@ -1342,7 +1342,7 @@ void ExtensionContainer::updateHighlightColor() { KConfig *config = KGlobal::config(); config->setGroup("WM"); - TQColor color = TQApplication::palette().active().highlight(); + TQColor color = TQApplication::tqpalette().active().highlight(); m_highlightColor = config->readColorEntry("activeBackground", &color); update(); } @@ -1368,14 +1368,14 @@ void ExtensionContainer::leaveEvent(TQEvent*) maybeStartAutoHideTimer(); } -void ExtensionContainer::alignmentChange(KPanelExtension::Alignment a) +void ExtensionContainer::tqalignmentChange(KPanelExtension::Alignment a) { if (!m_extension) { return; } - m_extension->setAlignment(a); + m_extension->tqsetAlignment(a); } void ExtensionContainer::setSize(KPanelExtension::Size size, int custom) @@ -1482,7 +1482,7 @@ void ExtensionContainer::arrange(KPanelExtension::Position p, if (a != m_settings.alignment()) { m_settings.setAlignment(a); - setAlignment(a); + tqsetAlignment(a); } if (XineramaScreen != xineramaScreen()) @@ -1504,11 +1504,11 @@ KPanelExtension::Orientation ExtensionContainer::orientation() const { if (position() == KPanelExtension::Top || position() == KPanelExtension::Bottom) { - return Horizontal; + return Qt::Horizontal; } else { - return Vertical; + return Qt::Vertical; } } @@ -1521,7 +1521,7 @@ KPanelExtension::Position ExtensionContainer::position() const void ExtensionContainer::resetLayout() { - TQRect g = initialGeometry(position(), alignment(), xineramaScreen(), + TQRect g = initialGeometry(position(), tqalignment(), xineramaScreen(), autoHidden(), userHidden()); // Disable the layout while we rearrange the panel. @@ -1553,7 +1553,7 @@ void ExtensionContainer::resetLayout() haveToArrangeButtons = true; } - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { _ltHB->setArrowType(Qt::LeftArrow); _ltHB->setFixedSize(m_settings.hideButtonSize(), height()); @@ -1584,7 +1584,7 @@ void ExtensionContainer::resetLayout() haveToArrangeButtons = true; } - if ( orientation() == Horizontal) + if ( orientation() == Qt::Horizontal) { _rbHB->setArrowType(Qt::RightArrow); _rbHB->setFixedSize(m_settings.hideButtonSize(), height()); @@ -1631,7 +1631,7 @@ void ExtensionContainer::resetLayout() updateGeometry(); int endBorderWidth = haveToArrangeButtons ? arrangeHideButtons() : setupBorderSpace(); - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { if (m_extension) { @@ -1700,7 +1700,7 @@ TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workA ", " << workArea.topLeft().y() << ") to (" << workArea.bottomRight().x() << ", " << workArea.bottomRight().y() << ")" << endl;*/ - TQSize hint = sizeHint(p, workArea.size()).boundedTo(workArea.size()); + TQSize hint = tqsizeHint(p, workArea.size()).boundedTo(workArea.size()); int width = 0; int height = 0; @@ -1920,12 +1920,12 @@ void ExtensionContainer::setXineramaScreen(int screen) return; } - arrange(position(),alignment(), screen); + arrange(position(),tqalignment(), screen); } TQRect ExtensionContainer::currentGeometry() const { - return initialGeometry(position(), alignment(), xineramaScreen(), + return initialGeometry(position(), tqalignment(), xineramaScreen(), autoHidden(), userHidden()); } @@ -1986,13 +1986,13 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) { case TQEvent::MouseButtonPress: { - TQMouseEvent* me = static_cast(e); - if ( me->button() == LeftButton ) + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + if ( me->button() == Qt::LeftButton ) { _last_lmb_press = me->globalPos(); _is_lmb_down = true; } - else if (me->button() == RightButton) + else if (me->button() == Qt::RightButton) { showPanelMenu(me->globalPos()); return true; // don't crash! @@ -2002,8 +2002,8 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) case TQEvent::MouseButtonRelease: { - TQMouseEvent* me = static_cast(e); - if ( me->button() == LeftButton ) + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + if ( me->button() == Qt::LeftButton ) { _is_lmb_down = false; } @@ -2014,7 +2014,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) { TQMouseEvent* me = (TQMouseEvent*) e; if (_is_lmb_down && - ((me->state() & LeftButton) == LeftButton) && + ((me->state() & Qt::LeftButton) == Qt::LeftButton) && !Kicker::the()->isImmutable() && !m_settings.config()->isImmutable() && !ExtensionManager::the()->isMenuBar(this)) diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index 8eedd4e6f..fdb3be989 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -49,7 +49,7 @@ class PopupWidgetFilter; class PanelExtensionOpMenu; class TQColor; -class ExtensionContainer : public QFrame +class ExtensionContainer : public TQFrame { Q_OBJECT @@ -66,7 +66,7 @@ public: TQWidget *parent = 0); virtual ~ExtensionContainer(); - virtual TQSize sizeHint(KPanelExtension::Position, const TQSize &maxSize) const; + virtual TQSize tqsizeHint(KPanelExtension::Position, const TQSize &maxSize) const; const AppletInfo& info() const { return _info; } @@ -86,7 +86,7 @@ public: KPanelExtension::Orientation orientation() const; KPanelExtension::Position position() const; - void setPosition(KPanelExtension::Position p) { arrange( p, alignment(), xineramaScreen() ); } + void setPosition(KPanelExtension::Position p) { arrange( p, tqalignment(), xineramaScreen() ); } int xineramaScreen() const; void setXineramaScreen(int screen); @@ -100,8 +100,8 @@ public: void unhideIfHidden(int showForHowManyMS = 0); bool reserveStrut() const; - KPanelExtension::Alignment alignment() const; - void setAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); } + KPanelExtension::Alignment tqalignment() const; + void tqsetAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); } TQRect currentGeometry() const; TQRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a, @@ -159,7 +159,7 @@ private: int XineramaScreen, const TQSize &s, TQRect workArea, bool autohidden = false, UserHidden userHidden = Unhidden) const; void positionChange(KPanelExtension::Position p); - void alignmentChange(KPanelExtension::Alignment a); + void tqalignmentChange(KPanelExtension::Alignment a); void xineramaScreenChange(int /*XineramaScreen*/) {} int arrangeHideButtons(); int setupBorderSpace(); @@ -198,7 +198,7 @@ private: TQColor m_highlightColor; }; -class PopupWidgetFilter : public QObject +class PopupWidgetFilter : public TQObject { Q_OBJECT diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index 8fd839a20..38e0f844b 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -314,7 +314,7 @@ void ContainerArea::loadContainers(const TQStringList& containers) BaseContainer* a = 0; - int sep = appletId.findRev('_'); + int sep = appletId.tqfindRev('_'); Q_ASSERT(sep != -1); TQString appletType = appletId.left(sep); @@ -923,7 +923,7 @@ void ContainerArea::startContainerMove(BaseContainer *a) KickerTip::enableTipping(false); emit maintainFocus(true); setMouseTracking(true); - grabMouse(sizeAllCursor); + grabMouse(tqsizeAllCursor); m_layout->setStretchEnabled(false); a->raise(); @@ -940,7 +940,7 @@ void ContainerArea::mouseReleaseEvent(TQMouseEvent *) // so we need to complete the move here _autoScrollTimer.stop(); releaseMouse(); - setCursor(arrowCursor); + setCursor(tqarrowCursor); setMouseTracking(false); _moveAC->completeMoveOperation(); @@ -962,12 +962,12 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) return; } - if (ev->state() == LeftButton && !rect().contains(ev->pos())) + if (ev->state() == Qt::LeftButton && !TQT_TQRECT_OBJECT(rect()).tqcontains(ev->pos())) { // leaveEvent() doesn't work, while grabbing the mouse _autoScrollTimer.stop(); releaseMouse(); - setCursor(arrowCursor); + setCursor(tqarrowCursor); setMouseTracking(false); _moveAC->completeMoveOperation(); @@ -986,7 +986,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) return; } - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { int oldX = _moveAC->x() + _moveAC->moveOffset().x(); int x = ev->pos().x() + contentsX(); @@ -1082,7 +1082,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) preferedHeight = draggedContainer->heightForWidth(width()); } - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { _dragIndicator->setPreferredSize(TQSize(preferedWidth, height())); } @@ -1103,9 +1103,9 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) --it; BaseContainer* a = *it; - if ((orientation() == Horizontal && + if ((orientation() == Qt::Horizontal && a->x() < (ev->pos().x() + contentsX()) - _dragMoveOffset.x()) || - (orientation() == Vertical && + (orientation() == Qt::Vertical && a->y() < (ev->pos().y() + contentsY()) - _dragMoveOffset.y())) { _dragMoveAC = a; @@ -1114,7 +1114,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) } while (it != m_containers.begin()); } - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x()); } @@ -1139,11 +1139,11 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev) TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0); TQApplication::sendEvent(this, &fakedKeyPress); TQApplication::sendEvent(this, &fakedKeyRelease); - qApp->processEvents(); + tqApp->processEvents(); startContainerMove(_moveAC); // Align the container to the mouse position. - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { m_layout->moveContainerSwitch(_moveAC, ev->pos().x() + contentsX() - _moveAC->x()); } @@ -1159,7 +1159,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev) return; } - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x()); } @@ -1200,22 +1200,22 @@ void ContainerArea::dropEvent(TQDropEvent *ev) return; } - TQObject *parent = ev->source() ? ev->source()->parent() : 0; - while (parent && (parent != this)) + TQObject *parent = ev->source() ? ev->source()->tqparent() : 0; + while (parent && (TQT_BASE_OBJECT(parent) != TQT_BASE_OBJECT(this))) { - parent = parent->parent(); + parent = parent->tqparent(); } if (parent) { // Move container a - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { int oldX = a->x(); int x = _dragIndicator->x(); m_layout->moveContainerSwitch(a, x - oldX); } - else if (orientation() == Vertical) + else if (orientation() == Qt::Vertical) { int oldY = a->y(); int y = _dragIndicator->y(); @@ -1387,7 +1387,7 @@ bool ContainerArea::eventFilter(TQObject* o, TQEvent* e) // which contain a ContainerArea can react to layout changes of its // contents. For example: If an applets grows, the top level widget may // want to grow as well. - if (o == m_contents) + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_contents)) { if (e->type() == TQEvent::LayoutHint) { @@ -1408,7 +1408,7 @@ void ContainerArea::resizeEvent(TQResizeEvent *ev) void ContainerArea::viewportResizeEvent(TQResizeEvent* ev) { Panner::viewportResizeEvent(ev); - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { m_contents->resize(kMax(widthForHeight(ev->size().height()), ev->size().width()), @@ -1430,7 +1430,7 @@ void ContainerArea::setBackground() if (KickerSettings::transparent() && (KickerSettings::menubarPanelTransparent() || - !ExtensionManager::the()->isMenuBar(topLevelWidget()))) + !ExtensionManager::the()->isMenuBar(tqtopLevelWidget()))) { if (!_rootPixmap) { @@ -1441,7 +1441,7 @@ void ContainerArea::setBackground() } else { - _rootPixmap->repaint(true); + _rootPixmap->tqrepaint(true); } double tint = double(KickerSettings::tintValue()) / 100; @@ -1481,7 +1481,7 @@ void ContainerArea::setBackground() { TQImage bgImage = srcImage; - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) { if (KickerSettings::rotateBackground()) { @@ -1542,7 +1542,7 @@ TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a) if (a) { - BaseContainer::Iterator it = m_containers.find(a); + BaseContainer::Iterator it = m_containers.tqfind(a); if (it != m_containers.end() && ++it != m_containers.end()) { @@ -1559,7 +1559,7 @@ TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a) } } - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { if (a) { @@ -1593,7 +1593,7 @@ void ContainerArea::moveDragIndicator(int pos) // Move _dragIndicator to position pos, restricted by availableSpace. // Resize _dragIndicator if necessary. - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { if (availableSpace.size().width() < _dragIndicator->preferredSize().width()) @@ -1633,7 +1633,7 @@ void ContainerArea::moveDragIndicator(int pos) void ContainerArea::updateBackground( const TQPixmap& pm ) { - TQBrush bgBrush(colorGroup().background(), pm); + TQBrush bgBrush(tqcolorGroup().background(), pm); TQPalette pal = kapp->palette(); pal.setBrush(TQColorGroup::Background, bgBrush); setPalette(pal); @@ -1690,7 +1690,7 @@ void ContainerArea::setPosition(KPanelExtension::Position p) // when that gets called AFTER we've been moved // it's not always safe to do the resize here, as scroll buttons // from the panner may get in our way. =/ - if (o == Horizontal) + if (o == Qt::Horizontal) { resizeContents(0, height()); } @@ -1718,17 +1718,17 @@ void ContainerArea::setPosition(KPanelExtension::Position p) m_contents->move(0, 0); setBackground(); - // container extension repaints for us! - //repaint(); + // container extension tqrepaints for us! + //tqrepaint(); } -void ContainerArea::setAlignment(KPanelExtension::Alignment a) +void ContainerArea::tqsetAlignment(KPanelExtension::Alignment a) { for (BaseContainer::ConstIterator it = m_containers.begin(); it != m_containers.end(); ++it) { - (*it)->setAlignment(a); + (*it)->tqsetAlignment(a); } } @@ -1736,7 +1736,7 @@ void ContainerArea::autoScroll() { if(!_moveAC) return; - if(orientation() == Horizontal) { + if(orientation() == Qt::Horizontal) { if(_moveAC->pos().x() <= 80) scrollBy(-10, 0); else if(_moveAC->pos().x() >= width() - _moveAC->width() - 80) @@ -1784,7 +1784,7 @@ void ContainerArea::updateContainersBackground() // properly, so just cache the geometry and update background only when // the geometry changes or when the background really changes (in which // case the cached is cleared). - if( !m_cachedGeometry.contains( *it )) + if( !m_cachedGeometry.tqcontains( *it )) { m_cachedGeometry[ *it ] = TQRect(); connect( *it, TQT_SIGNAL( destroyed()), TQT_SLOT( destroyCachedGeometry())); @@ -1894,9 +1894,9 @@ TQStringList ContainerArea::listContainers() const return m_layout->listItems(); } -void ContainerArea::repaint() +void ContainerArea::tqrepaint() { - Panner::repaint(); + Panner::tqrepaint(); } void ContainerArea::showAddAppletDialog() @@ -1952,8 +1952,8 @@ void DragIndicator::paintEvent(TQPaintEvent*) { TQPainter painter(this); TQRect rect(0, 0, width(), height()); - style().drawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(), - TQStyle::Style_Default, colorGroup().base() ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, tqcolorGroup(), + TQStyle::Style_Default, tqcolorGroup().base() ); } void DragIndicator::mousePressEvent(TQMouseEvent*) diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h index a43cd8c9c..f8532b511 100644 --- a/kicker/kicker/core/containerarea.h +++ b/kicker/kicker/core/containerarea.h @@ -101,9 +101,9 @@ public slots: void removeContainers(BaseContainer::List containers); void takeContainer(BaseContainer* a); void setPosition(KPanelExtension::Position p); - void setAlignment(KPanelExtension::Alignment a); + void tqsetAlignment(KPanelExtension::Alignment a); void slotSaveContainerConfig(); - void repaint(); + void tqrepaint(); void showAddAppletDialog(); void addAppletDialogDone(); @@ -172,7 +172,7 @@ private: }; -class DragIndicator : public QWidget +class DragIndicator : public TQWidget { Q_OBJECT diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index 4ae63077e..301011688 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "container_applet.h" #include "container_button.h" -class ContainerAreaLayoutIterator : public QGLayoutIterator +class ContainerAreaLayoutIterator : public TQGLayoutIterator { public: ContainerAreaLayoutIterator(ContainerAreaLayout::ItemList *l) @@ -72,7 +72,6 @@ class ContainerAreaLayoutIterator : public QGLayoutIterator ContainerAreaLayout::ItemList* m_list; }; - int ContainerAreaLayoutItem::heightForWidth(int w) const { BaseContainer* container = dynamic_cast(item->widget()); @@ -82,7 +81,7 @@ int ContainerAreaLayoutItem::heightForWidth(int w) const } else { - return item->sizeHint().height(); + return item->tqsizeHint().height(); } } @@ -95,7 +94,7 @@ int ContainerAreaLayoutItem::widthForHeight(int h) const } else { - return item->sizeHint().width(); + return item->tqsizeHint().width(); } } @@ -140,7 +139,7 @@ void ContainerAreaLayoutItem::setGeometryR(const TQRect& r) int ContainerAreaLayoutItem::widthForHeightR(int h) const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return widthForHeight(h); } @@ -152,7 +151,7 @@ int ContainerAreaLayoutItem::widthForHeightR(int h) const int ContainerAreaLayoutItem::widthR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return geometry().width(); } @@ -164,7 +163,7 @@ int ContainerAreaLayoutItem::widthR() const int ContainerAreaLayoutItem::heightR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return geometry().height(); } @@ -176,7 +175,7 @@ int ContainerAreaLayoutItem::heightR() const int ContainerAreaLayoutItem::leftR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { if (TQApplication::reverseLayout()) return m_layout->geometry().right() - geometry().right(); @@ -191,7 +190,7 @@ int ContainerAreaLayoutItem::leftR() const int ContainerAreaLayoutItem::rightR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { if (TQApplication::reverseLayout()) return m_layout->geometry().right() - geometry().left(); @@ -207,14 +206,46 @@ int ContainerAreaLayoutItem::rightR() const ContainerAreaLayout::ContainerAreaLayout(TQWidget* parent) : TQLayout(parent), - m_orientation(Horizontal), + m_orientation(Qt::Horizontal), m_stretchEnabled(true) { } -void ContainerAreaLayout::addItem(TQLayoutItem* item) +#ifdef USE_QT4 +/*! + \reimp +*/ +int ContainerAreaLayout::count() const { + return m_items.count(); +} + +/*! + \reimp +*/ +TQLayoutItem* ContainerAreaLayout::itemAt(int index) const { + return index >= 0 && index < m_items.count() ? (*m_items.at(index))->item : 0; +} + +/*! + \reimp +*/ +TQLayoutItem* ContainerAreaLayout::takeAt(int index) { + if (index < 0 || index >= m_items.count()) + return 0; + ContainerAreaLayoutItem *b = *m_items.at(index); + m_items.remove(m_items.at(index)); + TQLayoutItem *item = b->item; + b->item = 0; + delete b; + + invalidate(); + return item; +} +#endif // USE_QT4 + +void ContainerAreaLayout::addItem(QLayoutItem* item) { - m_items.append(new ContainerAreaLayoutItem(item, this)); + m_items.append(new ContainerAreaLayoutItem(static_cast(item), this)); } void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertionPoint) @@ -252,7 +283,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertio return; } - int insPos = (orientation() == Horizontal) ? insertionPoint.x(): insertionPoint.y(); + int insPos = (orientation() == Qt::Horizontal) ? insertionPoint.x(): insertionPoint.y(); Item* current = *currentIt; Item* next = *nextIt; @@ -319,7 +350,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertio if (current) { m_items.erase(m_items.fromLast()); - ItemList::iterator insertIt = m_items.find(current); + ItemList::iterator insertIt = m_items.tqfind(current); if (insertIt == m_items.begin()) { @@ -384,11 +415,11 @@ TQWidget* ContainerAreaLayout::widgetAt(int index) const return m_items[index]->item->widget(); } -TQSize ContainerAreaLayout::sizeHint() const +TQSize ContainerAreaLayout::tqsizeHint() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeSmall); - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return TQSize(widthForHeight(size), size); } @@ -398,11 +429,11 @@ TQSize ContainerAreaLayout::sizeHint() const } } -TQSize ContainerAreaLayout::minimumSize() const +TQSize ContainerAreaLayout::tqminimumSize() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny); - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return TQSize(widthForHeight(size), size); } @@ -414,12 +445,18 @@ TQSize ContainerAreaLayout::minimumSize() const TQLayoutIterator ContainerAreaLayout::iterator() { + // [FIXME] +#ifdef USE_QT4 + #warning [FIXME] ContainerAreaLayout iterators may not function correctly under Qt4 + return TQLayoutIterator(this); // [FIXME] +#else // USE_QT4 return TQLayoutIterator(new ContainerAreaLayoutIterator(&m_items)); +#endif // USE_QT4 } void ContainerAreaLayout::setGeometry(const TQRect& rect) { - //RESEARCH: when can we short curcuit this? + //RESEARCH: when can we short circuit this? // maybe a dirty flag to be set when we have containers // that needs laying out? @@ -522,7 +559,7 @@ int ContainerAreaLayout::distanceToPreviousItem(ItemList::const_iterator it) con void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) { - const bool horizontal = orientation() == Horizontal; + const bool horizontal = orientation() == Qt::Horizontal; const bool reverseLayout = TQApplication::reverseLayout(); if (horizontal && reverseLayout) @@ -588,7 +625,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) : kMin(newPos, last->leftR() - moving->widthR()); // Move 'moving' to its new position in the container list. - ItemList::iterator itMoving = m_items.find(moving); + ItemList::iterator itMoving = m_items.tqfind(moving); if (itMoving != m_items.end()) { @@ -659,7 +696,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) int ContainerAreaLayout::moveContainerPush(TQWidget* a, int distance) { - const bool horizontal = orientation() == Horizontal; + const bool horizontal = orientation() == Qt::Horizontal; const bool reverseLayout = TQApplication::reverseLayout(); // Get the iterator 'it' pointing to the layoutitem representing 'a'. @@ -730,7 +767,7 @@ int ContainerAreaLayout::moveContainerPushRecursive(ItemList::const_iterator it, TQRect ContainerAreaLayout::transform(const TQRect& r) const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { if (TQApplication::reverseLayout()) { @@ -751,7 +788,7 @@ TQRect ContainerAreaLayout::transform(const TQRect& r) const int ContainerAreaLayout::widthForHeightR(int h) const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return widthForHeight(h); } @@ -763,7 +800,7 @@ int ContainerAreaLayout::widthForHeightR(int h) const int ContainerAreaLayout::widthR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return geometry().width(); } @@ -775,7 +812,7 @@ int ContainerAreaLayout::widthR() const int ContainerAreaLayout::heightR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return geometry().height(); } @@ -787,7 +824,7 @@ int ContainerAreaLayout::heightR() const int ContainerAreaLayout::leftR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) return geometry().left(); else return geometry().top(); @@ -795,7 +832,7 @@ int ContainerAreaLayout::leftR() const int ContainerAreaLayout::rightR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) return geometry().right(); else return geometry().bottom(); diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h index 995497268..d91113660 100644 --- a/kicker/kicker/core/containerarealayout.h +++ b/kicker/kicker/core/containerarealayout.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ContainerAreaLayout; -class ContainerAreaLayoutItem : public Qt +class ContainerAreaLayoutItem : public TQt { public: ContainerAreaLayoutItem(TQLayoutItem* i, ContainerAreaLayout* layout) @@ -71,7 +71,7 @@ class ContainerAreaLayoutItem : public Qt ContainerAreaLayout* m_layout; }; -class ContainerAreaLayout : public QLayout +class ContainerAreaLayout : public TQLayout { public: typedef ContainerAreaLayoutItem Item; @@ -79,12 +79,12 @@ class ContainerAreaLayout : public QLayout ContainerAreaLayout(TQWidget* parent); - void addItem(TQLayoutItem* item); + void addItem(QLayoutItem* item); void insertIntoFreeSpace(TQWidget* item, TQPoint insertionPoint); TQStringList listItems() const; TQWidget* widgetAt(int index) const; - TQSize sizeHint() const; - TQSize minimumSize() const; + TQSize tqsizeHint() const; + TQSize tqminimumSize() const; TQLayoutIterator iterator(); void setGeometry(const TQRect& rect); @@ -108,6 +108,12 @@ class ContainerAreaLayout : public QLayout int leftR() const; int rightR() const; +#ifdef USE_QT4 + + QLAYOUT_REQUIRED_METHOD_DECLARATIONS + +#endif // USE_QT4 + private: int moveContainerPushRecursive(ItemList::const_iterator it, int distance); int distanceToPreviousItem(ItemList::const_iterator it) const; diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index e0f68ce8a..7921c636d 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -140,7 +140,7 @@ void ExtensionManager::initialize() TQString extensionId(*it); // create a matching applet container - if (extensionId.find("Extension") == -1) + if (extensionId.tqfind("Extension") == -1) { continue; } @@ -259,7 +259,7 @@ void ExtensionManager::migrateMenubar() { TQString extensionId(*it); - if (extensionId.find("Extension") == -1) + if (extensionId.tqfind("Extension") == -1) { continue; } @@ -291,12 +291,12 @@ void ExtensionManager::migrateMenubar() } KConfigGroup group(&extensionConfig, appletId.latin1()); - TQString appletType = appletId.left(appletId.findRev('_')); + TQString appletType = appletId.left(appletId.tqfindRev('_')); if (appletType == "Applet") { TQString appletFile = group.readPathEntry("DesktopFile"); - if (appletFile.find("menuapplet.desktop") != -1) + if (appletFile.tqfind("menuapplet.desktop") != -1) { TQString menubarConfig = locate("config", extension); KIO::NetAccess::copy(menubarConfig, @@ -371,7 +371,7 @@ void ExtensionManager::updateMenubar() KMenuBar tmpmenu; tmpmenu.insertItem("KDE Rocks!"); m_menubarPanel->setSize(KPanelExtension::SizeCustom, - tmpmenu.sizeHint().height()); + tmpmenu.tqsizeHint().height()); m_menubarPanel->writeConfig(); emit desktopIconsAreaChanged(desktopIconsArea(m_menubarPanel->xineramaScreen()), @@ -702,7 +702,7 @@ void ExtensionManager::reduceArea(TQRect &area, const ExtensionContainer *extens return; } - TQRect geom = extension->initialGeometry(extension->position(), extension->alignment(), + TQRect geom = extension->initialGeometry(extension->position(), extension->tqalignment(), extension->xineramaScreen()); // reduce given area (TQRect) to the space not covered by the given extension diff --git a/kicker/kicker/core/extensionmanager.h b/kicker/kicker/core/extensionmanager.h index 6de7b35e1..47db7006e 100644 --- a/kicker/kicker/core/extensionmanager.h +++ b/kicker/kicker/core/extensionmanager.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. const int XineramaAllScreens = -2; -class ExtensionManager : public QObject +class ExtensionManager : public TQObject { Q_OBJECT diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index d91e1eaf9..ce7de00c0 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -115,7 +115,7 @@ Kicker::Kicker() // initialize our keys // note that this creates the KMenu by calling MenuManager::the() - keys = new KGlobalAccel( this ); + keys = new KGlobalAccel( TQT_TQOBJECT(this) ); #define KICKER_ALL_BINDINGS #include "kickerbindings.cpp" keys->readSettings(); @@ -199,7 +199,7 @@ void Kicker::paletteChanged() { KConfigGroup c(KGlobal::config(), "General"); KickerSettings::setTintColor(c.readColorEntry("TintColor", - &palette().active().mid())); + &tqpalette().active().mid())); KickerSettings::self()->writeConfig(); } diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp index bc62df231..46cfa432d 100644 --- a/kicker/kicker/core/kickerbindings.cpp +++ b/kicker/kicker/core/kickerbindings.cpp @@ -23,10 +23,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, target, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4, target, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(target), TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, target, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString(), key3, key4 ) #endif #define WIN KKey::QtWIN diff --git a/kicker/kicker/core/kmenubase.ui b/kicker/kicker/core/kmenubase.ui index 1adb59b38..8a86f366d 100644 --- a/kicker/kicker/core/kmenubase.ui +++ b/kicker/kicker/core/kmenubase.ui @@ -1,6 +1,6 @@ KMenuBase - + KMenu @@ -21,7 +21,7 @@ MShape - + m_search @@ -43,7 +43,7 @@ 0 - + m_searchFrame @@ -55,13 +55,13 @@ 0 - + 0 52 - + 32767 52 @@ -80,7 +80,7 @@ unnamed - + layout18 @@ -88,7 +88,7 @@ unnamed - + m_searchLabel @@ -117,7 +117,7 @@ - + m_searchPixmap @@ -129,13 +129,13 @@ 0 - + 32 32 - + 32 32 @@ -165,7 +165,7 @@ Preferred - + 16 20 @@ -174,7 +174,7 @@ - + m_footer @@ -196,7 +196,7 @@ 4 - + m_userInfo @@ -222,14 +222,14 @@ MinimumExpanding - + 10 20 - + m_branding @@ -241,7 +241,7 @@ 0 - + 90 24 @@ -270,7 +270,7 @@ Fixed - + 14 20 diff --git a/kicker/kicker/core/kmenubase.ui.h b/kicker/kicker/core/kmenubase.ui.h index e1ed1ac25..492ae4aab 100644 --- a/kicker/kicker/core/kmenubase.ui.h +++ b/kicker/kicker/core/kmenubase.ui.h @@ -5,5 +5,5 @@ void KMenuBase::init() XSetWindowAttributes attrs; attrs.override_redirect = True; XChangeWindowAttributes( qt_xdisplay(), winId(), CWOverrideRedirect, &attrs ); - setWFlags( Qt::WType_Popup ); + setWFlags( (WFlags)TQt::WType_Popup ); } diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index 76e94a0e3..44d891f1e 100644 --- a/kicker/kicker/core/main.cpp +++ b/kicker/kicker/core/main.cpp @@ -73,7 +73,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) XCloseDisplay(dpy); dpy = 0; - if ((pos = display_name.findRev('.')) != -1) + if ((pos = display_name.tqfindRev('.')) != -1) display_name.remove(pos, 10); TQCString env; diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index 61110de14..776056647 100644 --- a/kicker/kicker/core/menumanager.cpp +++ b/kicker/kicker/core/menumanager.cpp @@ -156,8 +156,8 @@ void MenuManager::kmenuAccelActivated() r = desktop->geometry(); else r = desktop->screenGeometry(desktop->screenNumber(TQCursor::pos())); - // kMenu->rect() is not valid before showing, use sizeHint() - p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->sizeHint()).center(); + // kMenu->rect() is not valid before showing, use tqsizeHint() + p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->tqsizeHint()).center(); m_kmenu->popup(p); // when the cursor is in the area where the menu pops up, @@ -170,15 +170,15 @@ void MenuManager::kmenuAccelActivated() { // We need the kmenu's size to place it at the right position. // We cannot rely on the popup menu's current size(), if it wasn't - // shown before, so we resize it here according to its sizeHint(). - const TQSize size = m_kmenu->sizeHint(); + // shown before, so we resize it here according to its tqsizeHint(). + const TQSize size = m_kmenu->tqsizeHint(); m_kmenu->resize(size.width(),size.height()); PanelPopupButton* button = findKButtonFor(m_kmenu->widget()); // let's unhide the panel while we're at it. traverse the widget // hierarchy until we find the panel, if any - TQObject* menuParent = button->parent(); + TQObject* menuParent = button->tqparent(); while (menuParent) { ExtensionContainer* ext = dynamic_cast(menuParent); @@ -188,11 +188,11 @@ void MenuManager::kmenuAccelActivated() ext->unhideIfHidden(); // make sure it's unhidden before we use it to figure out // where to popup - qApp->processEvents(); + tqApp->processEvents(); break; } - menuParent = menuParent->parent(); + menuParent = menuParent->tqparent(); } button->showMenu(); } diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp index 2bd70c82b..d11c14c28 100644 --- a/kicker/kicker/core/panelextension.cpp +++ b/kicker/kicker/core/panelextension.cpp @@ -100,7 +100,7 @@ void PanelExtension::populateContainerArea() { _containerArea->show(); - if (ExtensionManager::the()->isMainPanel(topLevelWidget())) + if (ExtensionManager::the()->isMainPanel(tqtopLevelWidget())) { setObjId("Panel"); _containerArea->initialize(true); @@ -139,7 +139,7 @@ void PanelExtension::positionChange(Position p) _containerArea->setPosition(p); } -TQSize PanelExtension::sizeHint(Position p, TQSize maxSize) const +TQSize PanelExtension::tqsizeHint(Position p, TQSize maxSize) const { TQSize size; @@ -162,7 +162,7 @@ bool PanelExtension::eventFilter(TQObject*, TQEvent * e) if ( e->type() == TQEvent::MouseButtonPress ) { TQMouseEvent* me = (TQMouseEvent*) e; - if ( me->button() == RightButton && kapp->authorize("action/kicker_rmb")) + if ( me->button() == Qt::RightButton && kapp->authorize("action/kicker_rmb")) { Kicker::the()->setInsertionPoint(me->globalPos()); opMenu()->exec(me->globalPos()); diff --git a/kicker/kicker/core/panelextension.h b/kicker/kicker/core/panelextension.h index c7882291f..61e6c229c 100644 --- a/kicker/kicker/core/panelextension.h +++ b/kicker/kicker/core/panelextension.h @@ -80,7 +80,7 @@ k_dcop: void configure(); // KDE4: remove, moved to Kikcker public: - TQSize sizeHint(Position, TQSize maxSize) const; + TQSize tqsizeHint(Position, TQSize maxSize) const; Position preferedPosition() const { return Bottom; } bool eventFilter( TQObject *, TQEvent * ); diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp index 81975ccae..86270db62 100644 --- a/kicker/kicker/core/pluginmanager.cpp +++ b/kicker/kicker/core/pluginmanager.cpp @@ -159,7 +159,7 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info, if (applet) { - _dict.insert( applet, new AppletInfo( info ) ); + _dict.insert( TQT_TQOBJECT(applet), new AppletInfo( info ) ); connect( applet, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); } @@ -197,7 +197,7 @@ KPanelExtension* PluginManager::loadExtension( KPanelExtension* extension = init_ptr( parent, info.configFile() ); if( extension ) { - _dict.insert( extension, new AppletInfo( info ) ); + _dict.insert( TQT_TQOBJECT(extension), new AppletInfo( info ) ); connect( extension, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); } @@ -272,7 +272,7 @@ AppletContainer* PluginManager::createAppletContainer( return 0; } - bool untrusted = m_untrustedApplets.find(desktopFile) != m_untrustedApplets.end(); + bool untrusted = m_untrustedApplets.tqfind(desktopFile) != m_untrustedApplets.end(); if (isStartup && untrusted) { // don't load extensions that bombed on us previously! @@ -325,7 +325,7 @@ ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desk if (!internal) { - bool untrusted = m_untrustedExtensions.find(desktopFile) != m_untrustedExtensions.end(); + bool untrusted = m_untrustedExtensions.tqfind(desktopFile) != m_untrustedExtensions.end(); if (isStartup && untrusted) { // don't load extensions that bombed on us previously! @@ -365,7 +365,7 @@ LibUnloader::LibUnloader( const TQString &libName, TQObject *parent ) void LibUnloader::unload( const TQString &libName ) { - (void)new LibUnloader( libName, kapp ); + (void)new LibUnloader( libName, TQT_TQOBJECT(kapp) ); } void LibUnloader::unload() diff --git a/kicker/kicker/core/pluginmanager.h b/kicker/kicker/core/pluginmanager.h index cb5e0a89f..f67c13490 100644 --- a/kicker/kicker/core/pluginmanager.h +++ b/kicker/kicker/core/pluginmanager.h @@ -38,7 +38,7 @@ class KPanelApplet; class KPanelExtension; class TQPopupMenu; -class KDE_EXPORT PluginManager : public QObject +class KDE_EXPORT PluginManager : public TQObject { Q_OBJECT @@ -88,7 +88,7 @@ private: TQStringList m_untrustedExtensions; }; -class LibUnloader : public QObject +class LibUnloader : public TQObject { Q_OBJECT public: diff --git a/kicker/kicker/core/showdesktop.h b/kicker/kicker/core/showdesktop.h index 8d4d2546c..88cc7d7c7 100644 --- a/kicker/kicker/core/showdesktop.h +++ b/kicker/kicker/core/showdesktop.h @@ -31,7 +31,7 @@ class KWinModule; /** * Singleton class that handles desktop access (minimizing all windows) */ -class ShowDesktop : public QObject +class ShowDesktop : public TQObject { Q_OBJECT diff --git a/kicker/kicker/core/userrectsel.cpp b/kicker/kicker/core/userrectsel.cpp index d4b54f04a..d48c43aad 100644 --- a/kicker/kicker/core/userrectsel.cpp +++ b/kicker/kicker/core/userrectsel.cpp @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "userrectsel.moc" UserRectSel::UserRectSel(const RectList& rects, const TQPoint& _offset, const TQColor& color) - : TQWidget(0, 0, WStyle_Customize | WX11BypassWM), + : TQWidget(0, 0, (WFlags)(WStyle_Customize | WX11BypassWM)), rectangles(rects), offset(_offset) { @@ -46,9 +46,9 @@ UserRectSel::~UserRectSel() void UserRectSel::mouseReleaseEvent(TQMouseEvent * e) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { - qApp->exit_loop(); + tqApp->exit_loop(); } } @@ -88,12 +88,12 @@ void UserRectSel::paintCurrent() { for (i = 0; i < 4; i++) { - _frame[i] = new TQWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM); + _frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM)); _frame[i]->setPaletteBackgroundColor(Qt::black); } for (i = 4; i < 8; i++) { - _frame[i] = new TQWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM); + _frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM)); _frame[i]->setPaletteBackgroundColor(_color); } } @@ -138,10 +138,10 @@ UserRectSel::PanelStrut UserRectSel::select(const RectList& rects, const TQPoint sel.show(); sel.grabMouse(); sel.paintCurrent(); - qApp->enter_loop(); + tqApp->enter_loop(); sel.paintCurrent(); sel.releaseMouse(); - qApp->syncX(); + tqApp->syncX(); return sel.current; } diff --git a/kicker/kicker/core/userrectsel.h b/kicker/kicker/core/userrectsel.h index 63ba47fd5..0e9533e08 100644 --- a/kicker/kicker/core/userrectsel.h +++ b/kicker/kicker/core/userrectsel.h @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ShutUpCompiler; -class UserRectSel : public QWidget +class UserRectSel : public TQWidget { Q_OBJECT @@ -43,17 +43,17 @@ class UserRectSel : public QWidget PanelStrut() : m_screen(-1), m_pos(KPanelExtension::Bottom), - m_alignment(KPanelExtension::LeftTop) + m_tqalignment(KPanelExtension::LeftTop) { } PanelStrut(const TQRect& rect, int XineramaScreen, KPanelExtension::Position pos, - KPanelExtension::Alignment alignment) + KPanelExtension::Alignment tqalignment) : m_rect(rect), m_screen(XineramaScreen), m_pos(pos), - m_alignment(alignment) + m_tqalignment(tqalignment) { } @@ -61,7 +61,7 @@ class UserRectSel : public QWidget { return m_screen == rhs.m_screen && m_pos == rhs.m_pos && - m_alignment == rhs.m_alignment; + m_tqalignment == rhs.m_tqalignment; } bool operator!=(const PanelStrut& rhs) @@ -72,7 +72,7 @@ class UserRectSel : public QWidget TQRect m_rect; int m_screen; KPanelExtension::Position m_pos; - KPanelExtension::Alignment m_alignment; + KPanelExtension::Alignment m_tqalignment; }; typedef TQValueVector RectList; diff --git a/kicker/kicker/interfaces/kickoff-search-plugin.cpp b/kicker/kicker/interfaces/kickoff-search-plugin.cpp index c229c85b0..dc887d5e8 100644 --- a/kicker/kicker/interfaces/kickoff-search-plugin.cpp +++ b/kicker/kicker/interfaces/kickoff-search-plugin.cpp @@ -31,7 +31,7 @@ KickoffSearch::Plugin::~Plugin() KickoffSearch::KickoffSearchInterface* KickoffSearch::Plugin::kickoffSearchInterface() { - return static_cast( parent()->child( 0, "KickoffSearch::KickoffSearchInterface" ) ); + return static_cast( tqparent()->child( 0, "KickoffSearch::KickoffSearchInterface" ) ); } #include "kickoff-search-plugin.moc" diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp index 97a35aff6..bc3baa9e1 100644 --- a/kicker/kicker/kicker-3.4-reverseLayout.cpp +++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp @@ -88,7 +88,7 @@ int main(int argc, char** argv) applets[*it].freeSpace = 1 - applets[*it].freeSpace; // Take care of stretchable applets. - if (stretchableApplets.contains(applets[*it].desktopFile)) + if (stretchableApplets.tqcontains(applets[*it].desktopFile)) { if (it != appletIds.begin()) { diff --git a/kicker/kicker/plugins/beaglesearch.cpp b/kicker/kicker/plugins/beaglesearch.cpp index 9f86c8fbd..f75f719ab 100644 --- a/kicker/kicker/plugins/beaglesearch.cpp +++ b/kicker/kicker/plugins/beaglesearch.cpp @@ -347,7 +347,7 @@ BeagleUtil::timestringToBeagleTimestamp(TQString timestring) //kdDebug () << "datetime string:" << timestring << endl; // FIXME: error check timestring format if (timestring.isNull () || timestring.stripWhiteSpace () == "" || timestring.length() != 8 ) - return beagle_timestamp_new_from_unix_time (TQDateTime::currentDateTime ().toTime_t ()); + return beagle_timestamp_new_from_unix_time (TQDateTime::tqcurrentDateTime ().toTime_t ()); //TQDateTime dt = TQDateTime::fromString (timestring, Qt::ISODate); struct tm tm_time; time_t timet_time; diff --git a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp index 3cad77ca4..a506bcd5d 100644 --- a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp +++ b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp @@ -315,7 +315,7 @@ HitMenuItem *KickoffBeaglePlugin::hitToHitMenuItem (int category, Hit *hit) case WEBHIST: uri = hit->getUri (); title = (*hit) [dc_title]; - title = title.replace(TQRegExp("\n")," "); + title = title.tqreplace(TQRegExp("\n")," "); mimetype = "text/html"; if (title.isEmpty () || title.stripWhiteSpace ().isEmpty ()) { title = uri.prettyURL (); @@ -375,15 +375,15 @@ HitMenuItem *KickoffBeaglePlugin::hitToHitMenuItem (int category, Hit *hit) TQString command = desktopfile.readEntry("Exec"); if (command==input) score = 100; - else if (command.find(input)==0) + else if (command.tqfind(input)==0) score = 50; - else if (command.find(input)!=-1) + else if (command.tqfind(input)!=-1) score = 10; else if (title==input) score = 100; - else if (title.find(input)==0) + else if (title.tqfind(input)==0) score = 50; - else if (title.find(input)!=-1) + else if (title.tqfind(input)!=-1) score = 10; break; } diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index 796920ed4..47a2c5835 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -61,7 +61,7 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent) m_odd(odd), m_selected(false) { - setFocusPolicy(TQWidget::StrongFocus); + setFocusPolicy(TQ_StrongFocus); setSelected(m_selected); itemTitle->setText("

    " + info.name() + "

    "); @@ -84,8 +84,8 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = static_cast(e); - if (me->button() & LeftButton) + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + if (me->button() & Qt::LeftButton) { m_dragStart = me->pos(); } @@ -97,7 +97,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) if (e->type() == TQEvent::MouseMove) { - TQMouseEvent* me = static_cast(e); + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); if ((me->pos() - m_dragStart).manhattanLength() > KGlobalSettings::dndEventDelay()) { @@ -130,7 +130,7 @@ void AppletWidget::keyPressEvent(TQKeyEvent *e) } else if (e->key() == Qt::Key_Up) { - TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_BackTab, 0, 0); + TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_BackTab, 0, 0); TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_BackTab, 0, 0); TQApplication::sendEvent(this, &fakedKeyPress); TQApplication::sendEvent(this, &fakedKeyRelease); @@ -150,7 +150,7 @@ void AppletWidget::keyPressEvent(TQKeyEvent *e) void AppletWidget::mousePressEvent(TQMouseEvent *e) { - if (e->button() == TQMouseEvent::LeftButton) + if (e->button() == Qt::LeftButton) { emit clicked(this); m_dragStart = e->pos(); @@ -162,7 +162,7 @@ void AppletWidget::mousePressEvent(TQMouseEvent *e) void AppletWidget::mouseMoveEvent(TQMouseEvent *e) { - if (e->button() == TQMouseEvent::LeftButton && + if (e->button() == Qt::LeftButton && !m_dragStart.isNull() && (e->pos() - m_dragStart).manhattanLength() > KGlobalSettings::dndEventDelay()) @@ -186,7 +186,7 @@ void AppletWidget::mouseReleaseEvent(TQMouseEvent *e) void AppletWidget::mouseDoubleClickEvent(TQMouseEvent *e) { - if (!e->button() == TQMouseEvent::LeftButton) + if (!e->button() == Qt::LeftButton) { AppletItem::mouseDoubleClickEvent(e); return; @@ -291,7 +291,7 @@ void AddAppletDialog::resizeAppletView() { m_appletBox->layout()->activate(); w = v->visibleWidth(); - h = m_appletBox->layout()->minimumSize().height(); + h = m_appletBox->tqlayout()->tqminimumSize().height(); v->resizeContents(w, QMAX(h, v->visibleHeight())); if (w == m_appletBox->width() && h == m_appletBox->height()) break; @@ -305,7 +305,7 @@ bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e) if (e->type() == TQEvent::Resize) TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView())); - return TQObject::eventFilter(o, e); + return TQT_TQOBJECT(this)->TQObject::eventFilter(o, e); } void AddAppletDialog::populateApplets() @@ -435,7 +435,7 @@ void AddAppletDialog::addApplet(AppletWidget* applet) // reset the odd/even colouring from this item on down in the list bool odd = applet->odd(); - AppletWidget::List::const_iterator it = m_appletWidgetList.find(applet); + AppletWidget::List::const_iterator it = m_appletWidgetList.tqfind(applet); for (; it != m_appletWidgetList.constEnd(); ++it) { if ((*it)->isHidden()) @@ -456,7 +456,7 @@ void AddAppletDialog::addApplet(AppletWidget* applet) if (appletContainer) { ExtensionContainer* ec = - dynamic_cast(m_containerArea->topLevelWidget()); + dynamic_cast(m_containerArea->tqtopLevelWidget()); if (ec) { @@ -484,8 +484,8 @@ bool AddAppletDialog::appletMatchesSearch(const AppletWidget* w, return (m_selectedType == AppletInfo::Undefined || w->info().type() & m_selectedType) && - (w->info().name().contains(s, false) || - w->info().comment().contains(s, false)); + (w->info().name().tqcontains(s, false) || + w->info().comment().tqcontains(s, false)); } void AddAppletDialog::delayedSearch() diff --git a/kicker/kicker/ui/addapplet_mnu.cpp b/kicker/kicker/ui/addapplet_mnu.cpp index 6d5c4482f..19bbf0f11 100644 --- a/kicker/kicker/ui/addapplet_mnu.cpp +++ b/kicker/kicker/ui/addapplet_mnu.cpp @@ -54,11 +54,11 @@ void PanelAddAppletMenu::slotAboutToShow() if (ai.icon().isEmpty() || ai.icon() == "unknown") { - insertItem(ai.name().replace( "&", "&&" ), i); + insertItem(ai.name().tqreplace( "&", "&&" ), i); } else { - insertItem(SmallIconSet(ai.icon()), ai.name().replace( "&", "&&" ), i); + insertItem(SmallIconSet(ai.icon()), ai.name().tqreplace( "&", "&&" ), i); } if (ai.isUniqueApplet() && PluginManager::the()->hasInstance(ai)) diff --git a/kicker/kicker/ui/addapplet_mnu.h b/kicker/kicker/ui/addapplet_mnu.h index caedb4fdb..79c539687 100644 --- a/kicker/kicker/ui/addapplet_mnu.h +++ b/kicker/kicker/ui/addapplet_mnu.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ContainerArea; -class PanelAddAppletMenu : public QPopupMenu +class PanelAddAppletMenu : public TQPopupMenu { Q_OBJECT diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index acd82a066..7f4f90676 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -54,7 +54,7 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget, m_moveTimer(0, "m_moveTimer"), m_dirty(false) { - setFocusPolicy(NoFocus); + setFocusPolicy(TQ_NoFocus); setBackgroundMode(NoBackground); connect(&m_moveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(swoopCloser())); @@ -157,7 +157,7 @@ void AddAppletVisualFeedback::displayInternal() // draw background TQPainter bufferPainter(&m_pixmap); bufferPainter.setPen(Qt::black); - bufferPainter.setBrush(colorGroup().background()); + bufferPainter.setBrush(tqcolorGroup().background()); bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); @@ -175,14 +175,14 @@ void AddAppletVisualFeedback::displayInternal() int textY = (height - textRect.height()) / 2; // draw text shadow - TQColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); cg.setColor(TQColorGroup::Text, cg.background().dark(115)); int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; m_richText->draw(&bufferPainter, 5 + textX + shadowOffset, textY + 1, TQRect(), cg); // draw text - cg = colorGroup(); + cg = tqcolorGroup(); m_richText->draw(&bufferPainter, 5 + textX, textY, rect(), cg); } } @@ -225,7 +225,7 @@ void AddAppletVisualFeedback::swoopCloser() void AddAppletVisualFeedback::internalUpdate() { m_dirty = true; - repaint(false); + tqrepaint(false); } #include "addappletvisualfeedback.moc" diff --git a/kicker/kicker/ui/addappletvisualfeedback.h b/kicker/kicker/ui/addappletvisualfeedback.h index 02899ee36..dc660bff1 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.h +++ b/kicker/kicker/ui/addappletvisualfeedback.h @@ -38,7 +38,7 @@ class TQPaintEvent; class TQSimpleRichText; class TQTimer; -class AddAppletVisualFeedback : QWidget +class AddAppletVisualFeedback : TQWidget { Q_OBJECT diff --git a/kicker/kicker/ui/addbutton_mnu.cpp b/kicker/kicker/ui/addbutton_mnu.cpp index 02c4718d4..c04a832e6 100644 --- a/kicker/kicker/ui/addbutton_mnu.cpp +++ b/kicker/kicker/ui/addbutton_mnu.cpp @@ -46,7 +46,7 @@ PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, TQWidget * parent, void PanelAddButtonMenu::slotExec(int id) { - if (!entryMap_.contains(id)) + if (!entryMap_.tqcontains(id)) return; KSycocaEntry * e = entryMap_[id]; diff --git a/kicker/kicker/ui/addextension_mnu.cpp b/kicker/kicker/ui/addextension_mnu.cpp index b22187443..325897a8c 100644 --- a/kicker/kicker/ui/addextension_mnu.cpp +++ b/kicker/kicker/ui/addextension_mnu.cpp @@ -44,7 +44,7 @@ void PanelAddExtensionMenu::slotAboutToShow() AppletInfo::List::const_iterator it = extensions.constBegin(); for( int i = 0; it != extensions.constEnd(); ++it, ++i ) { const AppletInfo& ai = (*it); - insertItem( ai.name().replace( "&", "&&" ), i ); + insertItem( ai.name().tqreplace( "&", "&&" ), i ); if ( ai.isUniqueApplet() && PluginManager::the()->hasInstance(ai) ) { setItemEnabled( i, false ); setItemChecked( i, true ); diff --git a/kicker/kicker/ui/addextension_mnu.h b/kicker/kicker/ui/addextension_mnu.h index a91986e19..76163250f 100644 --- a/kicker/kicker/ui/addextension_mnu.h +++ b/kicker/kicker/ui/addextension_mnu.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "appletinfo.h" -class PanelAddExtensionMenu : public QPopupMenu +class PanelAddExtensionMenu : public TQPopupMenu { Q_OBJECT diff --git a/kicker/kicker/ui/appletitem.ui b/kicker/kicker/ui/appletitem.ui index d9cc2d9b0..dc6faab50 100644 --- a/kicker/kicker/ui/appletitem.ui +++ b/kicker/kicker/ui/appletitem.ui @@ -1,6 +1,6 @@ AppletItem - + AppletItem @@ -20,13 +20,13 @@ 0 - + 0 0 - + 32767 80 @@ -39,7 +39,7 @@ 2 - + layout11 @@ -47,7 +47,7 @@ unnamed - + itemTitle @@ -65,11 +65,11 @@ RichText - + WordBreak|AlignTop - + itemDescription @@ -87,13 +87,13 @@ RichText - + WordBreak|AlignTop - + layout4 @@ -101,11 +101,11 @@ unnamed - + itemPixmap - + 64 64 @@ -117,7 +117,7 @@ - + AlignTop diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index e0e162d33..2bd8f7bd0 100644 --- a/kicker/kicker/ui/appletop_mnu.cpp +++ b/kicker/kicker/ui/appletop_mnu.cpp @@ -41,7 +41,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP bool isButton = (parent && parent->inherits("ButtonContainer")); bool isMenu = false; TQString titleText = title; - titleText = titleText.replace('&', "&&"); + titleText = titleText.tqreplace('&', "&&"); if (isButton) { isMenu = static_cast(parent)->isAMenu(); @@ -52,13 +52,13 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP TQString text = isButton ? (isMenu ? i18n("&Move %1 Menu") : i18n("&Move %1 Button")) : i18n("&Move %1"); - insertItem(SmallIcon("move"), text.arg(titleText), Move); + insertItem(SmallIcon("move"), text.tqarg(titleText), Move); // we look for a container area to see if we can add containers // this is part of the kiosk support in kicker, allowing // one to block users from adding new containers ContainerArea* area = 0; - TQObject* findTheArea = parent ? parent->parent() : 0; + TQObject* findTheArea = parent ? parent->tqparent() : 0; while (findTheArea) { area = dynamic_cast(findTheArea); @@ -68,7 +68,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP break; } - findTheArea = findTheArea->parent(); + findTheArea = findTheArea->tqparent(); } if (!area || area->canAddContainers()) @@ -76,7 +76,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP text = isButton ? (isMenu ? i18n("&Remove %1 Menu") : i18n("&Remove %1 Button")) : i18n("&Remove %1"); - insertItem(SmallIcon("remove"), text.arg(titleText), Remove); + insertItem(SmallIcon("remove"), text.tqarg(titleText), Remove); needSeparator = true; } } @@ -103,7 +103,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP KIcon::Small, 0, KIcon::DefaultState, 0, true)); - insertItem(iconPix, i18n("&About %1").arg( titleText ), About); + insertItem(iconPix, i18n("&About %1").tqarg( titleText ), About); needSeparator = !(actions & KPanelApplet::Help); } @@ -123,12 +123,12 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP if (isButton) { insertItem(SmallIcon("configure"), - i18n("&Configure %1 Button...").arg(titleText), Preferences); + i18n("&Configure %1 Button...").tqarg(titleText), Preferences); } else { insertItem(SmallIcon("configure"), - i18n("&Configure %1...").arg(titleText), Preferences); + i18n("&Configure %1...").tqarg(titleText), Preferences); } needSeparator = true; } diff --git a/kicker/kicker/ui/appletop_mnu.h b/kicker/kicker/ui/appletop_mnu.h index 4b396a83d..35e10be3c 100644 --- a/kicker/kicker/ui/appletop_mnu.h +++ b/kicker/kicker/ui/appletop_mnu.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class AppletInfo; // The button operations menu (usually right click) -class PanelAppletOpMenu : public QPopupMenu +class PanelAppletOpMenu : public TQPopupMenu { Q_OBJECT diff --git a/kicker/kicker/ui/appletview.ui b/kicker/kicker/ui/appletview.ui index a2fa1e91b..4ba0f38e8 100644 --- a/kicker/kicker/ui/appletview.ui +++ b/kicker/kicker/ui/appletview.ui @@ -1,6 +1,6 @@ AppletView - + AppletView @@ -19,7 +19,7 @@ 0 - + layout8 @@ -27,7 +27,7 @@ unnamed - + textLabel8 @@ -38,7 +38,7 @@ appletSearch - + appletSearch @@ -54,7 +54,7 @@ <qt>Type here some text to filter on the applet names and comments</qt> - + textLabel1 @@ -65,7 +65,7 @@ appletFilter - + All @@ -98,7 +98,7 @@ - + appletScrollView @@ -110,7 +110,7 @@ 1 - + 32767 32767 @@ -123,7 +123,7 @@ <qt>This is the applet list. Select an applet and click on <b>Add to panel</b> to add it</qt> - + layout3 @@ -141,7 +141,7 @@ Expanding - + 284 20 @@ -171,7 +171,7 @@ QScrollView -
    qscrollview.h
    +
    tqscrollview.h
    -1 -1 @@ -197,7 +197,7 @@ - qscrollview.h + tqscrollview.h kpushbutton.h kpushbutton.h diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index 2250475b4..46f79db2b 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -129,7 +129,7 @@ void PanelBrowserMenu::initialize() } // get entry list - const QFileInfoList *list = dir.entryInfoList(); + const TQFileInfoList *list = dir.entryInfoList(); // no list -> read error if (!list) { @@ -163,7 +163,7 @@ void PanelBrowserMenu::initialize() int run_id = _startid; // get list iterator - QFileInfoListIterator it(*list); + TQFileInfoListIterator it(*list); // jump to startid it += _startid; @@ -244,7 +244,7 @@ void PanelBrowserMenu::initialize() title = c.readEntry("Name", title); TQString s = c.readEntry("Icon"); - if(!_icons->contains(s)) { + if(!_icons->tqcontains(s)) { icon = KGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, 0, true); @@ -344,7 +344,7 @@ void PanelBrowserMenu::append(const TQPixmap &pixmap, const TQString &title, con // avoid &'s being converted to accelerators TQString newTitle = title; newTitle = KStringHandler::cEmSqueeze( newTitle, fontMetrics(), 20 ); - newTitle.replace("&", "&&"); + newTitle.tqreplace("&", "&&"); // insert menu item int id = insertItem(pixmap, newTitle); @@ -362,7 +362,7 @@ void PanelBrowserMenu::append(const TQPixmap &pixmap, const TQString &title, Pan // avoid &'s being converted to accelerators TQString newTitle = title; newTitle = KStringHandler::cEmSqueeze( newTitle, fontMetrics(), 20 ); - newTitle.replace("&", "&&"); + newTitle.tqreplace("&", "&&"); // insert submenu insertItem(pixmap, newTitle, subMenu); @@ -380,7 +380,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e) { TQPopupMenu::mouseMoveEvent(e); - if (!(e->state() & LeftButton)) return; + if (!(e->state() & Qt::LeftButton)) return; if(_lastpress == TQPoint(-1, -1)) return; // DND delay @@ -388,7 +388,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e) // get id int id = idAt(_lastpress); - if(!_filemap.contains(id)) return; + if(!_filemap.tqcontains(id)) return; // reset _lastpress _lastpress = TQPoint(-1, -1); @@ -429,7 +429,7 @@ void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev) void PanelBrowserMenu::dropEvent( TQDropEvent *ev ) { KURL u( path() ); - KFileItem item( u, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( u, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, u, ev, this ); KPanelMenu::dropEvent(ev); // ### TODO: Update list @@ -439,7 +439,7 @@ void PanelBrowserMenu::slotExec(int id) { kapp->propagateSessionManager(); - if(!_filemap.contains(id)) return; + if(!_filemap.tqcontains(id)) return; KURL url; url.setPath(path() + "/" + _filemap[id]); @@ -494,9 +494,9 @@ void PanelBrowserMenu::slotMimeCheck() // kdDebug() << url.url() << ": " << icon << endl; file = KStringHandler::cEmSqueeze( file, fontMetrics(), 20 ); - file.replace("&", "&&"); + file.tqreplace("&", "&&"); - if(!_icons->contains(icon)) { + if(!_icons->tqcontains(icon)) { TQPixmap pm = SmallIcon(icon); if( pm.height() > 16 ) { diff --git a/kicker/kicker/ui/clicklineedit.cpp b/kicker/kicker/ui/clicklineedit.cpp index 52cb8776d..debe91d3e 100644 --- a/kicker/kicker/ui/clicklineedit.cpp +++ b/kicker/kicker/ui/clicklineedit.cpp @@ -22,7 +22,7 @@ #include "clicklineedit.h" -#include "qpainter.h" +#include "tqpainter.h" using namespace KPIM; @@ -39,13 +39,13 @@ ClickLineEdit::~ClickLineEdit() {} void ClickLineEdit::setClickMessage( const TQString &msg ) { mClickMessage = msg; - repaint(); + tqrepaint(); } void ClickLineEdit::setText( const TQString &txt ) { mDrawClickMsg = txt.isEmpty(); - repaint(); + tqrepaint(); KLineEdit::setText( txt ); } @@ -67,7 +67,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev ) if ( mDrawClickMsg == true ) { mDrawClickMsg = false; - repaint(); + tqrepaint(); } TQLineEdit::focusInEvent( ev ); } @@ -77,7 +77,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev ) if ( text().isEmpty() ) { mDrawClickMsg = true; - repaint(); + tqrepaint(); } TQLineEdit::focusOutEvent( ev ); } diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp index 9736351e1..deaae70b9 100644 --- a/kicker/kicker/ui/client_mnu.cpp +++ b/kicker/kicker/ui/client_mnu.cpp @@ -59,7 +59,7 @@ void KickerClientMenu::insertItem( TQString text, int id ) TQCString KickerClientMenu::insertMenu( TQPixmap icon, TQString text, int id ) { TQString subname("%1-submenu%2"); - TQCString subid = subname.arg(objId()).arg(id).local8Bit(); + TQCString subid = subname.tqarg(static_cast(objId())).tqarg(id).local8Bit(); KickerClientMenu *sub = new KickerClientMenu(this, subid); int globalid = TQPopupMenu::insertItem( icon, text, sub, id); setItemParameter( globalid, id ); diff --git a/kicker/kicker/ui/dirdrop_mnu.h b/kicker/kicker/ui/dirdrop_mnu.h index d05187400..ffa157c85 100644 --- a/kicker/kicker/ui/dirdrop_mnu.h +++ b/kicker/kicker/ui/dirdrop_mnu.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include // The directory dropped menu -class PanelDirDropMenu : public QPopupMenu +class PanelDirDropMenu : public TQPopupMenu { public: enum OpButton{Url=1, Browser}; diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp index cb0d42c56..0829f6ccb 100644 --- a/kicker/kicker/ui/exe_dlg.cpp +++ b/kicker/kicker/ui/exe_dlg.cpp @@ -78,8 +78,8 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio this, TQT_SLOT(slotIconChanged(TQString))); // leave decent space for the commandline - resize(sizeHint().width() > 300 ? sizeHint().width() : 300, - sizeHint().height()); + resize(tqsizeHint().width() > 300 ? tqsizeHint().width() : 300, + tqsizeHint().height()); } void PanelExeDialog::slotOk() @@ -135,11 +135,11 @@ void PanelExeDialog::fillCompletion() TQDir d( (*it) ); d.setFilter( TQDir::Files | TQDir::Executable ); - const QFileInfoList *list = d.entryInfoList(); + const TQFileInfoList *list = d.entryInfoList(); if (!list) continue; - QFileInfoListIterator it2( *list ); + TQFileInfoListIterator it2( *list ); TQFileInfo *fi; while ( (fi = it2.current()) != 0 ) { @@ -164,7 +164,7 @@ void PanelExeDialog::slotTextChanged(const TQString &str) } TQString exeLocation = str; - TQMap::iterator it = m_partialPath2full.find(str); + TQMap::iterator it = m_partialPath2full.tqfind(str); if (it != m_partialPath2full.end()) exeLocation = it.data(); @@ -174,7 +174,7 @@ void PanelExeDialog::slotTextChanged(const TQString &str) void PanelExeDialog::slotReturnPressed() { - if (m_partialPath2full.contains(ui->m_exec->url())) + if (m_partialPath2full.tqcontains(ui->m_exec->url())) ui->m_exec->setURL(m_partialPath2full[ui->m_exec->url()]); } diff --git a/kicker/kicker/ui/extensionop_mnu.cpp b/kicker/kicker/ui/extensionop_mnu.cpp index a30434a48..582c44b46 100644 --- a/kicker/kicker/ui/extensionop_mnu.cpp +++ b/kicker/kicker/ui/extensionop_mnu.cpp @@ -59,7 +59,7 @@ PanelExtensionOpMenu::PanelExtensionOpMenu(const TQString& extension, int action if (!Kicker::the()->isImmutable() && (actions & KPanelExtension::Preferences)) { insertSeparator(); - insertItem(SmallIcon("configure"), i18n("&Configure %1...").arg(extension), Preferences); + insertItem(SmallIcon("configure"), i18n("&Configure %1...").tqarg(extension), Preferences); } adjustSize(); diff --git a/kicker/kicker/ui/extensionop_mnu.h b/kicker/kicker/ui/extensionop_mnu.h index 01bda4340..a1fa63cd6 100644 --- a/kicker/kicker/ui/extensionop_mnu.h +++ b/kicker/kicker/ui/extensionop_mnu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -class PanelExtensionOpMenu : public QPopupMenu +class PanelExtensionOpMenu : public TQPopupMenu { public: enum OpButton{Move = 9900, Remove = 9901, Help = 9902, About = 9903, Preferences = 9904, ReportBug = 9905, Shade = 9906 }; diff --git a/kicker/kicker/ui/flipscrollview.cpp b/kicker/kicker/ui/flipscrollview.cpp index ae96ebcaa..fb5cfd422 100644 --- a/kicker/kicker/ui/flipscrollview.cpp +++ b/kicker/kicker/ui/flipscrollview.cpp @@ -57,7 +57,7 @@ void BackFrame::drawContents( TQPainter *p ) { TQColor gray( 230, 230, 230 ); if ( mouse_inside ) - p->fillRect( 3, 3, width() - 6, height() - 6, colorGroup().color( TQColorGroup::Highlight ) ); + p->fillRect( 3, 3, width() - 6, height() - 6, tqcolorGroup().color( TQColorGroup::Highlight ) ); else p->fillRect( 3, 3, width() - 6, height() - 6, gray ); p->setPen( gray.dark(110) ); @@ -270,7 +270,7 @@ void FlipScrollView::slotScrollTimer() if (!mSelectMenuPath.isEmpty()) { if (mSelectMenuPath=="kicker:/goup/") { currentView()->setSelected(currentView()->firstChild(),true); - currentView()->firstChild()->repaint(); + currentView()->firstChild()->tqrepaint(); } else { TQListViewItem * child = currentView()->firstChild(); @@ -278,8 +278,8 @@ void FlipScrollView::slotScrollTimer() KMenuItem* kitem = dynamic_cast(child); if (kitem && kitem->menuPath()==mSelectMenuPath) { currentView()->setSelected(child,true); - kdDebug() << "child repaint\n"; - child->repaint(); + kdDebug() << "child tqrepaint\n"; + child->tqrepaint(); break; } child = child->nextSibling(); diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index a73e0a48d..58bde0457 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/kicker/kicker/ui/hidebutton.cpp @@ -51,22 +51,22 @@ void HideButton::drawButton(TQPainter *p) { if (m_arrow == Qt::LeftArrow) { - p->setPen(colorGroup().mid()); + p->setPen(tqcolorGroup().mid()); p->drawLine(width()-1, 0, width()-1, height()); } else if (m_arrow == Qt::RightArrow) { - p->setPen(colorGroup().mid()); + p->setPen(tqcolorGroup().mid()); p->drawLine(0, 0, 0, height()); } else if (m_arrow == Qt::UpArrow) { - p->setPen(colorGroup().mid()); + p->setPen(tqcolorGroup().mid()); p->drawLine(0, height()-1, width(), height()-1); } else if (m_arrow == Qt::DownArrow) { - p->setPen(colorGroup().mid()); + p->setPen(tqcolorGroup().mid()); p->drawLine(0, 0, width(), 0); } @@ -138,7 +138,7 @@ void HideButton::generateIcons() } TQImage image = pixmap()->convertToImage(); - image = image.smoothScale(size() - TQSize(4, 4), TQImage::ScaleMin); + image = image.smoothScale(size() - TQSize(4, 4), TQ_ScaleMin); KIconEffect effect; @@ -173,14 +173,14 @@ void HideButton::slotIconChanged(int group) } generateIcons(); - repaint(false); + tqrepaint(false); } void HideButton::enterEvent(TQEvent *e) { m_highlight = true; - repaint(false); + tqrepaint(false); TQButton::enterEvent(e); } @@ -188,7 +188,7 @@ void HideButton::leaveEvent(TQEvent *e) { m_highlight = false; - repaint(false); + tqrepaint(false); TQButton::enterEvent(e); } diff --git a/kicker/kicker/ui/hidebutton.h b/kicker/kicker/ui/hidebutton.h index 9a6c4612e..bb68929a1 100644 --- a/kicker/kicker/ui/hidebutton.h +++ b/kicker/kicker/ui/hidebutton.h @@ -23,7 +23,7 @@ #include #include -class HideButton : public QButton +class HideButton : public TQButton { Q_OBJECT diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index dcb4760c1..d7df05170 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -99,16 +99,16 @@ static double pointSize( double pixelSize, TQPaintDevice *w ) static int pixelSize( double pixelSize, TQPaintDevice *w ) { - return qRound( pixelSize * TQPaintDevice::x11AppDpiY( w->x11Screen () ) / 72. ); + return tqRound( pixelSize * TQPaintDevice::x11AppDpiY( w->x11Screen () ) / 72. ); } void KMenuItem::init() { setMultiLinesEnabled(true); m_s = 0; - m_path = TQString::null; - m_icon = TQString::null; - m_menuPath = TQString::null; + m_path = TQString(); + m_icon = TQString(); + m_menuPath = TQString(); setDragEnabled(true); m_has_children = false; m_old_width = -1; @@ -145,28 +145,28 @@ void KMenuItem::setIcon(const TQString& icon, int size) void KMenuItem::setHasChildren( bool flag ) { m_has_children = flag; - repaint(); + tqrepaint(); } void KMenuItem::setup() { // if someone configured a larger generalFont than 10pt, he might have a _real_ problem with 7pt // the 7pt could be read out of konquerorrc I guess - float min_font_size = 7. * QMAX(1., KGlobalSettings::generalFont().pointSizeFloat() / 10.); + float min_font_size = 7. * TQMAX(1., KGlobalSettings::generalFont().pointSizeFloat() / 10.); const int expected_height = 38; - description_font_size = QMAX( pointSize( expected_height * .3, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ; - title_font_size = QMAX( pointSize( expected_height * .25, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ); + description_font_size = TQMAX( pointSize( expected_height * .3, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ; + title_font_size = TQMAX( pointSize( expected_height * .25, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ); //kdDebug() << description_font_size << " " << title_font_size << " " << pointSize( expected_height * .25, listView() ) << endl; TQListViewItem::setup(); - setHeight( (int)QMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, listView()))); + setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, TQT_TQPAINTDEVICE(listView())))); } void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align) { ItemView *listview = static_cast( listView() ); - int bottom = listView()->itemRect( this ).bottom(); + int bottom = listView()->tqitemRect( this ).bottom(); int diff = bottom - listView()->viewport()->height(); KPixmap pm; @@ -197,7 +197,7 @@ void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int else listview->m_lastOne = static_cast( itemBelow() ); listview->m_old_contentY = -1; - repaint(); + tqrepaint(); } } } @@ -275,7 +275,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column if ( m_description.isEmpty() ) spacing = ( height() - f1h ) / 2; - int right_triangle_size = pixelSize( 7, listView() ); + int right_triangle_size = pixelSize( 7, TQT_TQPAINTDEVICE(listView()) ); int right_margin = listView()->verticalScrollBar()->width(); if ( m_has_children ) @@ -315,7 +315,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column pp.fillRect( 0, 0, off.width(), off.height(), backg ); TQColor myColor = cg.color( TQColorGroup::Text ).light( 200 ); - if ( qGray( myColor.rgb() ) == 0 ) + if ( tqGray( myColor.rgb() ) == 0 ) myColor = TQColor( 100, 100, 110 ); pp.setPen( myColor ); pp.setPen( isSelected() ? cg.color( TQColorGroup::Mid ) : myColor ); @@ -350,7 +350,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column { // the listview caches paint events m_old_width = width; - repaint(); + tqrepaint(); } } @@ -371,9 +371,9 @@ void KMenuItemSeparator::setup() TQFontMetrics fm(f); f.setPointSize( 8 + KickerSettings::kickoffFontPointSizeOffset() ); if ( itemAbove() && !text( 0 ).isEmpty() ) - setHeight( (int)QMAX( 34., fm.height() * 1.4) ); + setHeight( (int)TQMAX( 34., fm.height() * 1.4) ); else - setHeight( (int)QMAX( 26., fm.height() * 1.4 ) ); + setHeight( (int)TQMAX( 26., fm.height() * 1.4 ) ); } void KMenuItemSeparator::setLink( const TQString &text, const TQString &url ) @@ -385,7 +385,7 @@ void KMenuItemSeparator::setLink( const TQString &text, const TQString &url ) bool KMenuItemSeparator::hitsLink( const TQPoint &pos ) { - return m_link_rect.contains( pos ); + return m_link_rect.tqcontains( pos ); } void KMenuItemSeparator::preparePixmap( int width ) @@ -424,7 +424,7 @@ void KMenuItemSeparator::paintCell(TQPainter* p, const TQColorGroup & cg, int co f.setPointSize( 8 + KickerSettings::kickoffFontPointSizeOffset() ); p->setFont( f ); TQColor myColor = cg.color( TQColorGroup::Text ).light( 200 ); - if ( qGray( myColor.rgb() ) == 0 ) + if ( tqGray( myColor.rgb() ) == 0 ) myColor = TQColor( 100, 100, 110 ); p->setPen( myColor ); int twidth = p->fontMetrics().width(text(0)); @@ -501,7 +501,7 @@ void KMenuItemHeader::setup() KMenuItem::setup(); TQFontMetrics fm( listView()->font() ); - setHeight( QMAX( int( texts.count() * fm.height() + ( texts.count() + 1 ) * 2 + 10 ), height()) ); + setHeight( TQMAX( int( texts.count() * fm.height() + ( texts.count() + 1 ) * 2 + 10 ), height()) ); // nada } @@ -528,7 +528,7 @@ void KMenuItemHeader::paintCell(TQPainter* p, const TQColorGroup & cg, int , int int r = left_margin + margin * 2; const int min_font_size = 7; - int title_font_pixelSize = qRound( pixelSize( QMAX( pointSize( 12, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), listView() ) ); + int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), TQT_TQPAINTDEVICE(listView()) ) ); TQFont f1 = p->font(); f1.setPixelSize( title_font_pixelSize ); @@ -538,7 +538,7 @@ void KMenuItemHeader::paintCell(TQPainter* p, const TQColorGroup & cg, int , int p->setPen( cg.color( TQColorGroup::Text ) ); const int text_margin = 2; - int spacing = ( height() - texts.count() * f1h - QMAX( texts.count() - 1, 0 ) * text_margin ) / 2; + int spacing = ( height() - texts.count() * f1h - TQMAX( texts.count() - 1, 0 ) * text_margin ) / 2; for ( uint i = 0; i < texts.count(); ++i ) { @@ -608,7 +608,7 @@ void ItemViewTip::maybeTip( const TQPoint &pos ) if ( item->toolTip().isNull() ) return; - TQRect r = view->itemRect( item ); + TQRect r = view->tqitemRect( item ); int headerPos = view->header()->sectionPos( 0 ); r.setLeft( headerPos ); r.setRight( headerPos + view->header()->sectionSize( 0 ) ); @@ -632,7 +632,7 @@ ItemView::ItemView(TQWidget* parent, const char* name) setItemMargin(0); setSorting(-1); setTreeStepSize(38); - setFocusPolicy(TQWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); m_lastOne = 0; m_old_contentY = -1; @@ -715,7 +715,7 @@ KMenuItem* ItemView::insertItem( const TQString& icon, const TQString& text, con KMenuItem* ItemView::insertItem( const TQString& icon, const TQString& text, const TQString& description, int nId, int nIndex, KMenuItem *parent) { - return insertItem( icon, text, description, TQString::null, nId, nIndex, parent); + return insertItem( icon, text, description, TQString(), nId, nIndex, parent); } int ItemView::setItemEnabled(int id, bool enabled) @@ -761,8 +761,8 @@ void ItemView::slotMoveContent() int item_height = 0; TQListViewItemIterator it( this ); while ( it.current() ) { - if ( !dynamic_cast( it.current() ) && !it.current()->parent() && it.current()->isVisible() ) { - it.current()->invalidateHeight(); + if ( !dynamic_cast( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() ) { + it.current()->tqinvalidateHeight(); item_height += it.current()->totalHeight(); } ++it; @@ -915,7 +915,7 @@ void ItemView::contentsMousePressEvent ( TQMouseEvent * e ) KMenuItemSeparator *si = dynamic_cast( itemAt( vp ) ); if ( si ) { - if ( si->hitsLink( vp - itemRect(si).topLeft() ) ) + if ( si->hitsLink( vp - tqitemRect(si).topLeft() ) ) emit startURL( si->linkUrl() ); } } @@ -928,7 +928,7 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e) bool link_cursor = false; KMenuItemSeparator *si = dynamic_cast( i ); if ( si ) - link_cursor = si->hitsLink( vp - itemRect(si).topLeft() ); + link_cursor = si->hitsLink( vp - tqitemRect(si).topLeft() ); if (i && !i->isSelectable() && !link_cursor) { unsetCursor(); @@ -941,7 +941,7 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e) if (m_mouseMoveSelects) { if(i && i->isEnabled() && !i->isSelected() && // FIXME: This is wrong if you drag over the items. - (e->state() & (LeftButton|MidButton|RightButton)) == 0) + (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0) KListView::setSelected(i, true); else if (!i && selectedItem()) KListView::setSelected(selectedItem(), false); @@ -965,7 +965,7 @@ void ItemView::resizeEvent ( TQResizeEvent * e ) { KListView::resizeEvent( e ); // if ( m_lastOne ) -// int diff = itemRect( m_lastOne ).bottom() - viewport()->height(); +// int diff = tqitemRect( m_lastOne ).bottom() - viewport()->height(); } void ItemView::viewportPaintEvent ( TQPaintEvent * pe ) @@ -975,7 +975,7 @@ void ItemView::viewportPaintEvent ( TQPaintEvent * pe ) if ( m_lastOne && m_old_contentY != contentsY() ) { m_old_contentY = contentsY(); - m_lastOne->repaint(); + m_lastOne->tqrepaint(); } } @@ -984,7 +984,7 @@ void ItemView::clear() KListView::clear(); m_lastOne = 0; m_old_contentY = -1; - m_back_url = TQString::null; + m_back_url = TQString(); } void ItemView::contentsWheelEvent(TQWheelEvent *e) @@ -996,7 +996,7 @@ void ItemView::contentsWheelEvent(TQWheelEvent *e) if(i && i->isEnabled() && !i->isSelected() && // FIXME: This is wrong if you drag over the items. - (e->state() & (LeftButton|MidButton|RightButton)) == 0) + (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0) KListView::setSelected(i, true); else if (!i && selectedItem()) KListView::setSelected(selectedItem(), false); @@ -1022,14 +1022,14 @@ TQDragObject * ItemView::dragObject() TQBitmap mask; - if (pix.mask()) - mask = *pix.mask(); + if (pix.tqmask()) + mask = *pix.tqmask(); else { mask.resize(pix.size()); mask.fill(Qt::color1); } - bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.mask(), 0, 0, add.width(), add.height(), OrROP ); + bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.tqmask(), 0, 0, add.width(), add.height(), OrROP ); pix.setMask( mask ); o->setPixmap(pix); @@ -1052,7 +1052,7 @@ TQDragObject * ItemView::dragObject() else if(!kitem->path().isEmpty() && !kitem->path().startsWith("kicker:/") && !kitem->path().startsWith("kaddressbook:/")) { TQString uri = kitem->path(); - if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } @@ -1070,7 +1070,7 @@ int ItemView::goodHeight() int item_height = 0; TQListViewItemIterator it( this ); while ( it.current() ) { - if ( !dynamic_cast( it.current() ) && !it.current()->parent() && it.current()->isVisible() ) { + if ( !dynamic_cast( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() ) { item_height += it.current()->height(); } ++it; @@ -1087,7 +1087,7 @@ KMenuItemDrag::KMenuItemDrag(KMenuItem& item, TQWidget *dragSource) buff.open(IO_WriteOnly); TQDataStream s(&buff); - s << item.id() << (item.service() ? item.service()->storageId() : TQString::null) + s << item.id() << (item.service() ? item.service()->storageId() : TQString()) << item.title() << item.description() << item.icon() << item.path(); } @@ -1103,7 +1103,7 @@ const char * KMenuItemDrag::format(int i) const return 0; } -TQByteArray KMenuItemDrag::encodedData(const char* mimeType) const +TQByteArray KMenuItemDrag::tqencodedData(const char* mimeType) const { if (TQString("application/kmenuitem") == mimeType) return a; @@ -1138,7 +1138,7 @@ bool ItemView::acceptDrag (TQDropEvent* event) const bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item) { - TQByteArray a = e->encodedData("application/kmenuitem"); + TQByteArray a = e->tqencodedData("application/kmenuitem"); if (a.isEmpty()) { TQStringList l; @@ -1162,7 +1162,7 @@ bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item) item.m_title = item.m_path; item.m_icon = KMimeType::iconForURL( url ); item.m_title = item.m_path.section( '/', -1, -1 ); - int last_slash = url.findRev ('/', -1); + int last_slash = url.tqfindRev ('/', -1); if (last_slash == 0) item.m_description = i18n("Directory: /)"); else @@ -1205,13 +1205,13 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQStringList favs = KickerSettings::favorites(); if (item.m_s) - return favs.find(item.m_s->storageId())==favs.end(); + return favs.tqfind(item.m_s->storageId())==favs.end(); else { TQStringList::Iterator it; TQString uri = item.m_path; - if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } @@ -1219,7 +1219,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==uri) + if (df.readURL().tqreplace("file://",TQString())==uri) break; } } @@ -1233,15 +1233,15 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQStringList favs = KickerSettings::favorites(); if (text.endsWith(".desktop")) { - KService::Ptr p = KService::serviceByDesktopPath(text.replace("file://",TQString::null)); - return (p && favs.find(p->storageId())==favs.end()); + KService::Ptr p = KService::serviceByDesktopPath(text.tqreplace("file://",TQString())); + return (p && favs.tqfind(p->storageId())==favs.end()); } else { TQStringList::Iterator it; for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==text) + if (df.readURL().tqreplace("file://",TQString())==text) break; } } diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h index c8b95ee42..2a6b7e68b 100644 --- a/kicker/kicker/ui/itemview.h +++ b/kicker/kicker/ui/itemview.h @@ -248,7 +248,7 @@ class KMenuItemDrag : public TQDragObject ~KMenuItemDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray encodedData(const char *) const; + virtual TQByteArray tqencodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, KMenuItemInfo& item); diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 0506201f5..d2952d93a 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -94,7 +94,7 @@ PanelKMenu::PanelKMenu() "slotServiceStartedByStorageId(TQString,TQString)", false); displayRepairTimer = new TQTimer( this ); - connect( displayRepairTimer, SIGNAL(timeout()), this, SLOT(repairDisplay()) ); + connect( displayRepairTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repairDisplay()) ); } PanelKMenu::~PanelKMenu() @@ -125,7 +125,7 @@ void PanelKMenu::hideMenu() while (isShown() == true) kapp->eventLoop()->processEvents(1000); TQTimer *windowtimer = new TQTimer( this ); - connect( windowtimer, SIGNAL(timeout()), this, SLOT(windowClearTimeout()) ); + connect( windowtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; windowtimer->start( 0, TRUE ); // Wait for all window system events to be processed while (windowTimerTimedOut == false) @@ -138,7 +138,7 @@ void PanelKMenu::hideMenu() // thereby removing a bad shutdown screen artifact while still providing // a somewhat snappy user interface. TQTimer *delaytimer = new TQTimer( this ); - connect( delaytimer, SIGNAL(timeout()), this, SLOT(windowClearTimeout()) ); + connect( delaytimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; delaytimer->start( 100, TRUE ); // Wait for 100 milliseconds while (windowTimerTimedOut == false) @@ -207,7 +207,7 @@ void PanelKMenu::paletteChanged() if (!loadSidePixmap()) { sidePixmap = sideTilePixmap = TQPixmap(); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); } } @@ -261,7 +261,7 @@ void PanelKMenu::initialize() TQHBox* hbox = new TQHBox( this ); KToolBarButton *clearButton = new KToolBarButton( "locationbar_erase", 0, hbox ); searchEdit = new KPIM::ClickLineEdit(hbox, " "+i18n("Press '/' to search...")); - hbox->setFocusPolicy(TQWidget::StrongFocus); + hbox->setFocusPolicy(TQ_StrongFocus); hbox->setFocusProxy(searchEdit); hbox->setSpacing( 3 ); connect(clearButton, TQT_SIGNAL(clicked()), searchEdit, TQT_SLOT(clear())); @@ -415,10 +415,10 @@ void PanelKMenu::repairDisplay(void) { displayRepairTimer->stop(); // Now do a nasty hack to prevent search bar merging into the side image - // This forces a layout/repaint of the qpopupmenu - repaint(); // This ensures that the side bar image was applied - styleChange(style()); // This forces a call to the private function updateSize(TRUE) inside the qpopupmenu. - update(); // This repaints the entire popup menu to apply the widget size/alignment changes made above + // This forces a layout/tqrepaint of the qpopupmenu + tqrepaint(); // This ensures that the side bar image was applied + styleChange(tqstyle()); // This forces a call to the private function updateSize(TRUE) inside the qpopupmenu. + update(); // This tqrepaints the entire popup menu to apply the widget size/tqalignment changes made above } } @@ -444,7 +444,7 @@ void PanelKMenu::slotLock() TQCString appname( "kdesktop" ); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", ""); + kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); } void PanelKMenu::slotLogout() @@ -493,7 +493,7 @@ void PanelKMenu::slotSessionActivated( int ent ) void PanelKMenu::doNewSession( bool lock ) { int result = KMessageBox::warningContinueCancel( - kapp->desktop()->screen(kapp->desktop()->screenNumber(this)), + TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))), i18n("

    You have chosen to open another desktop session.
    " "The current session will be hidden " "and a new login screen will be displayed.
    " @@ -579,7 +579,7 @@ void PanelKMenu::showMenu() TQRect PanelKMenu::sideImageRect() { - return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(), + return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(), height() - 2*frameWidth() ), this ); } @@ -590,21 +590,21 @@ void PanelKMenu::resizeEvent(TQResizeEvent * e) PanelServiceMenu::resizeEvent(e); - setFrameRect( TQStyle::visualRect( TQRect( sidePixmap.width(), 0, + setFrameRect( TQStyle::tqvisualRect( TQRect( sidePixmap.width(), 0, width() - sidePixmap.width(), height() ), this ) ); } //Workaround Qt3.3.x sizing bug, by ensuring we're always wide enough. void PanelKMenu::resize(int width, int height) { - width = kMax(width, maximumSize().width()); + width = kMax(width, tqmaximumSize().width()); PanelServiceMenu::resize(width, height); } -TQSize PanelKMenu::sizeHint() const +TQSize PanelKMenu::tqsizeHint() const { - TQSize s = PanelServiceMenu::sizeHint(); -// kdDebug(1210) << "PanelKMenu::sizeHint()" << endl; + TQSize s = PanelServiceMenu::tqsizeHint(); +// kdDebug(1210) << "PanelKMenu::tqsizeHint()" << endl; // kdDebug(1210) << s.width() << ", " << s.height() << endl; return s; } @@ -619,9 +619,9 @@ void PanelKMenu::paintEvent(TQPaintEvent * e) TQPainter p(this); p.setClipRegion(e->region()); - style().drawPrimitive( TQStyle::PE_PanelPopup, &p, + tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), - colorGroup(), TQStyle::Style_Default, + tqcolorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); TQRect r = sideImageRect(); @@ -648,7 +648,7 @@ TQMouseEvent PanelKMenu::translateMouseEvent( TQMouseEvent* e ) { TQRect side = sideImageRect(); - if ( !side.contains( e->pos() ) ) + if ( !side.tqcontains( e->pos() ) ) return *e; TQPoint newpos( e->pos() ); diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h index 16655bdd6..d91ddf032 100644 --- a/kicker/kicker/ui/k_mnu.h +++ b/kicker/kicker/ui/k_mnu.h @@ -59,7 +59,7 @@ public: int insertClientMenu(KickerClientMenu *p); void removeClientMenu(int id); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual void setMinimumSize(const TQSize &); virtual void setMaximumSize(const TQSize &); virtual void setMinimumSize(int, int); diff --git a/kicker/kicker/ui/k_mnu_stub.cpp b/kicker/kicker/ui/k_mnu_stub.cpp index b02d2bcbf..16e755d48 100644 --- a/kicker/kicker/ui/k_mnu_stub.cpp +++ b/kicker/kicker/ui/k_mnu_stub.cpp @@ -97,11 +97,11 @@ void KMenuStub::resize(int w, int h) return m_w.panelkmenu->resize(w, h); } -TQSize KMenuStub::sizeHint() const +TQSize KMenuStub::tqsizeHint() const { if(m_type == t_KMenu) - return m_w.kmenu->sizeHint(); - return m_w.panelkmenu->sizeHint(); + return m_w.kmenu->tqsizeHint(); + return m_w.panelkmenu->tqsizeHint(); } bool KMenuStub::highlightMenuItem( const TQString &menuId ) diff --git a/kicker/kicker/ui/k_mnu_stub.h b/kicker/kicker/ui/k_mnu_stub.h index 362d132b2..17fe92b7c 100644 --- a/kicker/kicker/ui/k_mnu_stub.h +++ b/kicker/kicker/ui/k_mnu_stub.h @@ -53,7 +53,7 @@ public: void popup(const TQPoint &pos, int indexAtPoint = -1); void selectFirstItem(); void resize(int, int); - TQSize sizeHint() const; + TQSize tqsizeHint() const; bool highlightMenuItem( const TQString &menuId ); void clearRecentMenuItems(); void initialize(); diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index a2a8cb2fc..3fa259189 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -141,12 +141,12 @@ static TQString workaroundStringFreeze(const TQString& str) { TQString s = str; - s.replace("","&"); + s.tqreplace("","&"); TQRegExp re("<[^>]+>"); re.setMinimal(true); re.setCaseSensitive(false); - s.replace(re, ""); + s.tqreplace(re, ""); s = s.simplifyWhiteSpace(); return s; @@ -168,7 +168,7 @@ static int used_size( TQLabel *label, int oldsize ) KMenu::KMenu() : KMenuBase(0, "SUSE::Kickoff::KMenu") , m_sloppyTimer(0, "KNewMenu::sloppyTimer"), m_mediaFreeTimer(0, "KNewMenu::mediaFreeTimer"), - m_iconName(TQString::null), m_orientation(UnDetermined), m_search_plugin( 0 ) + m_iconName(TQString()), m_orientation(UnDetermined), m_search_plugin( 0 ) { setMouseTracking(true); connect(&m_sloppyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotSloppyTimeout())); @@ -194,7 +194,7 @@ KMenu::KMenu() m_userInfo->setBackgroundMode( PaletteBase ); TQColor userInfoColor = TQApplication::palette().color( TQPalette::Normal, TQColorGroup::Mid ); - if ( qGray( userInfoColor.rgb() ) > 120 ) + if ( tqGray( userInfoColor.rgb() ) > 120 ) userInfoColor = userInfoColor.dark( 200 ); else userInfoColor = userInfoColor.light( 200 ); @@ -296,13 +296,13 @@ KMenu::KMenu() m_searchResultsWidget->setItemMargin(4); m_searchResultsWidget->setIconSize(16); m_searchActions = new ItemView (m_searchWidget, "m_searchActions"); - m_searchActions->setFocusPolicy(TQWidget::NoFocus); + m_searchActions->setFocusPolicy(TQ_NoFocus); m_searchActions->setItemMargin(4); m_searchInternet = new TQListViewItem(m_searchActions, i18n("Search Internet")); m_searchInternet->setPixmap(0,icon); setTabOrder(m_kcommand, m_searchResultsWidget); - m_kerryInstalled = !KStandardDirs::findExe(TQString::fromLatin1("kerry")).isEmpty(); + m_kerryInstalled = !KStandardDirs::findExe(TQString::tqfromLatin1("kerry")).isEmpty(); m_isShowing = false; if (!m_kerryInstalled) { @@ -421,11 +421,11 @@ void KMenu::setupUi() { m_stacker = new TQWidgetStack( this, "m_stacker" ); m_stacker->setGeometry( TQRect( 90, 260, 320, 220 ) ); - m_stacker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); + m_stacker->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); m_stacker->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) ); - // m_stacker->setFocusPolicy( TQWidget::StrongFocus ); + // m_stacker->setFocusPolicy( TQ_StrongFocus ); m_stacker->setLineWidth( 0 ); - m_stacker->setFocusPolicy(TQWidget::NoFocus); + m_stacker->setFocusPolicy(TQ_NoFocus); connect(m_stacker, TQT_SIGNAL(aboutToShow(TQWidget*)), TQT_SLOT(stackWidgetRaised(TQWidget*))); m_kcommand->setName("m_kcommand"); @@ -453,16 +453,16 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) TQPoint p; if (e->type() == TQEvent::MouseMove || e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = static_cast(e); + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); p = me->globalPos(); } else if (e->type() == TQEvent::Wheel) { - TQWheelEvent* we = static_cast(e); + TQWheelEvent* we = TQT_TQWHEELEVENT(e); p = we->globalPos(); } while (receiver) { - if (receiver == m_tabBar && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) { + if (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_tabBar) && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) { TQTab* s = m_tabBar->selectTab(m_tabBar->mapFromGlobal(p)); if (s && s->identifier() == ApplicationsTab) raiseWidget = m_browserView; @@ -482,8 +482,8 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) /* we do not want hover activation for the search line edit as this can be * pretty disturbing */ - if ( (receiver == m_searchPixmap || - ( ( receiver == m_searchLabel || receiver==m_kcommand->lineEdit() ) && + if ( (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchPixmap) || + ( ( TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchLabel) || TQT_BASE_OBJECT(receiver)==TQT_BASE_OBJECT(m_kcommand->lineEdit()) ) && ( e->type() == TQEvent::KeyPress || e->type() == TQEvent::Wheel || e->type() == TQEvent::MouseButtonPress ) ) ) && !m_isShowing) { @@ -495,34 +495,34 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) if(raiseWidget) break; if(receiver->isWidgetType()) - receiver = static_cast(receiver)->parentWidget(true); + receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->tqparentWidget(true)); else break; } if (e->type() == TQEvent::FocusIn && receiver && raiseWidget) { - m_searchResultsWidget->setFocusPolicy(TQWidget::StrongFocus); + m_searchResultsWidget->setFocusPolicy(TQ_StrongFocus); m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ? - TQWidget::StrongFocus : TQWidget::NoFocus); + TQ_StrongFocus : TQ_NoFocus); setTabOrder(raiseWidget, m_searchResultsWidget); if (raiseWidget != m_stacker->visibleWidget() - && static_cast(receiver)->focusPolicy() == TQWidget::NoFocus + && TQT_TQWIDGET(receiver)->focusPolicy() == TQ_NoFocus && m_stacker->id(raiseWidget) >= 0) { m_stacker->raiseWidget(raiseWidget); return true; } - if (raiseWidget->focusPolicy() != TQWidget::NoFocus) + if (raiseWidget->focusPolicy() != TQ_NoFocus) return false; } - if (m_sloppyRegion.contains(p)) { + if (m_sloppyRegion.tqcontains(p)) { if (e->type() == TQEvent::MouseButtonPress /*&& m_sloppyTimer.isActive()*/) m_sloppySourceClicked = true; if (!m_sloppyTimer.isActive() || m_sloppySource != raiseRect) { - int timeout= style().styleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay); + int timeout= tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay); if (m_sloppySourceClicked) timeout = 3000; m_sloppyTimer.start(timeout); @@ -535,7 +535,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) } if(e->type() == TQEvent::Enter && receiver->isWidgetType()) { - static_cast(receiver)->setMouseTracking(true); + TQT_TQWIDGET(receiver)->setMouseTracking(true); TQToolTip::hide(); } @@ -562,7 +562,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) if (view) { bool handled = true; - switch (static_cast(e)->key()) { + switch (TQT_TQKEYEVENT(e)->key()) { case Key_Up: if (view->selectedItem()) { view->setSelected(view->selectedItem()->itemAbove(),true); @@ -639,7 +639,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) r = true; } - if (e->type() == TQEvent::Enter && receiver == m_stacker) + if (e->type() == TQEvent::Enter && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_stacker)) { TQRect r(m_stacker->mapToGlobal(TQPoint(-8,-32)), m_stacker->size()); r.setSize(r.size()+TQSize(16,128)); @@ -682,9 +682,9 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) void KMenu::slotSloppyTimeout() { - if (m_sloppyRegion.contains(TQCursor::pos()) && !m_sloppySource.isNull()) + if (m_sloppyRegion.tqcontains(TQCursor::pos()) && !m_sloppySource.isNull()) { - if ( m_sloppySource.contains(TQCursor::pos())) + if ( m_sloppySource.tqcontains(TQCursor::pos())) { m_stacker->raiseWidget(m_sloppyWidget); @@ -753,12 +753,12 @@ void KMenu::stackWidgetRaised(TQWidget* raiseWidget) if (raiseWidget == m_browserView) { if ( m_tabBar->currentTab() == ApplicationsTab) - slotGoSubMenu(TQString::null); + slotGoSubMenu(TQString()); if (m_browserDirty ) { createNewProgramList(); m_browserView->prepareRightMove(); m_browserView->currentView()->clear(); - fillSubMenu(TQString::null, m_browserView->currentView()); + fillSubMenu(TQString(), m_browserView->currentView()); m_browserDirty = false; } } @@ -828,7 +828,7 @@ void KMenu::paletteChanged() void KMenu::tabClicked(TQTab* t) { if (t==m_tabs[ApplicationsTab]) - slotGoSubMenu(TQString::null); + slotGoSubMenu(TQString()); else if (t==m_tabs[LeaveTab]) slotGoExitMainMenu(); } @@ -843,7 +843,7 @@ void KMenu::slotGoExitMainMenu() if (m_exitView->currentView()==m_exitView->rightView()) { m_exitView->prepareLeftMove(false); m_exitView->showBackButton(false); - m_exitView->flipScroll(TQString::null); + m_exitView->flipScroll(TQString()); } } @@ -882,13 +882,13 @@ void KMenu::slotGoExitSubMenu(const TQString& url) m_exitView->rightView()->insertItem( "switchuser", i18n( "Start New Session" ), i18n( "Start a parallel session" ), "kicker:/switchuser", nId++, index++ ); - m_exitView->rightView()->insertItem( "lock", i18n( "Lock Current && Start New Session").replace("&&","&"), + m_exitView->rightView()->insertItem( "lock", i18n( "Lock Current && Start New Session").tqreplace("&&","&"), i18n( "Lock screen and start a parallel session" ), "kicker:/switchuserafterlock", nId++, index++ ); SessList sess; if (DM().localSessions( sess )) { if (sess.count()>1) - m_exitView->rightView()->insertSeparator( nId++, TQString::null, index++ ); + m_exitView->rightView()->insertSeparator( nId++, TQString(), index++ ); for (SessList::ConstIterator it = sess.begin(); it != sess.end(); ++it) { if ((*it).vt && !(*it).self) { TQString user, loc; @@ -902,7 +902,7 @@ void KMenu::slotGoExitSubMenu(const TQString& url) m_exitView->rightView()->insertHeader( nId++, "kicker:/switchuser/" ); } - m_exitView->flipScroll(TQString::null); + m_exitView->flipScroll(TQString()); } void KMenu::slotGoSubMenu(const TQString& relPath) @@ -918,16 +918,16 @@ void KMenu::goSubMenu(const TQString& relPath, bool keyboard) int index = rel.length() - 1; if ( rel.endsWith( "/" ) ) index--; - index = rel.findRev( '/', index ); + index = rel.tqfindRev( '/', index ); kdDebug() << "goup, rel '" << rel << "' " << index << endl; TQString currel = rel; rel = rel.left( index + 1 ); if ( rel == "/" ) - rel = TQString::null; + rel = TQString(); kdDebug() << "goup, rel '" << rel << "' " << rel.isEmpty() << endl; fillSubMenu( rel, m_browserView->prepareLeftMove() ); - m_browserView->flipScroll(keyboard ? currel : TQString::null); + m_browserView->flipScroll(keyboard ? currel : TQString()); return; } else if (relPath.isEmpty()) { @@ -952,7 +952,7 @@ void KMenu::goSubMenu(const TQString& relPath, bool keyboard) //m_browserView->clear(); fillSubMenu(relPath, m_browserView->prepareRightMove()); } - m_browserView->flipScroll(keyboard ? "kicker:/goup/": TQString::null); + m_browserView->flipScroll(keyboard ? "kicker:/goup/": TQString()); } void KMenu::fillSubMenu(const TQString& relPath, ItemView *view) @@ -973,9 +973,9 @@ void KMenu::fillSubMenu(const TQString& relPath, ItemView *view) } else if ( m_newInstalledPrograms.count() ) { KMenuItem *item = view->insertItem( "clock", i18n( "New Applications" ), - TQString::null, "kicker:/new/", nId++, -1 ); + TQString(), "kicker:/new/", nId++, -1 ); item->setHasChildren( true ); - view->insertSeparator( nId++, TQString::null, -1 ); + view->insertSeparator( nId++, TQString(), -1 ); } view->path = relPath; @@ -1136,7 +1136,7 @@ void KMenu::fillMenu(KServiceGroup::Ptr& continue; } - KMenuItem *item = view->insertItem(g->icon(), groupCaption, TQString::null, g->relPath(), id++, -1); + KMenuItem *item = view->insertItem(g->icon(), groupCaption, TQString(), g->relPath(), id++, -1); item->setMenuPath(g->relPath()); item->setHasChildren( true ); @@ -1165,11 +1165,11 @@ void KMenu::fillMenu(KServiceGroup::Ptr& KService::Ptr s(static_cast(e)); if (_relPath.isEmpty()) { TQStringList favs = KickerSettings::favorites(); - if (favs.find(s->storageId())!=favs.end()) + if (favs.tqfind(s->storageId())!=favs.end()) continue; } #ifdef KDELIBS_SUSE - KMenuItem *item = view->insertMenuItem(s, id++, -1, 0, TQString::null, specialTitle[s->name()], categoryIcon[s->name()] ); + KMenuItem *item = view->insertMenuItem(s, id++, -1, 0, TQString(), specialTitle[s->name()], categoryIcon[s->name()] ); if (shortenedMenuPath[s->name()].isEmpty()) item->setMenuPath(_relPath+s->menuId()); else @@ -1259,7 +1259,7 @@ void KMenu::initialize() if ((*it)[0]=='/') { KDesktopFile df((*it),true); TQString url = df.readURL(); - if (!KURL(url).isLocalFile() || TQFile::exists(url.replace("file://",TQString::null))) + if (!KURL(url).isLocalFile() || TQFile::exists(url.tqreplace("file://",TQString()))) m_favoriteView->insertItem(df.readIcon(),df.readName(),df.readGenericName(), url, nId++, index++); } else { @@ -1268,7 +1268,7 @@ void KMenu::initialize() } } - //nId = m_favoriteView->insertSeparator( nId, TQString::null, index++ ); + //nId = m_favoriteView->insertSeparator( nId, TQString(), index++ ); // m_favoriteView->insertDocument(KURL("help:/khelpcenter/userguide/index.html"), nId++); insertStaticItems(); @@ -1314,7 +1314,7 @@ void KMenu::insertStaticExitItems() m_exitView->leftView()->insertItem( "exit", i18n( "Shutdown Computer" ), i18n( "Turn off computer" ), "kicker:/shutdown", nId++, index++ ); - m_exitView->leftView()->insertItem( "reload", i18n( "&Restart Computer" ).replace("&",""), + m_exitView->leftView()->insertItem( "reload", i18n( "&Restart Computer" ).tqreplace("&",""), i18n( "Restart and boot the default system" ), "kicker:/restart", nId++, index++ ); @@ -1365,7 +1365,7 @@ void KMenu::insertStaticItems() m_systemView->insertItem( "network", i18n( "Network Folders" ), "remote:/", "remote:/", nId++, index++ ); - m_mediaWatcher = new MediaWatcher( this ); + m_mediaWatcher = new MediaWatcher( TQT_TQOBJECT(this) ); connect( m_mediaWatcher, TQT_SIGNAL( mediumChanged() ), TQT_SLOT( updateMedia() ) ); m_media_id = 0; @@ -1399,7 +1399,7 @@ void KMenu::slotLock() TQCString appname( "kdesktop" ); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", ""); + kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); } void KMenu::slotOpenHomepage() @@ -1454,7 +1454,7 @@ void KMenu::slotSessionActivated( int ent ) void KMenu::doNewSession( bool lock ) { int result = KMessageBox::warningContinueCancel( - kapp->desktop()->screen(kapp->desktop()->screenNumber(this)), + TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))), i18n("

    You have chosen to open another desktop session.
    " "The current session will be hidden " "and a new login screen will be displayed.
    " @@ -1512,7 +1512,7 @@ void KMenu::searchAccept() int kicker_screen_number = qt_xscreen(); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", ""); + kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); } } @@ -1556,7 +1556,7 @@ bool KMenu::runCommand() case KURIFilterData::HELP: { // No need for kfmclient, KRun does it all (David) - (void) new KRun( m_filterData->uri(), parentWidget()); + (void) new KRun( m_filterData->uri(), tqparentWidget()); return false; } case KURIFilterData::EXECUTABLE: @@ -1672,7 +1672,7 @@ void KMenu::setOrientation(MenuOrientation orientation) m_orientation=orientation; - m_resizeHandle->setCursor(m_orientation == BottomUp ? Qt::sizeBDiagCursor : Qt::sizeFDiagCursor); + m_resizeHandle->setCursor(m_orientation == BottomUp ? tqsizeBDiagCursor : tqsizeFDiagCursor); TQPixmap pix; if ( m_orientation == BottomUp ) @@ -1699,14 +1699,14 @@ void KMenu::setOrientation(MenuOrientation orientation) TQWidget *footer = m_footer->mainWidget(); TQPixmap pix( 64, footer->height() ); TQPainter p( &pix ); - p.fillRect( 0, 0, 64, footer->height(), m_branding->colorGroup().brush( TQColorGroup::Base ) ); + p.fillRect( 0, 0, 64, footer->height(), m_branding->tqcolorGroup().brush( TQColorGroup::Base ) ); p.fillRect( 0, m_orientation == BottomUp ? footer->height() - 2 : 0, 64, 3, KNewButton::self()->borderColor() ); p.end(); footer->setPaletteBackgroundPixmap( pix ); } - resizeEvent(new TQResizeEvent(sizeHint(), sizeHint())); + resizeEvent(new TQResizeEvent(tqsizeHint(), tqsizeHint())); } void KMenu::showMenu() @@ -1762,7 +1762,7 @@ void KMenu::paintEvent(TQPaintEvent * e) const BackgroundMode bgmode = backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - p.setBrush( colorGroup().brush( crole ) ); + p.setBrush( tqcolorGroup().brush( crole ) ); p.drawRect( 0, 0, width(), height() ); int ypos = m_search->mainWidget()->geometry().bottom(); @@ -1906,13 +1906,13 @@ bool KMenu::dontQueryNow (const TQString& str) if (str == current_query.get()) return true; int length = str.length (); - int last_whitespace = str.findRev (' ', -1); + int last_whitespace = str.tqfindRev (' ', -1); if (last_whitespace == length-1) return false; // if the user typed a space, search if (last_whitespace >= length-2) return true; // dont search if the user only typed one character TQChar lastchar = str[length-1]; - if (lastchar == ":" || lastchar == "=") + if (lastchar == ':' || lastchar == '=') return true; return false; } @@ -1923,11 +1923,11 @@ void KMenu::createNewProgramList() m_seenPrograms = KickerSettings::firstSeenApps(); m_newInstalledPrograms.clear(); - m_currentDate = TQDate::currentDate().toString(Qt::ISODate); + m_tqcurrentDate = TQDate::currentDate().toString(Qt::ISODate); bool initialize = (m_seenPrograms.count() == 0); - createNewProgramList(TQString::null); + createNewProgramList(TQString()); if (initialize) { for (TQStringList::Iterator it = m_seenPrograms.begin(); it != m_seenPrograms.end(); ++it) @@ -1964,7 +1964,7 @@ void KMenu::createNewProgramList(TQString relPath) } else if(e->isType(KST_KService)) { KService::Ptr s(static_cast(e)); if(s->type() == "Application" && !s->noDisplay() ) { - TQString shortStorageId = s->storageId().replace(".desktop",TQString::null); + TQString shortStorageId = s->storageId().tqreplace(".desktop",TQString()); TQStringList::Iterator it_find = m_seenPrograms.begin(); TQStringList::Iterator it_end = m_seenPrograms.end(); bool found = false; @@ -1978,8 +1978,8 @@ void KMenu::createNewProgramList(TQString relPath) if (!found) { m_seenProgramsChanged=true; m_seenPrograms+=shortStorageId; - m_seenPrograms+=m_currentDate; - if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end()) + m_seenPrograms+=m_tqcurrentDate; + if (m_newInstalledPrograms.tqfind(s->storageId())==m_newInstalledPrograms.end()) m_newInstalledPrograms+=s->storageId(); } else { @@ -1987,7 +1987,7 @@ void KMenu::createNewProgramList(TQString relPath) if (*(it_find)!="-") { TQDate date = TQDate::fromString(*(it_find),Qt::ISODate); if (date.daysTo(TQDate::currentDate())<3) { - if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end()) + if (m_newInstalledPrograms.tqfind(s->storageId())==m_newInstalledPrograms.end()) m_newInstalledPrograms+=s->storageId(); } else { @@ -2033,24 +2033,24 @@ void KMenu::searchProgramList(TQString relPath) int score = 0; if (s->exec()==input) score = 100; - else if (s->exec().find(input)==0) + else if (s->exec().tqfind(input)==0) score = 50; - else if (s->exec().find(input)!=-1) + else if (s->exec().tqfind(input)!=-1) score = 10; else if (s->name().lower()==input) score = 100; else if (s->genericName().lower()==input) score = 100; - else if (s->name().lower().find(input)==0) + else if (s->name().lower().tqfind(input)==0) score = 50; - else if (s->genericName().lower().find(input)==0) + else if (s->genericName().lower().tqfind(input)==0) score = 50; - else if (s->name().lower().find(input)!=-1) + else if (s->name().lower().tqfind(input)!=-1) score = 10; - else if (s->genericName().lower().find(input)!=-1) + else if (s->genericName().lower().tqfind(input)!=-1) score = 10; - if (s->exec().find(' ')==-1) + if (s->exec().tqfind(' ')==-1) score+=1; if (s->substituteUid()) @@ -2074,7 +2074,7 @@ void KMenu::searchProgramList(TQString relPath) } HitMenuItem *hit_item = new HitMenuItem (firstLine, secondLine, - s->desktopEntryPath(), TQString::null, 0, APPS, s->icon(), score); + s->desktopEntryPath(), TQString(), 0, APPS, s->icon(), score); if (hit_item == NULL) continue; @@ -2082,7 +2082,7 @@ void KMenu::searchProgramList(TQString relPath) insertSearchResult(hit_item); TQString exe = s->exec(); - int pos = exe.find(' '); + int pos = exe.tqfind(' '); if (pos>0) exe=exe.left(pos); m_programsInMenu+=KGlobal::dirs()->findExe(exe); @@ -2105,7 +2105,7 @@ void KMenu::searchBookmarks(KBookmarkGroup group) } HitMenuItem *hit_item = new HitMenuItem (bookmark.fullText(), bookmark.fullText(), - bookmark.url(), TQString::null, 0, BOOKMARKS, bookmark.icon()); + bookmark.url(), TQString(), 0, BOOKMARKS, bookmark.icon()); insertSearchResult(hit_item); } @@ -2162,7 +2162,7 @@ void KMenu::searchAddressbook() } hit_item = new HitMenuItem (i18n("Send Email to %1").arg(realName), (*it).preferredEmail(), - "mailto:"+(*it).preferredEmail(), TQString::null, 0, ACTIONS, "mail_new"); + "mailto:"+(*it).preferredEmail(), TQString(), 0, ACTIONS, "mail_new"); insertSearchResult(hit_item); } @@ -2173,7 +2173,7 @@ void KMenu::searchAddressbook() } hit_item = new HitMenuItem (i18n("Open Addressbook at %1").arg(realName), (*it).preferredEmail(), - "kaddressbook:/"+(*it).uid(), TQString::null, 0, ACTIONS, "kaddressbook"); + "kaddressbook:/"+(*it).uid(), TQString(), 0, ACTIONS, "kaddressbook"); insertSearchResult(hit_item); @@ -2205,7 +2205,7 @@ TQString KMenu::insertBreaks(const TQString& text, TQFontMetrics fm, int width, void KMenu::clearSearchResults(bool showHelp) { m_searchResultsWidget->clear(); - m_searchResultsWidget->setFocusPolicy(showHelp ? TQWidget::NoFocus : TQWidget::StrongFocus); + m_searchResultsWidget->setFocusPolicy(showHelp ? TQ_NoFocus : TQ_StrongFocus); setTabOrder(m_kcommand, m_searchResultsWidget); if (showHelp) { @@ -2280,8 +2280,8 @@ void KMenu::doQuery (bool return_pressed) if (!result.isEmpty()) { categorised_hit_total[ACTIONS] ++; - HitMenuItem *hit_item = new HitMenuItem (i18n("%1 = %2").arg(query_str, result), TQString::null, - "kcalc", TQString::null, (++max_category_id [ACTIONS]), ACTIONS, "kcalc"); + HitMenuItem *hit_item = new HitMenuItem (i18n("%1 = %2").arg(query_str, result), TQString(), + "kcalc", TQString(), (++max_category_id [ACTIONS]), ACTIONS, "kcalc"); int index = getHitMenuItemPosition (hit_item); m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name, hit_item->display_info, KGlobal::dirs()->findExe("kcalc"), max_category_id [ACTIONS], index); @@ -2291,15 +2291,15 @@ void KMenu::doQuery (bool return_pressed) // detect email address if (emailRegExp.exactMatch(query_str)) { categorised_hit_total[ACTIONS] ++; - HitMenuItem *hit_item = new HitMenuItem (i18n("Send Email to %1").arg(query_str), TQString::null, - "mailto:"+query_str, TQString::null, (++max_category_id [ACTIONS]), ACTIONS, "mail_new"); + HitMenuItem *hit_item = new HitMenuItem (i18n("Send Email to %1").arg(query_str), TQString(), + "mailto:"+query_str, TQString(), (++max_category_id [ACTIONS]), ACTIONS, "mail_new"); int index = getHitMenuItemPosition (hit_item); m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name, hit_item->display_info, "mailto:"+query_str, max_category_id [ACTIONS], index); } // quick own application search m_programsInMenu.clear(); - searchProgramList(TQString::null); + searchProgramList(TQString()); KURIFilterData filterData; filterData.setData(query_str); @@ -2329,18 +2329,18 @@ void KMenu::doQuery (bool return_pressed) if (exe.endsWith("/bin/gimp")) { TQStringList::ConstIterator it = m_programsInMenu.begin(); for (; it != m_programsInMenu.end(); ++it) - if ((*it).find("bin/gimp-remote-")!=-1) { + if ((*it).tqfind("bin/gimp-remote-")!=-1) { gimp_hack = true; break; } } #endif - if (m_programsInMenu.find(exe)!=m_programsInMenu.end() + if (m_programsInMenu.tqfind(exe)!=m_programsInMenu.end() #ifdef KDELIBS_SUSE || gimp_hack #endif ) - exe = TQString::null; + exe = TQString(); else if (kapp->authorize("shell_access")) { if( filterData.hasArgsAndOptions() ) @@ -2356,8 +2356,8 @@ void KMenu::doQuery (bool return_pressed) if (!description.isEmpty()) { categorised_hit_total[ACTIONS] ++; - HitMenuItem *hit_item = new HitMenuItem (description, TQString::null, - exe.isEmpty() ? filterData.uri() : exe, TQString::null, + HitMenuItem *hit_item = new HitMenuItem (description, TQString(), + exe.isEmpty() ? filterData.uri() : exe, TQString(), (++max_category_id [ACTIONS]), ACTIONS, exe.isEmpty() ? "fileopen": "run"); int index = getHitMenuItemPosition (hit_item); m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name, @@ -2521,7 +2521,7 @@ void KMenu::updateCategoryTitles() sep->setText( 0, i18n( "%1 (top %2 of %3)" ).arg( i18n(categories [i].utf8()) ).arg( max ).arg( categorised_hit_total [i] ) ); } else { - sep->setLink( TQString::null ); + sep->setLink( TQString() ); } } delete[] already_added; @@ -2540,15 +2540,15 @@ TQString KMenu::iconForHitMenuItem(HitMenuItem *hit_item) return favicon; } - if (mimetype_iconstore.contains (hit_item->mimetype)) + if (mimetype_iconstore.tqcontains (hit_item->mimetype)) return (mimetype_iconstore [hit_item->mimetype]); else { KMimeType::Ptr mimetype_ptr = KMimeType::mimeType (hit_item->mimetype); - TQString mimetype_icon = mimetype_ptr->icon(TQString::null, FALSE); + TQString mimetype_icon = mimetype_ptr->icon(TQString(), FALSE); mimetype_iconstore [hit_item->mimetype] = mimetype_icon; return mimetype_icon; } - return TQString::null; + return TQString(); } void KMenu::slotStartService(KService::Ptr ptr) @@ -2621,7 +2621,7 @@ void KMenu::slotStartURL(const TQString& u) #ifdef KDELIBS_SUSE TQByteArray params; TQDataStream stream(params, IO_WriteOnly); - stream << 1 << -1 << TQString::null; + stream << 1 << -1 << TQString(); kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); #else @@ -2715,13 +2715,13 @@ void KMenu::slotStartURL(const TQString& u) } kapp->propagateSessionManager(); - (void) new KRun( u, parentWidget()); + (void) new KRun( u, tqparentWidget()); } } void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos, int /*col*/ ) { - const TQObject* source = sender(); + const TQObject* source = TQT_TQOBJECT_CONST(sender()); if (!item) return; @@ -2744,7 +2744,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupPath.path = kitem->path(); m_popupPath.icon = kitem->icon(); - if (m_popupPath.path.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { + if (m_popupPath.path.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { KDesktopFile df(m_popupPath.path,true); m_popupPath.path=df.readURL(); } @@ -2756,7 +2756,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupMenu->insertTitle(SmallIcon(kitem->icon()),kitem->title()); - if (source==m_favoriteView) + if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView)) { hasEntries = true; m_popupMenu->insertItem(SmallIconSet("remove"), @@ -2770,7 +2770,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos i18n("Add to Favorites"), AddToFavorites); TQStringList favs = KickerSettings::favorites(); - if (m_popupService && favs.find(m_popupService->storageId())!=favs.end()) + if (m_popupService && favs.tqfind(m_popupService->storageId())!=favs.end()) m_popupMenu->setItemEnabled(num, false); else { TQStringList::Iterator it; @@ -2779,7 +2779,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==m_popupPath.path) + if (df.readURL().tqreplace("file://",TQString())==m_popupPath.path) break; } } @@ -2788,7 +2788,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos } } - if (source!=m_exitView) { + if (TQT_BASE_OBJECT_CONST(source)!=TQT_BASE_OBJECT(m_exitView)) { if (m_popupService || (!m_popupPath.path.startsWith("kicker:/") && !m_popupPath.path.startsWith("system:/") && !m_popupPath.path.startsWith("kaddressbook:/"))) { if (hasEntries) m_popupMenu->insertSeparator(); @@ -2828,14 +2828,14 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos i18n("Put Into Run Dialog"), PutIntoRunDialog); } } - if (source==m_searchResultsWidget || ((source==m_favoriteView || source==m_recentlyView || source == m_systemView) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) { + if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_searchResultsWidget) || ((TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView) || TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView) || TQT_BASE_OBJECT_CONST(source) == TQT_BASE_OBJECT(m_systemView)) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) { TQString uri; if (m_popupService) uri = locate("apps", m_popupService->desktopEntryPath()); else uri = m_popupPath.path; - TQString mimetype = TQString::null; + TQString mimetype = TQString(); if ( m_popupPath.path.startsWith( "system:/media/" ) ) mimetype = media_mimetypes[m_popupPath.path]; @@ -2865,7 +2865,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos } } - if (source==m_recentlyView) { + if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView)) { m_popupMenu->insertSeparator(); if (m_popupService) m_popupMenu->insertItem(SmallIconSet("history_clear"), @@ -2935,8 +2935,8 @@ void KMenu::slotContextMenu(int selected) case EditItem: case EditMenu: accept(); - proc = new KProcess(this); - *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); + proc = new KProcess(TQT_TQOBJECT(this)); + *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1); proc->start(); break; @@ -2971,7 +2971,7 @@ void KMenu::slotContextMenu(int selected) case AddToFavorites: if (m_popupService) { - if (favs.find(m_popupService->storageId())==favs.end()) { + if (favs.tqfind(m_popupService->storageId())==favs.end()) { KService::Ptr p = KService::serviceByStorageId(m_popupService->storageId()); m_favoriteView->insertMenuItem(p, serviceMenuEndId()+favs.count()+1); favs+=m_popupService->storageId(); @@ -2982,7 +2982,7 @@ void KMenu::slotContextMenu(int selected) for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==m_popupPath.path) + if (df.readURL().tqreplace("file://",TQString())==m_popupPath.path) break; } } @@ -3010,7 +3010,7 @@ void KMenu::slotContextMenu(int selected) case RemoveFromFavorites: if (m_popupService) { - favs.erase(favs.find(m_popupService->storageId())); + favs.erase(favs.tqfind(m_popupService->storageId())); for (TQListViewItemIterator it(m_favoriteView); it.current(); ++it) { KMenuItem* kitem = static_cast(it.current()); @@ -3024,7 +3024,7 @@ void KMenu::slotContextMenu(int selected) for (TQStringList::Iterator it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==m_popupPath.path) { + if (df.readURL().tqreplace("file://",TQString())==m_popupPath.path) { TQFile::remove((*it)); favs.erase(it); break; @@ -3074,24 +3074,24 @@ void KMenu::resizeEvent ( TQResizeEvent * e ) // put the search widget at the top of the menu and give it its desired // height m_search->mainWidget()->setGeometry( 0, ypos, width(), - m_search->minimumSize().height() ); - left_height -= m_search->minimumSize().height(); - ypos += m_search->minimumSize().height(); + m_search->tqminimumSize().height() ); + left_height -= m_search->tqminimumSize().height(); + ypos += m_search->tqminimumSize().height(); // place the footer widget at the bottom of the menu and give it its desired // height - m_footer->mainWidget()->setGeometry( 0, height() - m_footer->minimumSize().height(), - width(), m_footer->minimumSize().height() ); - left_height -= m_footer->minimumSize().height(); + m_footer->mainWidget()->setGeometry( 0, height() - m_footer->tqminimumSize().height(), + width(), m_footer->tqminimumSize().height() ); + left_height -= m_footer->tqminimumSize().height(); // place the button box above the footer widget, horizontal placement // has the width of the edge graphics subtracted m_tabBar->setGeometry(button_box_left.width(), - height() - m_footer->minimumSize().height() - - m_tabBar->sizeHint().height(), + height() - m_footer->tqminimumSize().height() - + m_tabBar->tqsizeHint().height(), width() - button_box_left.width(), - m_tabBar->sizeHint().height() ); - left_height -= m_tabBar->sizeHint().height(); + m_tabBar->tqsizeHint().height() ); + left_height -= m_tabBar->tqsizeHint().height(); // place the main (stacker) widget below the search widget, // in the remaining vertical space @@ -3105,28 +3105,28 @@ void KMenu::resizeEvent ( TQResizeEvent * e ) // place the 'footer' widget at the top of the menu and give it // its desired height m_footer->mainWidget()->setGeometry( 0, - ypos /*height() - m_footer->minimumSize().height()*/, + ypos /*height() - m_footer->tqminimumSize().height()*/, width(), - m_footer->minimumSize().height() ); - ypos += m_footer->minimumSize().height(); - left_height -= m_footer->minimumSize().height(); + m_footer->tqminimumSize().height() ); + ypos += m_footer->tqminimumSize().height(); + left_height -= m_footer->tqminimumSize().height(); // place the button box next at the top of the menu. // has the width of the edge graphics subtracted m_tabBar->setGeometry(button_box_left.width(), ypos, width() - button_box_left.width(), - m_tabBar->sizeHint().height()); + m_tabBar->tqsizeHint().height()); - ypos += m_tabBar->sizeHint().height(); - left_height -= m_tabBar->sizeHint().height(); + ypos += m_tabBar->tqsizeHint().height(); + left_height -= m_tabBar->tqsizeHint().height(); // put the search widget above the footer widget // height m_search->mainWidget()->setGeometry( 0, - height() - m_search->minimumSize().height(), + height() - m_search->tqminimumSize().height(), width(), - m_search->minimumSize().height() + m_search->tqminimumSize().height() ); - left_height -= m_search->minimumSize().height(); + left_height -= m_search->tqminimumSize().height(); // place the main (stacker) widget below the button box, // in the remaining vertical space @@ -3167,14 +3167,14 @@ void KMenu::mouseMoveEvent ( TQMouseEvent * e ) if ( hasMouseTracking() && m_isresizing ) { m_stacker->setMinimumSize( TQSize(0, 0) ); m_stacker->setMaximumSize( TQSize(32000, 32000) ); - int newWidth = QMAX( e->x() - x(), minimumSizeHint().width() ); + int newWidth = QMAX( e->x() - x(), tqminimumSizeHint().width() ); if ( m_orientation == BottomUp ) { - int newHeight = QMAX( height() - e->y(), minimumSizeHint().height() + 10 ); + int newHeight = QMAX( height() - e->y(), tqminimumSizeHint().height() + 10 ); int newY = y() + height() - newHeight; setGeometry( x(), newY, newWidth, newHeight); } else { - setGeometry( x(), y(), newWidth, QMAX( e->y(), minimumSizeHint().height() + 10 )); + setGeometry( x(), y(), newWidth, QMAX( e->y(), tqminimumSizeHint().height() + 10 )); } } } @@ -3277,10 +3277,10 @@ void KMenu::searchActionClicked(TQListViewItem* item) if( !KURIFilter::self()->filterURI(data, list) ) { KDesktopFile file("searchproviders/google.desktop", true, "services"); - data.setData(file.readEntry("Query").replace("\\{@}", m_kcommand->currentText())); + data.setData(file.readEntry("Query").tqreplace("\\{@}", m_kcommand->currentText())); } - (void) new KRun( data.uri(), parentWidget()); + (void) new KRun( data.uri(), tqparentWidget()); } } @@ -3320,7 +3320,7 @@ void KMenu::updateRecentlyUsedApps(KService::Ptr &service) TQString strItem(service->desktopEntryPath()); // don't add an item from root kmenu level - if (!strItem.contains('/')) + if (!strItem.tqcontains('/')) { return; } @@ -3331,7 +3331,7 @@ void KMenu::updateRecentlyUsedApps(KService::Ptr &service) RecentlyLaunchedApps::the().m_bNeedToUpdate = true; } -TQSize KMenu::sizeHint() const +TQSize KMenu::tqsizeHint() const { #warning FIXME // this should be only for the inner area so layout changes do not break it @@ -3339,28 +3339,28 @@ TQSize KMenu::sizeHint() const const int height = kMin(KickerSettings::kMenuHeight(), TQApplication::desktop()->screen()->height()-50); TQSize wanted(width, height); - kdDebug() << "show " << minimumSizeHint() << " " << m_stacker->minimumSizeHint() << " " - << m_searchFrame->minimumSizeHint() << " " << wanted << endl; + kdDebug() << "show " << tqminimumSizeHint() << " " << m_stacker->tqminimumSizeHint() << " " + << m_searchFrame->tqminimumSizeHint() << " " << wanted << endl; bool isDefault = wanted.isNull(); - wanted = wanted.expandedTo(minimumSizeHint()); + wanted = wanted.expandedTo(tqminimumSizeHint()); if ( isDefault ) - wanted.setHeight( wanted.height() + ( m_favoriteView->goodHeight() - m_stacker->minimumSizeHint().height() ) ); + wanted.setHeight( wanted.height() + ( m_favoriteView->goodHeight() - m_stacker->tqminimumSizeHint().height() ) ); return wanted; } -TQSize KMenu::minimumSizeHint() const +TQSize KMenu::tqminimumSizeHint() const { TQSize minsize; - minsize.setWidth( minsize.width() + m_tabBar->sizeHint().width() ); + minsize.setWidth( minsize.width() + m_tabBar->tqsizeHint().width() ); minsize.setWidth( QMAX( minsize.width(), - m_search->minimumSize().width() ) ); + m_search->tqminimumSize().width() ) ); minsize.setWidth( QMAX( minsize.width(), - m_search->minimumSize().width() ) ); + m_search->tqminimumSize().width() ) ); minsize.setHeight( minsize.height() + - m_search->minimumSize().height() + - m_footer->minimumSize().height() + + m_search->tqminimumSize().height() + + m_footer->tqminimumSize().height() + 180 ); // 180 is a very rough guess for 32 icon size return minsize; } @@ -3372,12 +3372,12 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir TQStringList favs = KickerSettings::favorites(); TQStringList::Iterator it; - TQString addFav = TQString::null; + TQString addFav = TQString(); // remove at old position if (kitem->service()) { - favs.erase(favs.find(kitem->service()->storageId())); + favs.erase(favs.tqfind(kitem->service()->storageId())); addFav = kitem->service()->storageId(); } else @@ -3387,7 +3387,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==kitem->path()) + if (df.readURL().tqreplace("file://",TQString())==kitem->path()) { addFav = *it; favs.erase(it); @@ -3412,7 +3412,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir if ((*it)[0]=='/' && !kafterNow->service()) { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==kafterNow->path()) + if (df.readURL().tqreplace("file://",TQString())==kafterNow->path()) { kdDebug() << "insert after " << kafterNow->path() << endl; favs.insert(++it,addFav); @@ -3480,7 +3480,7 @@ void KMenu::updateMedia() if ( iconName.isEmpty() ) // no user icon, query the MIME type { KMimeType::Ptr mime = KMimeType::mimeType( mimeType ); - iconName = mime->icon( TQString::null, false ); + iconName = mime->icon( TQString(), false ); } TQString descr = deviceNode; @@ -3549,7 +3549,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) if (item.m_s) { - if (favs.find(item.m_s->storageId())==favs.end()) + if (favs.tqfind(item.m_s->storageId())==favs.end()) { newItem = m_favoriteView->insertMenuItem(item.m_s, serviceMenuEndId()+favs.count()+1); favs += item.m_s->storageId(); @@ -3558,7 +3558,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) else { TQString uri = item.m_path; - if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } @@ -3569,7 +3569,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==uri) + if (df.readURL().tqreplace("file://",TQString())==uri) break; } } @@ -3597,8 +3597,8 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) if (text.endsWith(".desktop")) { - KService::Ptr p = KService::serviceByDesktopPath(text.replace("file://",TQString::null)); - if (p && favs.find(p->storageId())==favs.end()) { + KService::Ptr p = KService::serviceByDesktopPath(text.tqreplace("file://",TQString())); + if (p && favs.tqfind(p->storageId())==favs.end()) { newItem = m_favoriteView->insertMenuItem(p, serviceMenuEndId()+favs.count()+1); favs+=p->storageId(); } @@ -3611,13 +3611,13 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==text) + if (df.readURL().tqreplace("file://",TQString())==text) break; } } if (it==favs.end()) { - KFileItem* item = new KFileItem(text, TQString::null, KFileItem::Unknown); + KFileItem* item = new KFileItem(text, TQString(), KFileItem::Unknown); KURL kurl(text); TQString file = KickerLib::newDesktopFile(text); @@ -3625,7 +3625,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", item->name()); - df.writeEntry("GenericName", i18n("Directory: %1").arg(kurl.upURL().path())); + df.writeEntry("GenericName", i18n("Directory: %1").tqarg(kurl.upURL().path())); df.writeEntry("Icon", item->iconName()); df.writeEntry("URL", text); diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h index ef45ef815..73549cfa0 100644 --- a/kicker/kicker/ui/k_new_mnu.h +++ b/kicker/kicker/ui/k_new_mnu.h @@ -104,8 +104,8 @@ public: enum MaskEffect { Plain, Dissolve }; - virtual TQSize sizeHint() const; - virtual TQSize minimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual TQSize tqminimumSizeHint() const; void searchOver(); void initCategoryTitlesUpdate(); @@ -319,7 +319,7 @@ private: TQStringList m_programsInMenu; TQStringList m_newInstalledPrograms, m_seenPrograms; bool m_seenProgramsChanged; - TQString m_currentDate; + TQString m_tqcurrentDate; MenuOrientation m_orientation; bool m_toolTipsEnabled; diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp index 2f0de9aea..6fe731933 100644 --- a/kicker/kicker/ui/kickoff_bar.cpp +++ b/kicker/kicker/ui/kickoff_bar.cpp @@ -56,10 +56,10 @@ void KickoffTabBar::paint(TQPainter* p, TQTab* t, bool selected) const // else if(t == d->pressed) // flags |= TQStyle::Style_Sunken; //selection flags - if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) + if(t->rect().tqcontains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; - style().drawControl( TQStyle::CE_TabBarTab, p, this, t->rect(), - colorGroup(), flags, TQStyleOption(t) ); + tqstyle().tqdrawControl( TQStyle::CE_TabBarTab, p, this, t->rect(), + tqcolorGroup(), flags, TQStyleOption(t) ); paintLabel( p, t->rect(), t, t->identifier() == keyboardFocusTab() ); } @@ -70,11 +70,11 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha TQRect r = br; bool selected = m_tabsActivated && (currentTab() == t->identifier()); - int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this ); + int vframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this ); p->setFont( font() ); TQFontMetrics fm = p->fontMetrics(); - int fw = fm.size( Qt::SingleLine|Qt::ShowPrefix, t->text() ).width(); + int fw = fm.size( TQt::SingleLine|TQt::ShowPrefix, t->text() ).width(); TQRect rt(r); rt.setWidth(fw); @@ -114,30 +114,30 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha flags |= TQStyle::Style_Selected; // else if(t == d->pressed) // flags |= TQStyle::Style_Sunken; - if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) + if(t->rect().tqcontains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; - style().drawControl( TQStyle::CE_TabBarLabel, p, this, rt, - t->isEnabled() ? colorGroup(): palette().disabled(), + tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, rt, + t->isEnabled() ? tqcolorGroup(): tqpalette().disabled(), flags, TQStyleOption(t) ); } -TQSize KickoffTabBar::sizeHint() const +TQSize KickoffTabBar::tqsizeHint() const { - TQSize s = TQTabBar::sizeHint(); + TQSize s = TQTabBar::tqsizeHint(); return s; } void KickoffTabBar::layoutTabs() { - TQTabBar::layoutTabs(); + TQTabBar::tqlayoutTabs(); TQFontMetrics fm = fontMetrics(); int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4; - int hframe = style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this ); - int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this ); - int overlap = style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this ); + int hframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this ); + int vframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this ); + int overlap = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this ); TQSize s; for (int t = 0; t < count(); ++t) @@ -155,13 +155,13 @@ void KickoffTabBar::layoutTabs() h += 4 + s.height() + 4; TQRect r = tab->rect(); - int fw = fm.size( Qt::SingleLine|Qt::ShowPrefix, tab->text() ).width(); + int fw = fm.size( TQt::SingleLine|TQt::ShowPrefix, tab->text() ).width(); int iw = 0; if ( tab->iconSet() != 0 ) iw = tab->iconSet()->pixmap( TQIconSet::Large, TQIconSet::Normal ).width(); int w = QMAX(iw, fw + 6 + 6 ) + hframe; h += ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + vframe; - tab->setRect(TQRect(TQPoint(x, 0), style().sizeFromContents(TQStyle::CT_TabBarTab, this, + tab->setRect(TQRect(TQPoint(x, 0), tqstyle().tqsizeFromContents(TQStyle::CT_TabBarTab, this, TQSize(w, h), TQStyleOption(tab)))); x += tab->rect().width() - overlap; } @@ -185,7 +185,7 @@ void KickoffTabBar::dragMoveEvent(TQDragMoveEvent* event) void KickoffTabBar::mousePressEvent( TQMouseEvent * e ) { - if ( e->button() != LeftButton ) { + if ( e->button() != Qt::LeftButton ) { e->ignore(); return; } diff --git a/kicker/kicker/ui/kickoff_bar.h b/kicker/kicker/ui/kickoff_bar.h index 2330ffe39..55f94c3dd 100644 --- a/kicker/kicker/ui/kickoff_bar.h +++ b/kicker/kicker/ui/kickoff_bar.h @@ -32,7 +32,7 @@ public: KickoffTabBar(TQWidget* parent, const char* name); void deactivateTabs(bool b); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; protected: virtual void paint(TQPainter*, TQTab*, bool) const; diff --git a/kicker/kicker/ui/kmenuitembase.ui b/kicker/kicker/ui/kmenuitembase.ui index 0cbea1155..0b49763a1 100644 --- a/kicker/kicker/ui/kmenuitembase.ui +++ b/kicker/kicker/ui/kmenuitembase.ui @@ -1,6 +1,6 @@ KMenuItemBase - + KMenuItemBase @@ -20,13 +20,13 @@ 0 - + 0 0 - + 32767 80 @@ -42,7 +42,7 @@ 2 - + layout11 @@ -50,7 +50,7 @@ unnamed - + itemTitle @@ -73,11 +73,11 @@ RichText - + WordBreak|AlignTop - + itemDescription @@ -102,13 +102,13 @@ RichText - + WordBreak|AlignTop - + layout4 @@ -116,11 +116,11 @@ unnamed - + itemPixmap - + 64 64 @@ -129,7 +129,7 @@ - + AlignTop|AlignHCenter diff --git a/kicker/kicker/ui/nonKDEButtonSettings.ui b/kicker/kicker/ui/nonKDEButtonSettings.ui index 5c44aca85..a3f04e6a8 100644 --- a/kicker/kicker/ui/nonKDEButtonSettings.ui +++ b/kicker/kicker/ui/nonKDEButtonSettings.ui @@ -1,6 +1,6 @@ NonKDEButtonSettings - + NonKDEButtonSettings @@ -30,7 +30,7 @@ Enter the name of the executable file to be run when this button is selected. If it is not in your $PATH then you will need to provide an absolute path. - + textLabel3 @@ -46,7 +46,7 @@ <i>Example</i>: For the command `rm -rf` enter "-rf" in this text box. - + m_inTerm @@ -57,7 +57,7 @@ Select this option if the command is a command line application and you wish to be able to see its output when run. - + m_commandLine @@ -67,7 +67,7 @@ <i>Example</i>: For the command `rm -rf` enter "-rf" in this text box. - + textLabel2 @@ -81,7 +81,7 @@ Enter the name of the executable file to be run when this button is selected. If it is not in your $PATH then you will need to provide an absolute path. - + m_title @@ -97,7 +97,7 @@ Enter the name you would like to appear for this button here. - + textLabel1 @@ -121,7 +121,7 @@ Expanding - + 20 16 @@ -140,13 +140,13 @@ 0 - + 58 58 - + 58 58 @@ -159,7 +159,7 @@ 48 - + textLabel4 @@ -173,7 +173,7 @@ Enter the name you would like to appear for this button here. - + m_description @@ -199,7 +199,7 @@ Minimum - + 20 8 diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h index 439fc195f..e5f565c1a 100644 --- a/kicker/kicker/ui/popupmenutitle.h +++ b/kicker/kicker/ui/popupmenutitle.h @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -class PopupMenuTitle : public QCustomMenuItem +class PopupMenuTitle : public TQCustomMenuItem { public: PopupMenuTitle(const TQString &name, const TQFont &font); @@ -46,7 +46,7 @@ public: { p->save(); TQRect r(x, y, w, h); - kapp->style().drawPrimitive(TQStyle::PE_HeaderSection, + kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, p, r, cg); if (!m_desktopName.isEmpty()) @@ -69,11 +69,11 @@ public: m_font.setBold(true); } - TQSize sizeHint() + TQSize tqsizeHint() { TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName); size.setHeight(size.height() + - (kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); + (kapp->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); return size; } diff --git a/kicker/kicker/ui/query.cpp b/kicker/kicker/ui/query.cpp index 12b9b6910..0bcff59c1 100644 --- a/kicker/kicker/ui/query.cpp +++ b/kicker/kicker/ui/query.cpp @@ -111,7 +111,7 @@ bool Query::matches(const TQString &term) bool next_alternative = false; for ( TQStringList::ConstIterator it = alt->excludes.begin(); it != alt->excludes.end(); ++it ) { - if ( lower_term.find(*it)!=-1 ) { + if ( lower_term.tqfind(*it)!=-1 ) { next_alternative = true; continue; } @@ -120,7 +120,7 @@ bool Query::matches(const TQString &term) continue; for ( TQStringList::ConstIterator it = alt->includes.begin(); it != alt->includes.end(); ++it ) { - if ( lower_term.find(*it)==-1 ) { + if ( lower_term.tqfind(*it)==-1 ) { next_alternative = true; continue; } diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp index 2e0543dae..3c14a74aa 100644 --- a/kicker/kicker/ui/removeapplet_mnu.cpp +++ b/kicker/kicker/ui/removeapplet_mnu.cpp @@ -63,7 +63,7 @@ void PanelRemoveAppletMenu::slotAboutToShow() } items.append(PanelMenuItemInfo(container->icon(), - container->visibleName().replace("&", "&&"), + container->visibleName().tqreplace("&", "&&"), id)); ++id; ++it; diff --git a/kicker/kicker/ui/removeapplet_mnu.h b/kicker/kicker/ui/removeapplet_mnu.h index b444b8540..895ded710 100644 --- a/kicker/kicker/ui/removeapplet_mnu.h +++ b/kicker/kicker/ui/removeapplet_mnu.h @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ContainerArea; -class PanelRemoveAppletMenu : public QPopupMenu +class PanelRemoveAppletMenu : public TQPopupMenu { Q_OBJECT diff --git a/kicker/kicker/ui/removebutton_mnu.h b/kicker/kicker/ui/removebutton_mnu.h index d326a2f62..211edd771 100644 --- a/kicker/kicker/ui/removebutton_mnu.h +++ b/kicker/kicker/ui/removebutton_mnu.h @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ContainerArea; -class PanelRemoveButtonMenu : public QPopupMenu +class PanelRemoveButtonMenu : public TQPopupMenu { Q_OBJECT diff --git a/kicker/kicker/ui/removecontainer_mnu.h b/kicker/kicker/ui/removecontainer_mnu.h index 6dd28dc30..bd6d03d89 100644 --- a/kicker/kicker/ui/removecontainer_mnu.h +++ b/kicker/kicker/ui/removecontainer_mnu.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ContainerArea; -class RemoveContainerMenu : public QPopupMenu +class RemoveContainerMenu : public TQPopupMenu { Q_OBJECT diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp index 9d5d80d2b..e1d8d62c4 100644 --- a/kicker/kicker/ui/removeextension_mnu.cpp +++ b/kicker/kicker/ui/removeextension_mnu.cpp @@ -57,7 +57,7 @@ void PanelRemoveExtensionMenu::slotAboutToShow() for (ExtensionList::iterator it = m_containers.begin(); it != itEnd; ++it) { const AppletInfo info = (*it)->info(); - TQString name = info.name().replace("&", "&&"); + TQString name = info.name().tqreplace("&", "&&"); switch ((*it)->position()) { case KPanelExtension::Top: diff --git a/kicker/kicker/ui/removeextension_mnu.h b/kicker/kicker/ui/removeextension_mnu.h index 2fc83008a..e77522bc8 100644 --- a/kicker/kicker/ui/removeextension_mnu.h +++ b/kicker/kicker/ui/removeextension_mnu.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "container_extension.h" -class PanelRemoveExtensionMenu : public QPopupMenu +class PanelRemoveExtensionMenu : public TQPopupMenu { Q_OBJECT diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 3042eddfe..76aa6162e 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -231,7 +231,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, TQString inlineHeaderName = g->showInlineHeader() ? groupCaption : ""; // Item names may contain ampersands. To avoid them being converted // to accelerators, replace them with two ampersands. - groupCaption.replace("&", "&&"); + groupCaption.tqreplace("&", "&&"); if ( nbChildCount == 1 && g->allowInline() && g->inlineAlias()) { @@ -411,10 +411,10 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, if (KickerSettings::menuEntryFormat() == KickerSettings::NameAndDescription) { if ((!suppressGenericNames || - !suppressGenericNames->contains(s->untranslatedGenericName())) && - serviceName.find(comment, 0, true) == -1) + !suppressGenericNames->tqcontains(s->untranslatedGenericName())) && + serviceName.tqfind(comment, 0, true) == -1) { - if (comment.find(serviceName, 0, true) == -1) + if (comment.tqfind(serviceName, 0, true) == -1) { serviceName = i18n("Entries in K-menu: %1 app name, %2 description", "%1 - %2").arg(serviceName, comment); } @@ -450,7 +450,7 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, // item names may contain ampersands. To avoid them being converted // to accelerators, replace them with two ampersands. - serviceName.replace("&", "&&"); + serviceName.tqreplace("&", "&&"); TQString icon = s->icon(); if (icon=="unknown") @@ -544,7 +544,7 @@ bool PanelServiceMenu::highlightMenuItem( const TQString &menuItemId ) void PanelServiceMenu::slotExec(int id) { - if (!entryMap_.contains(id)) + if (!entryMap_.tqcontains(id)) { return; } @@ -569,7 +569,7 @@ void PanelServiceMenu::mousePressEvent(TQMouseEvent * ev) void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) { - if (ev->button() == RightButton && !Kicker::the()->isKioskImmutable()) + if (ev->button() == Qt::RightButton && !Kicker::the()->isKioskImmutable()) { int id = idAt( ev->pos() ); @@ -578,7 +578,7 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) return; } - if (!entryMap_.contains(id)) + if (!entryMap_.tqcontains(id)) { kdDebug(1210) << "Cannot find service with menu id " << id << endl; return; @@ -694,8 +694,8 @@ void PanelServiceMenu::slotContextMenu(int selected) } case EditItem: - proc = new KProcess(this); - *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); + proc = new KProcess(TQT_TQOBJECT(this)); + *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); *proc << "/"+relPath_ << static_cast(contextKSycocaEntry_)->menuId(); proc->start(); break; @@ -738,8 +738,8 @@ void PanelServiceMenu::slotContextMenu(int selected) } case EditMenu: - proc = new KProcess(this); - *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); + proc = new KProcess(TQT_TQOBJECT(this)); + *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); *proc << "/"+static_cast(contextKSycocaEntry_)->relPath(); proc->start(); break; @@ -756,7 +756,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) if (Kicker::the()->isKioskImmutable()) return; - if ( (ev->state() & LeftButton ) != LeftButton ) + if ( (ev->state() & Qt::LeftButton ) != Qt::LeftButton ) return; TQPoint p = ev->pos() - startPos_; @@ -769,7 +769,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) if (id < serviceMenuStartId()) return; - if (!entryMap_.contains(id)) { + if (!entryMap_.tqcontains(id)) { kdDebug(1210) << "Cannot find service with menu id " << id << endl; return; } @@ -838,7 +838,7 @@ void PanelServiceMenu::dragEnterEvent(TQDragEnterEvent *event) void PanelServiceMenu::dragLeaveEvent(TQDragLeaveEvent *) { // see PanelServiceMenu::dragEnterEvent why this is nescessary - if (!frameGeometry().contains(TQCursor::pos())) + if (!TQT_TQRECT_OBJECT(frameGeometry()).tqcontains(TQCursor::pos())) { KURLDrag::setTarget(0); } @@ -932,12 +932,12 @@ void PanelServiceMenu::setSearchString(const TQString &searchString) int id = *menuItemIt; KService* s = dynamic_cast< KService* >( static_cast< KSycocaEntry* >( entryMap_[ id ])); TQString menuText = text(id); - if (menuText.contains(searchString, false) > 0 - || ( s != NULL && ( s->name().contains(searchString, false) > 0 - || s->exec().contains(searchString, false) > 0 - || s->comment().contains(searchString, false) > 0 - || s->genericName().contains(searchString, false) > 0 - || s->exec().contains(searchString, false) > 0 ) + if (menuText.tqcontains(searchString, false) > 0 + || ( s != NULL && ( s->name().tqcontains(searchString, false) > 0 + || s->exec().tqcontains(searchString, false) > 0 + || s->comment().tqcontains(searchString, false) > 0 + || s->genericName().tqcontains(searchString, false) > 0 + || s->exec().tqcontains(searchString, false) > 0 ) )) { setItemEnabled(id, true); foundSomething = true; @@ -951,7 +951,7 @@ void PanelServiceMenu::setSearchString(const TQString &searchString) /*for (int i=count()-1; i>=0; --i) { int id = idAt(i); TQString menuText = text(id); - if (menuText.contains(searchString, false) > 0) { + if (menuText.tqcontains(searchString, false) > 0) { setItemEnabled(id, true); foundSomething = true; nonemptyMenus.insert(id); @@ -995,7 +995,7 @@ void PanelServiceMenu::updateRecentlyUsedApps(KService::Ptr &service) TQString strItem(service->desktopEntryPath()); // don't add an item from root kmenu level - if (!strItem.contains('/')) + if (!strItem.tqcontains('/')) { return; } diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index 1e9025e5a..9d1305da3 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -110,7 +110,7 @@ KPanelApplet::Direction positionToDirection(KPanelExtension::Position p) } } -KPanelApplet::Direction arrowToDirection(Qt::ArrowType p) +KPanelApplet::Direction arrowToDirection(TQt::ArrowType p) { switch (p) { @@ -161,7 +161,7 @@ int maxButtonDim() int maxDim; //return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge; - KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); + KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" )); kickerconfig->setGroup("General"); maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);; delete kickerconfig; @@ -207,7 +207,7 @@ TQPopupMenu* reduceMenu(TQPopupMenu *menu) return menu; } - TQMenuItem *item = menu->findItem(menu->idAt(0)); + TQMenuItem *item = menu->tqfindItem(menu->idAt(0)); if (item->popup()) { @@ -236,13 +236,13 @@ TQPoint popupPosition(KPanelApplet::Direction d, { case KPanelApplet::Left: case KPanelApplet::Right: - r.setLeft( source->topLevelWidget()->x() ); - r.setWidth( source->topLevelWidget()->width() ); + r.setLeft( source->tqtopLevelWidget()->x() ); + r.setWidth( source->tqtopLevelWidget()->width() ); break; case KPanelApplet::Up: case KPanelApplet::Down: - r.setTop( source->topLevelWidget()->y() ); - r.setHeight( source->topLevelWidget()->height() ); + r.setTop( source->tqtopLevelWidget()->y() ); + r.setHeight( source->tqtopLevelWidget()->height() ); break; } } @@ -328,7 +328,7 @@ void colorize(TQImage& image) { KConfig *config = KGlobal::config(); config->setGroup("WM"); - TQColor color = TQApplication::palette().active().highlight(); + TQColor color = TQApplication::tqpalette().active().highlight(); TQColor activeTitle = config->readColorEntry("activeBackground", &color); TQColor inactiveTitle = config->readColorEntry("inactiveBackground", &color); @@ -336,7 +336,7 @@ void colorize(TQImage& image) int h1, s1, v1, h2, s2, v2, h3, s3, v3; activeTitle.hsv(&h1, &s1, &v1); inactiveTitle.hsv(&h2, &s2, &v2); - TQApplication::palette().active().background().hsv(&h3, &s3, &v3); + TQApplication::tqpalette().active().background().hsv(&h3, &s3, &v3); if ( (kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < kAbs(h2-h3)+kAbs(s2-s3)+kAbs(v2-v3)) && ((kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < 32) || (s1 < 32)) && (s2 > s1)) @@ -347,7 +347,7 @@ void colorize(TQImage& image) // limit max/min brightness int r, g, b; color.rgb(&r, &g, &b); - int gray = qGray(r, g, b); + int gray = tqGray(r, g, b); if (gray > 180) { r = (r - (gray - 180) < 0 ? 0 : r - (gray - 180)); g = (g - (gray - 180) < 0 ? 0 : g - (gray - 180)); @@ -437,12 +437,12 @@ TQIconSet menuIconSet(const TQString& icon) // make sure they are not larger than 20x20 if (normal.width() > 20 || normal.height() > 20) { - normal.convertFromImage(normal.convertToImage().smoothScale(20,20)); + normal.convertFromImage(TQImage(normal.convertToImage()).smoothScale(20,20)); } if (active.width() > 20 || active.height() > 20) { - active.convertFromImage(active.convertToImage().smoothScale(20,20)); + active.convertFromImage(TQImage(active.convertToImage()).smoothScale(20,20)); } iconset.setPixmap(normal, TQIconSet::Small, TQIconSet::Normal); diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h index 0a4677914..663987174 100644 --- a/kicker/libkicker/global.h +++ b/kicker/libkicker/global.h @@ -40,7 +40,7 @@ namespace KickerLib KDE_EXPORT KPanelExtension::Position directionToPosition(KPanelApplet::Direction d); KDE_EXPORT KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d); KDE_EXPORT KPanelApplet::Direction positionToDirection(KPanelExtension::Position p); -KDE_EXPORT KPanelApplet::Direction arrowToDirection(Qt::ArrowType p); +KDE_EXPORT KPanelApplet::Direction arrowToDirection(TQt::ArrowType p); KDE_EXPORT int sizeValue(KPanelExtension::Size s); /** diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg index 0f725c35f..75de298a3 100644 --- a/kicker/libkicker/kickerSettings.kcfg +++ b/kicker/libkicker/kickerSettings.kcfg @@ -64,7 +64,7 @@ - (QApplication::palette().active().mid()) + (TQApplication::tqpalette().active().mid()) This option sets the color to use when tinting transparent panels diff --git a/kicker/libkicker/kickerSettings.kcfgc b/kicker/libkicker/kickerSettings.kcfgc index 59c271928..8e0b42d93 100644 --- a/kicker/libkicker/kickerSettings.kcfgc +++ b/kicker/libkicker/kickerSettings.kcfgc @@ -3,6 +3,6 @@ Singleton=true ClassName=KickerSettings Mutators=true Visibility=KDE_EXPORT -IncludeFiles=qapplication.h +IncludeFiles=tqapplication.h GlobalEnums=true MemberVariables=dpointer diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index 586360904..69e0897f8 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -76,7 +76,7 @@ KickerTip::KickerTip(TQWidget * parent) m_timer(0, "KickerTip::m_timer"), m_frameTimer(0, "KickerTip::m_frameTimer") { - setFocusPolicy(NoFocus); + setFocusPolicy(TQ_NoFocus); setBackgroundMode(NoBackground); resize(0, 0); hide(); @@ -146,7 +146,7 @@ void KickerTip::display() delete m_richText; m_richText = new TQSimpleRichText("

    " + data.message + "

    " + - data.subtext + "

    ", font(), TQString::null, 0, + data.subtext + "

    ", font(), TQString(), 0, m_mimeFactory); m_richText->setWidth(640); m_direction = data.direction; @@ -308,7 +308,7 @@ void KickerTip::dissolveMask() if (m_dissolveSize > 0) { - maskPainter.setRasterOp(Qt::EraseROP); + maskPainter.setRasterOp(TQt::EraseROP); int x, y, s; const int size = 16; @@ -392,8 +392,8 @@ void KickerTip::displayInternal() // draw background TQPainter bufferPainter(&m_pixmap); - bufferPainter.setPen(colorGroup().foreground()); - bufferPainter.setBrush(colorGroup().background()); + bufferPainter.setPen(tqcolorGroup().foreground()); + bufferPainter.setBrush(tqcolorGroup().background()); //bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); drawRoundRect(bufferPainter, TQRect(0, 0, width, height)); @@ -409,13 +409,13 @@ void KickerTip::displayInternal() if (KickerSettings::mouseOversShowText()) { // draw text shadow - TQColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); cg.setColor(TQColorGroup::Text, cg.background().dark(115)); int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, TQRect(), cg); // draw text - cg = colorGroup(); + cg = tqcolorGroup(); m_richText->draw(&bufferPainter, textX, textY, rect(), cg); } } @@ -452,13 +452,13 @@ void KickerTip::tipperDestroyed(TQObject* o) { // we can't do a dynamic cast because we are in the process of dieing // so static it is. - untipFor(static_cast(o)); + untipFor(TQT_TQWIDGET(o)); } void KickerTip::internalUpdate() { m_dirty = true; - repaint(false); + tqrepaint(false); } void KickerTip::enableTipping(bool tip) @@ -508,7 +508,7 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) return false; } - TQWidget *widget = static_cast(object); + TQWidget *widget = TQT_TQWIDGET(object); switch (event->type()) { @@ -519,7 +519,7 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) } if (!mouseGrabber() && - !qApp->activePopupWidget() && + !tqApp->activePopupWidget() && !isTippingFor(widget)) { TQToolTip::setGloballyEnabled(false); diff --git a/kicker/libkicker/kickertip.h b/kicker/libkicker/kickertip.h index 14118029b..b7332967f 100644 --- a/kicker/libkicker/kickertip.h +++ b/kicker/libkicker/kickertip.h @@ -38,7 +38,7 @@ class TQPaintEvent; class TQSimpleRichText; class TQTimer; -class KDE_EXPORT KickerTip : public QWidget +class KDE_EXPORT KickerTip : public TQWidget { Q_OBJECT diff --git a/kicker/libkicker/kshadowengine.cpp b/kicker/libkicker/kshadowengine.cpp index 19ccc669d..a933026d5 100644 --- a/kicker/libkicker/kshadowengine.cpp +++ b/kicker/libkicker/kshadowengine.cpp @@ -78,7 +78,7 @@ TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgC /* * This is the source pixmap */ - TQImage img = textPixmap.convertToImage().convertDepth(32); + TQImage img = TQImage(textPixmap.convertToImage()).convertDepth(32); /* * Resize the image if necessary @@ -114,7 +114,7 @@ TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgC alphaShadow = (alphaShadow > m_shadowSettings->maxOpacity()) ? m_shadowSettings->maxOpacity() : alphaShadow; // update the shadow's i,j pixel. - result.setPixel(i,j, qRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow)); + result.setPixel(i,j, tqRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow)); } } return result; @@ -131,15 +131,15 @@ double KShadowEngine::defaultDecay(TQImage& source, int i, int j) return 0; double alphaShadow; - alphaShadow =(qGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR + - qGray(source.pixel(i-1,j )) * AXIS_FACTOR + - qGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR + - qGray(source.pixel(i ,j-1)) * AXIS_FACTOR + + alphaShadow =(tqGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR + + tqGray(source.pixel(i-1,j )) * AXIS_FACTOR + + tqGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR + + tqGray(source.pixel(i ,j-1)) * AXIS_FACTOR + 0 + - qGray(source.pixel(i ,j+1)) * AXIS_FACTOR + - qGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR + - qGray(source.pixel(i+1,j )) * AXIS_FACTOR + - qGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor(); + tqGray(source.pixel(i ,j+1)) * AXIS_FACTOR + + tqGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR + + tqGray(source.pixel(i+1,j )) * AXIS_FACTOR + + tqGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor(); return alphaShadow; } @@ -189,7 +189,7 @@ double KShadowEngine::noDecay(TQImage& source, int i, int j) else sy = j + m; - opacity += qGray(source.pixel(sx, sy)); + opacity += tqGray(source.pixel(sx, sy)); } } alphaShadow += opacity / m_shadowSettings->multiplicationFactor(); diff --git a/kicker/libkicker/kshadowengine.h b/kicker/libkicker/kshadowengine.h index 041e8faf6..0c44e1816 100644 --- a/kicker/libkicker/kshadowengine.h +++ b/kicker/libkicker/kshadowengine.h @@ -94,13 +94,13 @@ private: /* * a slower algorithm where the influence of a pixel - * is qGray(px)/(abs(dx) + abs(dy) +1). + * is tqGray(px)/(abs(dx) + abs(dy) +1). */ double doubleLinearDecay(TQImage& source, int x, int y); /* * a very slow algorithm where the influence of a pixel - * is qGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1). + * is tqGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1). */ double radialDecay(TQImage& source, int x, int y); diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp index 0c36ffea0..8d2e6acdb 100644 --- a/kicker/libkicker/menuinfo.cpp +++ b/kicker/libkicker/menuinfo.cpp @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. MenuInfo::MenuInfo(const TQString& desktopFile) { - KSimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile))); + KSimpleConfig df(locate("data", TQString::tqfromLatin1("kicker/menuext/%1").arg(desktopFile))); df.setGroup("Desktop Entry"); TQStringList list = df.readListEntry("X-KDE-AuthorizeAction"); @@ -64,5 +64,5 @@ KPanelMenu* MenuInfo::load(TQWidget *parent, const char *name) return KParts::ComponentFactory::createInstanceFromLibrary( TQFile::encodeName( library_ ), - parent, name ); + TQT_TQOBJECT(parent), name ); } diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index a04e9aee0..0edae6987 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -69,7 +69,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name ) m_arrowDirection(KPanelExtension::Bottom), m_popupDirection(KPanelApplet::Up), m_iconAlignment(AlignCenter), - m_orientation(Horizontal), + m_orientation(Qt::Horizontal), m_size((KIcon::StdSizes)-1), m_fontPercent(0.40) { @@ -190,7 +190,7 @@ void PanelButton::setPopupDirection(KPanelApplet::Direction d) setArrowDirection(KickerLib::directionToPopupPosition(d)); } -void PanelButton::setIconAlignment(AlignmentFlags align) +void PanelButton::setIconAlignment(TQ_Alignment align) { m_iconAlignment = align; update(); @@ -296,7 +296,7 @@ int PanelButton::widthForHeight(int height) const // we only paint the text when horizontal, so make sure we're horizontal // before adding the text in here - if (orientation() == Horizontal && !m_buttonText.isEmpty()) + if (orientation() == Qt::Horizontal && !m_buttonText.isEmpty()) { TQFont f(font()); //f.setPixelSize(KMIN(height, KMAX(int(float(height) * m_fontPercent), 16))); @@ -427,7 +427,7 @@ void PanelButton::enterEvent(TQEvent* e) if (!m_highlight) { m_highlight = true; - repaint(false); + tqrepaint(false); } TQButton::enterEvent(e); @@ -438,7 +438,7 @@ void PanelButton::leaveEvent(TQEvent* e) if (m_highlight) { m_highlight = false; - repaint(false); + tqrepaint(false); } TQButton::leaveEvent(e); @@ -471,7 +471,7 @@ void PanelButton::dropEvent(TQDropEvent* e) void PanelButton::mouseMoveEvent(TQMouseEvent *e) { - if (!m_isLeftMouseButtonDown || (e->state() & LeftButton) == 0) + if (!m_isLeftMouseButtonDown || (e->state() & Qt::LeftButton) == 0) { return; } @@ -489,7 +489,7 @@ void PanelButton::mouseMoveEvent(TQMouseEvent *e) void PanelButton::mousePressEvent(TQMouseEvent *e) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { m_lastLeftMouseButtonPress = e->pos(); m_isLeftMouseButtonDown = true; @@ -499,7 +499,7 @@ void PanelButton::mousePressEvent(TQMouseEvent *e) void PanelButton::mouseReleaseEvent(TQMouseEvent *e) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { m_isLeftMouseButtonDown = false; @@ -528,7 +528,7 @@ void PanelButton::drawButton(TQPainter *p) if (m_tileColor.isValid()) { p->fillRect(rect(), m_tileColor); - style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); + tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup()); } else if (paletteBackgroundPixmap()) { @@ -547,8 +547,8 @@ void PanelButton::drawButton(TQPainter *p) } else if (isDown() || isOn()) { - // Draw shapes to indicate the down state. - style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken); + // Draw tqshapes to indicate the down state. + tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup(), TQStyle::Style_Sunken); } drawButtonLabel(p); @@ -556,10 +556,10 @@ void PanelButton::drawButton(TQPainter *p) if (hasFocus() || m_hasAcceptedDrag) { int x1, y1, x2, y2; - rect().coords(&x1, &y1, &x2, &y2); + TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); - style().drawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), - TQStyle::Style_Default, colorGroup().button()); + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(), + TQStyle::Style_Default, tqcolorGroup().button()); } } @@ -570,7 +570,7 @@ void PanelButton::drawButtonLabel(TQPainter *p) if (active) { - icon = icon.convertToImage().smoothScale(icon.width() - 2, + icon = TQImage(icon.convertToImage()).smoothScale(icon.width() - 2, icon.height() - 2); } @@ -580,7 +580,7 @@ void PanelButton::drawButtonLabel(TQPainter *p) else if (m_iconAlignment & AlignBottom) y = (height() - icon.height()); - if (!m_buttonText.isEmpty() && orientation() == Horizontal) + if (!m_buttonText.isEmpty() && orientation() == Qt::Horizontal) { int h = height(); int w = width(); @@ -663,7 +663,7 @@ void PanelButton::drawButtonLabel(TQPainter *p) if (m_drawArrow && (m_highlight || active)) { TQStyle::PrimitiveElement e = TQStyle::PE_ArrowUp; - int arrowSize = style().pixelMetric(TQStyle::PM_MenuButtonIndicator); + int arrowSize = tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator); TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize); switch (m_arrowDirection) @@ -684,7 +684,7 @@ void PanelButton::drawButtonLabel(TQPainter *p) r = TQRect(0, (height() - arrowSize)/2, arrowSize, arrowSize); break; case KPanelExtension::Floating: - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { e = TQStyle::PE_ArrowDown; r.moveBy(0, height() - arrowSize); @@ -707,7 +707,7 @@ void PanelButton::drawButtonLabel(TQPainter *p) { flags |= TQStyle::Style_Down; } - style().drawPrimitive(e, p, r, colorGroup(), flags); + tqstyle().tqdrawPrimitive(e, p, r, tqcolorGroup(), flags); } } @@ -730,7 +730,7 @@ int PanelButton::preferredIconSize(int proposed_size) const if (proposed_size < 0) { - proposed_size = (orientation() == Horizontal) ? height() : width(); + proposed_size = (orientation() == Qt::Horizontal) ? height() : width(); } // determine the upper limit on the size. Normally, this is panelSize, @@ -922,8 +922,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) { if (e->type() == TQEvent::MouseMove) { - TQMouseEvent *me = static_cast(e); - if (rect().contains(mapFromGlobal(me->globalPos())) && + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + if (TQT_TQRECT_OBJECT(rect()).tqcontains(mapFromGlobal(me->globalPos())) && ((me->state() & ControlButton) != 0 || (me->state() & ShiftButton) != 0)) { @@ -934,8 +934,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) else if (e->type() == TQEvent::MouseButtonPress || e->type() == TQEvent::MouseButtonDblClick) { - TQMouseEvent *me = static_cast(e); - if (rect().contains(mapFromGlobal(me->globalPos()))) + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + if (TQT_TQRECT_OBJECT(rect()).tqcontains(mapFromGlobal(me->globalPos()))) { m_pressedDuringPopup = true; return true; @@ -943,8 +943,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) } else if (e->type() == TQEvent::MouseButtonRelease) { - TQMouseEvent *me = static_cast(e); - if (rect().contains(mapFromGlobal(me->globalPos()))) + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + if (TQT_TQRECT_OBJECT(rect()).tqcontains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup) { diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h index 770d0e1be..ff0f5f2a8 100644 --- a/kicker/libkicker/panelbutton.h +++ b/kicker/libkicker/panelbutton.h @@ -258,7 +258,7 @@ public slots: protected: - void setIconAlignment(AlignmentFlags align); + void setIconAlignment(TQ_Alignment align); /** * Subclasses must implement this to define the name of the button which is * used to identify this button for saving and loading. It must be unique @@ -393,7 +393,7 @@ private: TQPixmap m_iconz; // mouse over KPanelExtension::Position m_arrowDirection; KPanelApplet::Direction m_popupDirection; - AlignmentFlags m_iconAlignment; + TQ_Alignment m_iconAlignment; Orientation m_orientation; int m_size; double m_fontPercent; diff --git a/kicker/libkicker/paneldrag.cpp b/kicker/libkicker/paneldrag.cpp index 1fb6b9ce6..28721d3f7 100644 --- a/kicker/libkicker/paneldrag.cpp +++ b/kicker/libkicker/paneldrag.cpp @@ -46,7 +46,7 @@ PanelDrag::~PanelDrag() bool PanelDrag::decode(const TQMimeSource* e, BaseContainer** container) { - TQByteArray a = e->encodedData("application/basecontainerptr"); + TQByteArray a = e->tqencodedData("application/basecontainerptr"); if (a.size() != PANELDRAG_BUFSIZE) { @@ -73,7 +73,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e) return false; } - TQByteArray a = e->encodedData("application/basecontainerptr"); + TQByteArray a = e->tqencodedData("application/basecontainerptr"); if (a.size() != PANELDRAG_BUFSIZE) { return false; @@ -91,7 +91,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e) return true; } -TQByteArray PanelDrag::encodedData(const char * mimeType) const +TQByteArray PanelDrag::tqencodedData(const char * mimeType) const { if (TQString("application/basecontainerptr") == mimeType && a.size() == PANELDRAG_BUFSIZE) @@ -136,7 +136,7 @@ const char * AppletInfoDrag::format(int i) const return 0; } -TQByteArray AppletInfoDrag::encodedData(const char* mimeType) const +TQByteArray AppletInfoDrag::tqencodedData(const char* mimeType) const { if (TQString("application/appletinfo") == mimeType) { @@ -158,7 +158,7 @@ bool AppletInfoDrag::canDecode(const TQMimeSource * e) bool AppletInfoDrag::decode(const TQMimeSource* e, AppletInfo& container) { - TQByteArray a = e->encodedData("application/appletinfo"); + TQByteArray a = e->tqencodedData("application/appletinfo"); if (a.isEmpty()) { diff --git a/kicker/libkicker/paneldrag.h b/kicker/libkicker/paneldrag.h index 3d7cbf858..7388f4dbc 100644 --- a/kicker/libkicker/paneldrag.h +++ b/kicker/libkicker/paneldrag.h @@ -32,14 +32,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class BaseContainer; -class KDE_EXPORT PanelDrag : public QDragObject +class KDE_EXPORT PanelDrag : public TQDragObject { public: PanelDrag(BaseContainer* container, TQWidget *dragSource); ~PanelDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray encodedData(const char *) const; + virtual TQByteArray tqencodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, BaseContainer** container); @@ -48,14 +48,14 @@ class KDE_EXPORT PanelDrag : public QDragObject TQByteArray a; }; -class KDE_EXPORT AppletInfoDrag : public QDragObject +class KDE_EXPORT AppletInfoDrag : public TQDragObject { public: AppletInfoDrag(const AppletInfo& container, TQWidget *dragSource); ~AppletInfoDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray encodedData(const char *) const; + virtual TQByteArray tqencodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, AppletInfo& container); diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp index 7d11a429e..1dc592bbd 100644 --- a/kicker/libkicker/panner.cpp +++ b/kicker/libkicker/panner.cpp @@ -57,7 +57,7 @@ Panner::Panner( TQWidget* parent, const char* name ) // layout _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight); _layout->addWidget(_clipper, 1); - setOrientation(Horizontal); + setOrientation(Qt::Horizontal); } Panner::~Panner() @@ -97,14 +97,14 @@ void Panner::createScrollButtons() void Panner::setupButtons() { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { if (_luSB) { _luSB->setArrowType(Qt::LeftArrow); _rdSB->setArrowType(Qt::RightArrow); - _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + _rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); TQToolTip::add(_luSB, i18n("Scroll left")); TQToolTip::add(_rdSB, i18n("Scroll right")); setMinimumSize(24, 0); @@ -117,8 +117,8 @@ void Panner::setupButtons() { _luSB->setArrowType(Qt::UpArrow); _rdSB->setArrowType(Qt::DownArrow); - _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); - _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + _rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); TQToolTip::add(_luSB, i18n("Scroll up")); TQToolTip::add(_rdSB, i18n("Scroll down")); setMinimumSize(0, 24); @@ -149,7 +149,7 @@ void Panner::resizeEvent( TQResizeEvent* ) void Panner::scrollRightDown() { - if(orientation() == Horizontal) // scroll right + if(orientation() == Qt::Horizontal) // scroll right scrollBy( _step, 0 ); else // scroll down scrollBy( 0, _step ); @@ -159,7 +159,7 @@ void Panner::scrollRightDown() void Panner::scrollLeftUp() { - if(orientation() == Horizontal) // scroll left + if(orientation() == Qt::Horizontal) // scroll left scrollBy( -_step, 0 ); else // scroll up scrollBy( 0, -_step ); @@ -197,7 +197,7 @@ void Panner::reallyUpdateScrollButtons() _updateScrollButtonsTimer->stop(); - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { delta = contentsWidth() - width(); } @@ -336,7 +336,7 @@ void Panner::ensureVisible( int x, int y, int xmargin, int ymargin ) bool Panner::eventFilter( TQObject *obj, TQEvent *e ) { - if ( obj == _viewport || obj == _clipper ) + if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_viewport) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_clipper) ) { switch ( e->type() ) { diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h index 66ce6cd18..2f09d76f1 100644 --- a/kicker/libkicker/panner.h +++ b/kicker/libkicker/panner.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class TQBoxLayout; class TQTimer; -class KDE_EXPORT Panner : public QWidget +class KDE_EXPORT Panner : public TQWidget { Q_OBJECT @@ -39,10 +39,10 @@ public: Panner( TQWidget* parent, const char* name = 0 ); ~Panner(); - TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); } + TQSize tqminimumSizeHint() const { return TQWidget::tqminimumSizeHint(); } Qt::Orientation orientation() const { return _orient; } - virtual void setOrientation(Orientation orientation); + virtual void setOrientation(Qt::Orientation orientation); TQWidget *viewport() const { return _viewport; } @@ -59,8 +59,8 @@ public: void contentsToViewport( int x, int y, int& vx, int& vy ) const; void viewportToContents( int vx, int vy, int& x, int& y ) const; - QPoint contentsToViewport( const TQPoint& ) const; - QPoint viewportToContents( const TQPoint& ) const; + TQPoint contentsToViewport( const TQPoint& ) const; + TQPoint viewportToContents( const TQPoint& ) const; void addChild(TQWidget *child) { child->show(); } void removeChild(TQWidget *child) { child->hide(); } diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index 4c28b2101..aafbc4316 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -65,22 +65,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation) update(); } -TQSize SimpleButton::sizeHint() const +TQSize SimpleButton::tqsizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::sizeHint(); + return TQButton::tqsizeHint(); else return TQSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN); } -TQSize SimpleButton::minimumSizeHint() const +TQSize SimpleButton::tqminimumSizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::minimumSizeHint(); + return TQButton::tqminimumSizeHint(); else return TQSize(pm->width(), pm->height()); } @@ -101,7 +101,7 @@ void SimpleButton::drawButtonLabel( TQPainter *p ) if (isOn() || isDown()) { - pix = pix.convertToImage().smoothScale(pix.width() - 2, + pix = TQImage(pix.convertToImage()).smoothScale(pix.width() - 2, pix.height() - 2); } @@ -176,7 +176,7 @@ void SimpleButton::enterEvent( TQEvent *e ) { m_highlight = true; - repaint( false ); + tqrepaint( false ); TQButton::enterEvent( e ); } @@ -184,7 +184,7 @@ void SimpleButton::leaveEvent( TQEvent *e ) { m_highlight = false; - repaint( false ); + tqrepaint( false ); TQButton::enterEvent( e ); } @@ -202,7 +202,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, cons _inside = false; } -TQSize SimpleArrowButton::sizeHint() const +TQSize SimpleArrowButton::tqsizeHint() const { return TQSize( 12, 12 ); } @@ -236,7 +236,7 @@ void SimpleArrowButton::drawButton( TQPainter *p ) int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - style().drawPrimitive(pe, p, r, colorGroup(), flags); + tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags); } void SimpleArrowButton::enterEvent( TQEvent *e ) diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h index 1ea5c7a44..e6416236f 100644 --- a/kicker/libkicker/simplebutton.h +++ b/kicker/libkicker/simplebutton.h @@ -26,7 +26,7 @@ #include -class KDE_EXPORT SimpleButton : public QButton +class KDE_EXPORT SimpleButton : public TQButton { Q_OBJECT @@ -34,8 +34,8 @@ class KDE_EXPORT SimpleButton : public QButton SimpleButton(TQWidget *parent, const char *name = 0); void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; protected: void drawButton( TQPainter *p ); @@ -67,7 +67,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton public: SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: virtual void enterEvent( TQEvent *e ); diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp index 584a345aa..860f6d04a 100644 --- a/kicker/menuext/kate/katesessionmenu.cpp +++ b/kicker/menuext/kate/katesessionmenu.cpp @@ -112,7 +112,7 @@ void KateSessionMenu::slotExec( int id ) TQString name = KInputDialog::getText( i18n("Session Name"), i18n("Please enter a name for the new session"), TQString::null, - &ok, 0, 0, new Validator( m_parent ) ); + &ok, 0, 0, new Validator( TQT_TQOBJECT(m_parent) ) ); if ( ! ok ) return; @@ -124,7 +124,7 @@ void KateSessionMenu::slotExec( int id ) "kate_session_button_create_anonymous" ) == KMessageBox::No ) return; - if ( m_sessions.contains( name ) && + if ( m_sessions.tqcontains( name ) && KMessageBox::warningYesNo( 0, i18n("You allready have a session named %1. Do you want to open that session?").arg( name ), i18n("Session exists") ) == KMessageBox::No ) diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index afd1127f6..be060b75c 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -185,7 +185,7 @@ void KonsoleMenu::initialize() screenList.append(TQFile::decodeName(entry->d_name)); insertItem(SmallIconSet("konsole"), i18n("Screen is a program controlling screens!", - "Screen at %1").arg(entry->d_name), id); + "Screen at %1").tqarg(entry->d_name), id); id++; } } diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp index 46967b54c..58417e9f4 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp +++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp @@ -84,7 +84,7 @@ void KonsoleBookmarkHandler::slotNewBookmark( const TQString& /*text*/, { *m_importStream << "\n"; - *m_importStream << "" << (additionalInfo.isEmpty() ? TQString::fromUtf8(url) : additionalInfo) << "\n\n"; + *m_importStream << "" << (additionalInfo.isEmpty() ? TQString(TQString::fromUtf8(url)) : additionalInfo) << "\n\n"; } void KonsoleBookmarkHandler::slotNewFolder( const TQString& text, bool /*open*/, diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp index 1a31fe55c..b53899a89 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp +++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp @@ -112,7 +112,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() bm = parentBookmark.next(bm) ) { TQString text = bm.text(); - text.replace( '&', "&&" ); + text.tqreplace( '&', "&&" ); if ( !separatorInserted && m_bIsRoot) { // inserted before the first konq bookmark, to avoid the separator if no konq bookmark m_parentMenu->insertSeparator(); separatorInserted = true; @@ -168,7 +168,7 @@ void KonsoleBookmarkMenu::slotBookmarkSelected() if ( !m_pOwner ) return; // this view doesn't handle bookmarks... a = (KAction*)sender(); b = a->text(); - m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */ + m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */ ( (KAction *)sender() )->text() /* Title */ ); } @@ -177,7 +177,7 @@ void KonsoleBookmarkMenu::slotNSBookmarkSelected() KAction *a; TQString b; - TQString link(sender()->name()+8); + TQString link(TQT_TQOBJECT_CONST(sender())->name()+8); a = (KAction*)sender(); b = a->text(); m_kOwner->openBookmarkURL( link, /*URL */ diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index 0c072e026..936d8a536 100644 --- a/kicker/menuext/prefmenu/prefmenu.cpp +++ b/kicker/menuext/prefmenu/prefmenu.cpp @@ -84,7 +84,7 @@ void PrefMenu::insertMenuItem(KService::Ptr& s, if (KickerSettings::menuEntryFormat() == KickerSettings::NameAndDescription) { if (!suppressGenericNames || - !suppressGenericNames->contains(s->untranslatedGenericName())) + !suppressGenericNames->tqcontains(s->untranslatedGenericName())) { serviceName = TQString("%1 (%2)").arg(serviceName).arg(comment); } @@ -120,7 +120,7 @@ void PrefMenu::insertMenuItem(KService::Ptr& s, // item names may contain ampersands. To avoid them being converted // to accelerators, replace them with two ampersands. - serviceName.replace("&", "&&"); + serviceName.tqreplace("&", "&&"); int newId = insertItem(KickerLib::menuIconSet(s->icon()), serviceName, nId, nIndex); m_entryMap.insert(newId, static_cast(s)); @@ -136,7 +136,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev) { KPanelMenu::mouseMoveEvent(ev); - if ((ev->state() & LeftButton) != LeftButton) + if ((ev->state() & Qt::LeftButton) != Qt::LeftButton) { return; } @@ -155,7 +155,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev) return; } - if (!m_entryMap.contains(id)) + if (!m_entryMap.tqcontains(id)) { kdDebug(1210) << "Cannot find service with menu id " << id << endl; return; @@ -224,7 +224,7 @@ void PrefMenu::dragEnterEvent(TQDragEnterEvent *event) void PrefMenu::dragLeaveEvent(TQDragLeaveEvent */*event*/) { // see PrefMenu::dragEnterEvent why this is nescessary - if (!frameGeometry().contains(TQCursor::pos())) + if (!TQT_TQRECT_OBJECT(frameGeometry()).tqcontains(TQCursor::pos())) { KURLDrag::setTarget(0); } @@ -297,7 +297,7 @@ void PrefMenu::initialize() // Item names may contain ampersands. To avoid them being converted // to accelerators, replace each ampersand with two ampersands. - groupCaption.replace("&", "&&"); + groupCaption.tqreplace("&", "&&"); PrefMenu* m = new PrefMenu(g->name(), g->relPath(), this); m->setCaption(groupCaption); @@ -323,7 +323,7 @@ void PrefMenu::initialize() void PrefMenu::slotExec(int id) { - if (!m_entryMap.contains(id)) + if (!m_entryMap.tqcontains(id)) { return; } diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp index b8c3c6d81..381ce3fa9 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.cpp +++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp @@ -72,17 +72,17 @@ void RecentDocsMenu::initialize() { // Make sure this entry is not already present in the menu alreadyPresentInMenu = 0; for ( TQStringList::Iterator previt = previousEntries.begin(); previt != previousEntries.end(); ++previt ) { - if (TQString::localeAwareCompare(*previt, f.readName().replace('&', TQString::fromAscii("&&") )) == 0) { + if (TQString::localeAwareCompare(*previt, f.readName().tqreplace('&', TQString::fromAscii("&&") )) == 0) { alreadyPresentInMenu = 1; } } if (alreadyPresentInMenu == 0) { // Add item to menu - insertItem(SmallIconSet(f.readIcon()), f.readName().replace('&', TQString::fromAscii("&&") ), id++); + insertItem(SmallIconSet(f.readIcon()), f.readName().tqreplace('&', TQString::fromAscii("&&") ), id++); // Append to duplicate checking list - previousEntries.append(f.readName().replace('&', TQString::fromAscii("&&") )); + previousEntries.append(f.readName().tqreplace('&', TQString::fromAscii("&&") )); } } @@ -111,10 +111,10 @@ void RecentDocsMenu::mousePressEvent(TQMouseEvent* e) { void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) { KPanelMenu::mouseMoveEvent(e); - if (!(e->state() & LeftButton)) + if (!(e->state() & Qt::LeftButton)) return; - if (!rect().contains(_mouseDown)) + if (!TQT_TQRECT_OBJECT(rect()).tqcontains(_mouseDown)) return; int dragLength = (e->pos() - _mouseDown).manhattanLength(); diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp index c09f9a825..3547e3f9b 100644 --- a/kicker/menuext/remote/remotemenu.cpp +++ b/kicker/menuext/remote/remotemenu.cpp @@ -93,7 +93,7 @@ void RemoteMenu::initialize() for(; name!=endf; ++name) { - if (!names_found.contains(*name)) + if (!names_found.tqcontains(*name)) { names_found.append(*name); TQString filename = *dirpath+*name; @@ -124,7 +124,7 @@ void RemoteMenu::openRemoteDir() void RemoteMenu::slotExec(int id) { - if (m_desktopMap.contains(id)) + if (m_desktopMap.tqcontains(id)) { new KRun(m_desktopMap[id]); } diff --git a/kicker/menuext/system/systemmenu.cpp b/kicker/menuext/system/systemmenu.cpp index 12ec087d8..33eba2558 100644 --- a/kicker/menuext/system/systemmenu.cpp +++ b/kicker/menuext/system/systemmenu.cpp @@ -77,7 +77,7 @@ void SystemMenu::initialize() void SystemMenu::slotExec(int id) { - if(!m_urlMap.contains(id)) return; + if(!m_urlMap.tqcontains(id)) return; new KRun(m_urlMap[id]); // will delete itself } diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index 3a4ebf4ed..3bd5e0a80 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -109,7 +109,7 @@ class runMenuWidget : public TQWidget, public QMenuItem l2->setBuddy(this); runLayout->addWidget(l2);*/ m_runEdit = new KHistoryCombo(this); - m_runEdit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); + m_runEdit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); runLayout->addWidget(m_runEdit, 10); runLayout->addSpacing(KDialog::spacingHint()); @@ -143,7 +143,7 @@ class runMenuWidget : public TQWidget, public QMenuItem TQPainter p(this); TQRect r(rect()); // ew, nasty hack. may result in coredumps due to horrid C-style cast??? - kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, + kapp->style().tqdrawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, TQStyleOption(static_cast(this), 0, KIcon::SizeMedium )); p.drawPixmap(KDialog::spacingHint(), 1, icon); p.drawText((KDialog::spacingHint() * 2) + KIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:")); @@ -239,7 +239,7 @@ void TOM::initializeRecentDocs() KDesktopFile f(*it, true /* read only */); m_recentDocsMenu->insertItem(DesktopIcon(f.readIcon(), KIcon::SizeMedium), - f.readName().replace('&', "&&"), id); + f.readName().tqreplace('&', "&&"), id); ++id; } } @@ -302,7 +302,7 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu) TQString name = config.readEntry("Name"); // in case the name contains an ampersand, double 'em up - name.replace("&", "&&"); + name.tqreplace("&", "&&"); TQString desktopfile = config.readPathEntry("DesktopFile"); KService::Ptr pService = KService::serviceByDesktopPath(desktopfile); @@ -551,10 +551,10 @@ void TOM::initialize() if (userInfo) { username = TQString::fromLocal8Bit(userInfo->pw_gecos); - if (username.find(',') != -1) + if (username.tqfind(',') != -1) { // Remove everything from and including first comma - username.truncate(username.find(',')); + username.truncate(username.tqfind(',')); } if (username.isEmpty()) @@ -583,7 +583,7 @@ void TOM::contextualizeRMBmenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxM ctxMenu->removeItem(contextMenuTitleID); TQString text = menu->text(menuItem); - int parens = text.find('(') - 1; + int parens = text.tqfind('(') - 1; if (parens > 0) { text = text.left(parens); @@ -655,7 +655,7 @@ bool TOM::loadSidePixmap() // limit max/min brightness int r, g, b; color.rgb(&r, &g, &b); - int gray = qGray(r, g, b); + int gray = tqGray(r, g, b); if (gray > 180) { r = (r - (gray - 180) < 0 ? 0 : r - (gray - 180)); g = (g - (gray - 180) < 0 ? 0 : g - (gray - 180)); @@ -736,13 +736,13 @@ void TOM::setMaximumSize(int w, int h) TQRect TOM::sideImageRect() { - return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), m_sidePixmap.width(), + return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), m_sidePixmap.width(), height() - 2*frameWidth() ), this ); } void TOM::resizeEvent(TQResizeEvent * e) { - setFrameRect( TQStyle::visualRect( TQRect( m_sidePixmap.width(), 0, + setFrameRect( TQStyle::tqvisualRect( TQRect( m_sidePixmap.width(), 0, width() - m_sidePixmap.width(), height() ), this ) ); } @@ -757,7 +757,7 @@ void TOM::paintEvent(TQPaintEvent * e) style().drawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), - colorGroup(), TQStyle::Style_Default, + tqcolorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); TQRect r = sideImageRect(); @@ -775,7 +775,7 @@ TQMouseEvent TOM::translateMouseEvent( TQMouseEvent* e ) { TQRect side = sideImageRect(); - if ( !side.contains( e->pos() ) ) + if ( !side.tqcontains( e->pos() ) ) return *e; TQPoint newpos( e->pos() ); @@ -824,7 +824,7 @@ void TOM::runCommand() void TOM::runTask(int id) { - if (!m_tasks.contains(id)) return; + if (!m_tasks.tqcontains(id)) return; kapp->propagateSessionManager(); KApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(), diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index 0501fcd9a..312c78f97 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -134,7 +134,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name) exit(0); } - if (!kapp->dcopClient()->registerAs("applet_proxy", true)) { + if (kapp->dcopClient()->registerAs("applet_proxy", true) == 0) { kdError() << "Failed to register at DCOP server." << endl; KMessageBox::error(0, i18n("The applet proxy could not be started due to DCOP registration problems."), @@ -226,24 +226,24 @@ KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info) return init_ptr(0, info.configFile()); } -void AppletProxy::repaintApplet(TQWidget* widget) +void AppletProxy::tqrepaintApplet(TQWidget* widget) { - widget->repaint(); + widget->tqrepaint(); - const TQObjectList* children = widget->children(); + const TQObjectList children = widget->childrenListObject(); - if (!children) + if (children.isEmpty()) { return; } - TQObjectList::iterator it = children->begin(); - for (; it != children->end(); ++it) + TQObjectList::iterator it = children.begin(); + for (; it != children.end(); ++it) { TQWidget *w = dynamic_cast(*it); if (w) { - repaintApplet(w); + tqrepaintApplet(w); } } } @@ -372,14 +372,14 @@ bool AppletProxy::process(const TQCString &fun, const TQByteArray &data, } return true; } - else if ( fun == "setAlignment(int)" ) + else if ( fun == "tqsetAlignment(int)" ) { TQDataStream dataStream( data, IO_ReadOnly ); - int alignment; - dataStream >> alignment; + int tqalignment; + dataStream >> tqalignment; if(_applet) { - _applet->setAlignment( (KPanelApplet::Alignment)alignment ); + _applet->tqsetAlignment( (KPanelApplet::Alignment)tqalignment ); } return true; } @@ -435,13 +435,13 @@ bool AppletProxy::process(const TQCString &fun, const TQByteArray &data, if(_applet) if ( _bg.isNull() ) { // no transparency _applet->unsetPalette(); - _applet->repaint(); + _applet->tqrepaint(); } else { //transparency _applet->blockSignals(true); - _applet->setBackgroundMode(Qt::FixedPixmap); + _applet->setBackgroundMode(TQt::FixedPixmap); _applet->setPaletteBackgroundPixmap(_bg); - repaintApplet(_applet); + tqrepaintApplet(_applet); _applet->blockSignals(false); } return true; diff --git a/kicker/proxy/appletproxy.h b/kicker/proxy/appletproxy.h index 4c504022f..40ff78cc4 100644 --- a/kicker/proxy/appletproxy.h +++ b/kicker/proxy/appletproxy.h @@ -56,7 +56,7 @@ protected slots: void slotApplicationRemoved(const TQCString&); private: - void repaintApplet(TQWidget* widget); + void tqrepaintApplet(TQWidget* widget); AppletInfo *_info; KPanelApplet *_applet; diff --git a/kicker/proxy/extensiondebugger.h b/kicker/proxy/extensiondebugger.h index 87ac76ecb..0f4719b9f 100644 --- a/kicker/proxy/extensiondebugger.h +++ b/kicker/proxy/extensiondebugger.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class AppletInfo; class KPanelExtension; -class ExtensionContainer : public QWidget +class ExtensionContainer : public TQWidget { Q_OBJECT diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 3d931c95b..d4b4d67d6 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -113,7 +113,7 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name) exit(0); } - if (!kapp->dcopClient()->registerAs("extension_proxy", true)) { + if (kapp->dcopClient()->registerAs("extension_proxy", true) == 0) { kdError() << "Failed to register at DCOP server." << endl; exit(0); } @@ -258,7 +258,7 @@ void ExtensionProxy::dock(const TQCString& callbackID) bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData) { - if ( fun == "sizeHint(int,TQSize)" ) + if ( fun == "tqsizeHint(int,TQSize)" ) { TQDataStream dataStream( data, IO_ReadOnly ); int pos; @@ -272,7 +272,7 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, if(!_extension) reply << maxSize; else - reply << _extension->sizeHint((KPanelExtension::Position)pos, maxSize); + reply << _extension->tqsizeHint((KPanelExtension::Position)pos, maxSize); return true; } @@ -287,14 +287,14 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, } return true; } - else if ( fun == "setAlignment(int)" ) + else if ( fun == "tqsetAlignment(int)" ) { TQDataStream dataStream( data, IO_ReadOnly ); - int alignment; - dataStream >> alignment; + int tqalignment; + dataStream >> tqalignment; if(_extension) { - _extension->setAlignment( (KPanelExtension::Alignment)alignment ); + _extension->tqsetAlignment( (KPanelExtension::Alignment)tqalignment ); } return true; } diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index 808408fc9..b2159c196 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -66,7 +66,7 @@ TaskBar::TaskBar( TQWidget *parent, const char *name ) blocklayout = true; // init - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); // setup animation frames for (int i = 1; i < 11; i++) @@ -117,7 +117,7 @@ TaskBar::TaskBar( TQWidget *parent, const char *name ) blocklayout = false; connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - keys = new KGlobalAccel( this ); + keys = new KGlobalAccel( TQT_TQOBJECT(this) ); #include "taskbarbindings.cpp" keys->readSettings(); keys->updateConnections(); @@ -160,7 +160,7 @@ KTextShadowEngine *TaskBar::textShadowEngine() } -TQSize TaskBar::sizeHint() const +TQSize TaskBar::tqsizeHint() const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest @@ -171,7 +171,7 @@ TQSize TaskBar::sizeHint() const return TQSize(BUTTON_MIN_WIDTH, minButtonHeight); } -TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const +TQSize TaskBar::tqsizeHint( KPanelExtension::Position p, TQSize maxSize) const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest @@ -358,7 +358,7 @@ void TaskBar::add(Startup::Ptr startup) it != containers.end(); ++it) { - if ((*it)->contains(startup)) + if ((*it)->tqcontains(startup)) { return; } @@ -372,7 +372,7 @@ void TaskBar::add(Startup::Ptr startup) void TaskBar::showTaskContainer(TaskContainer* container) { - TaskContainer::List::iterator it = m_hiddenContainers.find(container); + TaskContainer::List::iterator it = m_hiddenContainers.tqfind(container); if (it != m_hiddenContainers.end()) { m_hiddenContainers.erase(it); @@ -432,7 +432,7 @@ void TaskBar::remove(Task::Ptr task, TaskContainer* container) it != m_hiddenContainers.end(); ++it) { - if ((*it)->contains(task)) + if ((*it)->tqcontains(task)) { (*it)->finish(); m_deletableContainers.append(*it); @@ -447,7 +447,7 @@ void TaskBar::remove(Task::Ptr task, TaskContainer* container) it != containers.end(); ++it) { - if ((*it)->contains(task)) + if ((*it)->tqcontains(task)) { container = *it; break; @@ -464,7 +464,7 @@ void TaskBar::remove(Task::Ptr task, TaskContainer* container) if (container->isEmpty()) { - TaskContainer::List::iterator it = containers.find(container); + TaskContainer::List::iterator it = containers.tqfind(container); if (it != containers.end()) { containers.erase(it); @@ -490,7 +490,7 @@ void TaskBar::remove(Startup::Ptr startup, TaskContainer* container) it != m_hiddenContainers.end(); ++it) { - if ((*it)->contains(startup)) + if ((*it)->tqcontains(startup)) { (*it)->remove(startup); @@ -511,7 +511,7 @@ void TaskBar::remove(Startup::Ptr startup, TaskContainer* container) it != containers.end(); ++it) { - if ((*it)->contains(startup)) + if ((*it)->tqcontains(startup)) { container = *it; break; @@ -530,7 +530,7 @@ void TaskBar::remove(Startup::Ptr startup, TaskContainer* container) return; } - TaskContainer::List::iterator it = containers.find(container); + TaskContainer::List::iterator it = containers.tqfind(container); if (it != containers.end()) { containers.erase(it); @@ -580,7 +580,7 @@ void TaskBar::windowChanged(Task::Ptr task) { TaskContainer* c = *it; - if (c->contains(task)) + if (c->tqcontains(task)) { container = c; break; @@ -620,7 +620,7 @@ void TaskBar::windowChangedGeometry(Task::Ptr task) ++it) { TaskContainer* c = *it; - if (c->contains(task)) + if (c->tqcontains(task)) { container = c; break; @@ -701,7 +701,7 @@ void TaskBar::reLayout() fm.height() : TaskBarSettings::minimumButtonHeight(); // horizontal layout - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { int bwidth = BUTTON_MIN_WIDTH; int rows = contentsRect().height() / minButtonHeight; @@ -818,12 +818,12 @@ void TaskBar::reLayout() void TaskBar::setViewportBackground() { - const TQPixmap *bg = parentWidget()->backgroundPixmap(); + const TQPixmap *bg = tqparentWidget()->backgroundPixmap(); if (bg) { - TQPixmap pm(parentWidget()->size()); - pm.fill(parentWidget(), pos() + viewport()->pos()); + TQPixmap pm(tqparentWidget()->size()); + pm.fill(tqparentWidget(), pos() + viewport()->pos()); viewport()->setPaletteBackgroundPixmap(pm); viewport()->setBackgroundOrigin(WidgetOrigin); } @@ -846,7 +846,7 @@ void TaskBar::setBackground() } } -void TaskBar::setArrowType(Qt::ArrowType at) +void TaskBar::setArrowType(TQt::ArrowType at) { if (arrowType == at) { @@ -898,9 +898,9 @@ void TaskBar::propagateMouseEvent( TQMouseEvent* e ) { if ( !isTopLevel() ) { - TQMouseEvent me( e->type(), mapTo( topLevelWidget(), e->pos() ), + TQMouseEvent me( e->type(), mapTo( tqtopLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); - TQApplication::sendEvent( topLevelWidget(), &me ); + TQApplication::sendEvent( tqtopLevelWidget(), &me ); } } @@ -960,7 +960,7 @@ int TaskBar::maximumButtonsWithoutShrinking() const rows = 1; } - if ( orientation() == Horizontal ) { + if ( orientation() == Qt::Horizontal ) { // maxWidth of 0 means no max width, drop back to default int maxWidth = TaskBarSettings::maximumButtonWidth(); if (maxWidth == 0) diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h index ff160bc92..40b02b6ea 100644 --- a/kicker/taskbar/taskbar.h +++ b/kicker/taskbar/taskbar.h @@ -47,11 +47,11 @@ public: TaskBar( TQWidget *parent = 0, const char *name = 0 ); ~TaskBar(); - TQSize sizeHint() const; - TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const; + TQSize tqsizeHint() const; + TQSize tqsizeHint( KPanelExtension::Position, TQSize maxSize ) const; void setOrientation( Orientation ); - void setArrowType( Qt::ArrowType at ); + void setArrowType( TQt::ArrowType at ); int containerCount() const; int taskCount() const; diff --git a/kicker/taskbar/taskbarbindings.cpp b/kicker/taskbar/taskbarbindings.cpp index c457d3623..364faac97 100644 --- a/kicker/taskbar/taskbarbindings.cpp +++ b/kicker/taskbar/taskbarbindings.cpp @@ -23,10 +23,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString(), key3, key4 ) #endif #define WIN KKey::QtWIN diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index 661706bdb..bfd1a40bf 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -135,7 +135,7 @@ void TaskBarContainer::configure() windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, KIcon::Panel, 16)); - windowListButton->setMinimumSize(windowListButton->sizeHint()); + windowListButton->setMinimumSize(windowListButton->tqsizeHint()); layout->insertWidget(0, windowListButton); windowListButton->show(); } @@ -168,7 +168,7 @@ void TaskBarContainer::preferences() void TaskBarContainer::orientationChange(Orientation o) { - if (o == Horizontal) + if (o == Qt::Horizontal) { if (windowListButton) { @@ -230,7 +230,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d) windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, KIcon::Panel, 16)); - windowListButton->setMinimumSize(windowListButton->sizeHint()); + windowListButton->setMinimumSize(windowListButton->tqsizeHint()); } } @@ -249,13 +249,13 @@ void TaskBarContainer::showWindowListMenu() pos.setX( pos.x() + width() ); break; case KPanelApplet::Left: - pos.setX( pos.x() - windowListMenu->sizeHint().width() ); + pos.setX( pos.x() - windowListMenu->tqsizeHint().width() ); break; case KPanelApplet::Down: pos.setY( pos.y() + height() ); break; case KPanelApplet::Up: - pos.setY( pos.y() - windowListMenu->sizeHint().height() ); + pos.setY( pos.y() - windowListMenu->tqsizeHint().height() ); default: break; } @@ -277,9 +277,9 @@ void TaskBarContainer::reconnectWindowListButton() connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) ); } -TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const +TQSize TaskBarContainer::tqsizeHint( KPanelExtension::Position p, TQSize maxSize) const { - TQSize size = taskBar->sizeHint( p, maxSize ); + TQSize size = taskBar->tqsizeHint( p, maxSize ); if ( (p == KPanelExtension::Left || p == KPanelExtension::Right) && showWindowListButton ) { return TQSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE ); } diff --git a/kicker/taskbar/taskbarcontainer.h b/kicker/taskbar/taskbarcontainer.h index 87a55c2b9..e0e4f0dce 100644 --- a/kicker/taskbar/taskbarcontainer.h +++ b/kicker/taskbar/taskbarcontainer.h @@ -48,7 +48,7 @@ public: void popupDirectionChange( KPanelApplet::Direction ); void preferences(); //FIXME: don't use Position, use Orientation - TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const; + TQSize tqsizeHint( KPanelExtension::Position, TQSize maxSize ) const; void setBackground(); k_dcop: diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 1e4829a38..345fcb1f9 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -62,7 +62,7 @@ TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar, lastActivated(0), m_menu(0), m_startup(0), - arrowType(Qt::UpArrow), + arrowType(TQt::UpArrow), taskBar(bar), discardNextMouseEvent(false), aboutToActivate(false), @@ -94,7 +94,7 @@ TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames, lastActivated(0), m_menu(0), m_startup(startup), - arrowType(Qt::LeftArrow), + arrowType(TQt::LeftArrow), taskBar(bar), discardNextMouseEvent(false), aboutToActivate(false), @@ -167,7 +167,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange) return; } - const TQObject* source = sender(); + const TQObject* source = TQT_TQOBJECT_CONST(sender()); Task::Ptr task = 0; Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) @@ -190,7 +190,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange) void TaskContainer::iconChanged() { - const TQObject* source = sender(); + const TQObject* source = TQT_TQOBJECT_CONST(sender()); Task::Ptr task = 0; Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) @@ -314,8 +314,8 @@ TQSizePolicy TaskContainer::sizePolicy() const void TaskContainer::resizeEvent( TQResizeEvent * ) { // calculate the icon rect - TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) ); - iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); + TQRect br( tqstyle().subRect( TQStyle::SR_PushButtonContents, this ) ); + iconRect = TQStyle::tqvisualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); } void TaskContainer::add(Task::Ptr task) @@ -390,7 +390,7 @@ void TaskContainer::remove(Startup::Ptr startup) } } -bool TaskContainer::contains(Task::Ptr task) +bool TaskContainer::tqcontains(Task::Ptr task) { if (!task) { @@ -408,12 +408,12 @@ bool TaskContainer::contains(Task::Ptr task) return false; } -bool TaskContainer::contains(Startup::Ptr startup) +bool TaskContainer::tqcontains(Startup::Ptr startup) { return startup && (m_startup == startup); } -bool TaskContainer::contains(WId win) +bool TaskContainer::tqcontains(WId win) { Task::List::iterator itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) @@ -477,7 +477,7 @@ void TaskContainer::paintEvent( TQPaintEvent* ) } TQPainter p; - p.begin(pm ,this); + p.tqbegin(pm ,this); drawButton(&p); p.end(); @@ -530,7 +530,7 @@ void TaskContainer::drawButton(TQPainter *p) font.setBold(active); - TQColorGroup colors = palette().active(); + TQColorGroup colors = tqpalette().active(); if (TaskBarSettings::useCustomColors()) { @@ -579,14 +579,14 @@ void TaskContainer::drawButton(TQPainter *p) bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate)); bool reverse = TQApplication::reverseLayout(); - TQRect br(style().subRect(TQStyle::SR_PushButtonContents, this)); - TQPoint shift = TQPoint(style().pixelMetric(TQStyle::PM_ButtonShiftHorizontal), - style().pixelMetric(TQStyle::PM_ButtonShiftVertical)); + TQRect br(tqstyle().subRect(TQStyle::SR_PushButtonContents, this)); + TQPoint shift = TQPoint(tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftHorizontal), + tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftVertical)); // draw button background if (drawButton) { - style().drawPrimitive(TQStyle::PE_HeaderSection, p, + tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, p, TQRect(0, 0, width(), height()), colors); } @@ -631,7 +631,7 @@ void TaskContainer::drawButton(TQPainter *p) // modified overlay static TQString modStr = "[" + i18n( "modified" ) + "]"; - int modStrPos = text.find( modStr ); + int modStrPos = text.tqfind( modStr ); int textPos = ( taskBar->showIcon() && (!pixmap.isNull() || m_startup)) ? 2 + 16 + 2 : 0; if (modStrPos >= 0) @@ -643,7 +643,7 @@ void TaskContainer::drawButton(TQPainter *p) // draw modified overlay if (!modPixmap.isNull()) { - TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos, + TQRect r = TQStyle::tqvisualRect(TQRect(br.x() + textPos, (height() - 16) / 2, 16, 16), this); @@ -660,7 +660,7 @@ void TaskContainer::drawButton(TQPainter *p) // draw text if (!text.isEmpty()) { - TQRect tr = TQStyle::visualRect(TQRect(br.x() + textPos + 1, 0, + TQRect tr = TQStyle::tqvisualRect(TQRect(br.x() + textPos + 1, 0, width() - textPos, height()), this); int textFlags = AlignVCenter | SingleLine; @@ -772,19 +772,19 @@ void TaskContainer::drawButton(TQPainter *p) } int flags = TQStyle::Style_Enabled; - TQRect ar = TQStyle::visualRect(TQRect(br.x() + br.width() - 8 - 2, + TQRect ar = TQStyle::tqvisualRect(TQRect(br.x() + br.width() - 8 - 2, br.y(), 8, br.height()), this); if (sunken) { flags |= TQStyle::Style_Down; } - style().drawPrimitive(e, p, ar, colors, flags); + tqstyle().tqdrawPrimitive(e, p, ar, colors, flags); } // draw mouse over frame in transparent mode if (m_mouseOver && halo) - KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), colorGroup().foreground()); + KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), tqcolorGroup().foreground()); if (aboutToActivate) { @@ -815,13 +815,13 @@ TQString TaskContainer::name() // in common, and then use everything UP TO that as the name in the button while (i < maxLength) { - TQChar check = match.at(i).lower(); + TQChar check = match.tqat(i).lower(); Task::List::iterator itEnd = m_filteredTasks.end(); for (Task::List::iterator it = m_filteredTasks.begin(); it != itEnd; ++it) { // we're doing a lot of Utf8 -> TQString conversions here // by repeatedly calling visibleIconicName() =/ - if (check != (*it)->visibleName().at(i).lower()) + if (check != (*it)->visibleName().tqat(i).lower()) { if (i > 0) { @@ -886,7 +886,7 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e ) return; } - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { m_dragStartPos = e->pos(); } @@ -901,13 +901,13 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e ) // Other actions will be handled in mouseReleaseEvent switch (e->button()) { - case LeftButton: + case Qt::LeftButton: buttonAction = TaskBarSettings::action(TaskBarSettings::LeftButton); break; - case MidButton: + case Qt::MidButton: buttonAction = TaskBarSettings::action(TaskBarSettings::MiddleButton); break; - case RightButton: + case Qt::RightButton: default: buttonAction = TaskBarSettings::action(TaskBarSettings::RightButton); break; @@ -932,7 +932,7 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) // This is to avoid the flicker caused by redrawing the // button as unpressed just before it's activated. - if (!rect().contains(e->pos())) + if (!TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos())) { TQToolButton::mouseReleaseEvent(e); return; @@ -942,13 +942,13 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) switch (e->button()) { - case LeftButton: + case Qt::LeftButton: buttonAction = TaskBarSettings::action(TaskBarSettings::LeftButton); break; - case MidButton: + case Qt::MidButton: buttonAction = TaskBarSettings::action(TaskBarSettings::MiddleButton); break; - case RightButton: + case Qt::RightButton: default: buttonAction = TaskBarSettings::action(TaskBarSettings::RightButton); break; @@ -1146,17 +1146,17 @@ void TaskContainer::popupMenu(int action) pos.setX(pos.x() + width()); break; case LeftArrow: - pos.setX(pos.x() - m_menu->sizeHint().width()); + pos.setX(pos.x() - m_menu->tqsizeHint().width()); break; case DownArrow: if ( TQApplication::reverseLayout() ) - pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); + pos.setX( pos.x() + width() - m_menu->tqsizeHint().width() ); pos.setY( pos.y() + height() ); break; case UpArrow: if ( TQApplication::reverseLayout() ) - pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); - pos.setY(pos.y() - m_menu->sizeHint().height()); + pos.setX( pos.x() + width() - m_menu->tqsizeHint().width() ); + pos.setY(pos.y() - m_menu->tqsizeHint().height()); break; default: break; @@ -1228,7 +1228,7 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e) if ( TQApplication::widgetAt( p, true ) == this ) { if (me->type() == TQEvent::MouseButtonPress && - me->button() == LeftButton) + me->button() == Qt::LeftButton) { m_dragStartPos = mapFromGlobal(p); } @@ -1246,10 +1246,10 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e) { if (!m_dragStartPos.isNull()) { - TQMouseEvent* me = static_cast(e); + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); TQPoint p(me->globalPos()); - if (me->state() & LeftButton && + if (me->state() & Qt::LeftButton && TQApplication::widgetAt(p, true) == this) { kdDebug() << "event move" << endl; @@ -1274,7 +1274,7 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e) return TQToolButton::eventFilter( o, e ); } -void TaskContainer::setArrowType( Qt::ArrowType at ) +void TaskContainer::setArrowType( TQt::ArrowType at ) { if (arrowType == at) { @@ -1611,7 +1611,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) details.append(i18n("Has unsaved changes")); static TQString modStr = "[" + i18n( "modified" ) + "]"; - int modStrPos = name.find(modStr); + int modStrPos = name.tqfind(modStr); if (modStrPos >= 0) { diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h index 567a74a79..4d2e0de9b 100644 --- a/kicker/taskbar/taskcontainer.h +++ b/kicker/taskbar/taskcontainer.h @@ -49,7 +49,7 @@ public: TQWidget *parent = 0, const char *name = 0); virtual ~TaskContainer(); - void setArrowType( Qt::ArrowType at ); + void setArrowType( TQt::ArrowType at ); void init(); @@ -57,9 +57,9 @@ public: void remove(Task::Ptr); void remove(Startup::Ptr); - bool contains(Task::Ptr); - bool contains(Startup::Ptr); - bool contains(WId); + bool tqcontains(Task::Ptr); + bool tqcontains(Startup::Ptr); + bool tqcontains(WId); bool isEmpty(); bool onCurrentDesktop(); diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index 864d10f5d..837a7fcec 100644 --- a/kicker/taskmanager/tasklmbmenu.cpp +++ b/kicker/taskmanager/tasklmbmenu.cpp @@ -75,7 +75,7 @@ void TaskMenuItem::paint(TQPainter *p, const TQColorGroup &cg, p->drawText(x, y, w, h, AlignAuto|AlignVCenter|DontClip|ShowPrefix, m_text); } -TQSize TaskMenuItem::sizeHint() +TQSize TaskMenuItem::tqsizeHint() { TQFont font = TQFont(); if (m_isActive) @@ -111,7 +111,7 @@ void TaskLMBMenu::fillMenu() { Task::Ptr t = (*it); - TQString text = t->visibleName().replace("&", "&&"); + TQString text = t->visibleName().tqreplace("&", "&&"); TaskMenuItem *menuItem = new TaskMenuItem(text, t->isActive(), @@ -229,7 +229,7 @@ void TaskLMBMenu::dragSwitch() void TaskLMBMenu::mousePressEvent( TQMouseEvent* e ) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { m_dragStartPos = e->pos(); } diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h index d11091d82..973cf666f 100644 --- a/kicker/taskmanager/tasklmbmenu.h +++ b/kicker/taskmanager/tasklmbmenu.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskmanager.h" -class TaskMenuItem : public QCustomMenuItem +class TaskMenuItem : public TQCustomMenuItem { public: TaskMenuItem(const TQString &text, @@ -38,7 +38,7 @@ public: ~TaskMenuItem(); void paint(TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int); - TQSize sizeHint(); + TQSize tqsizeHint(); void setAttentionState(bool state) { m_attentionState = state; } private: @@ -51,7 +51,7 @@ private: /*****************************************************************************/ -class KDE_EXPORT TaskLMBMenu : public QPopupMenu +class KDE_EXPORT TaskLMBMenu : public TQPopupMenu { Q_OBJECT diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index 739c626b5..103205042 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -247,9 +247,9 @@ Task::Ptr TaskManager::findTask(int desktop, const TQPoint& p) continue; } - if (t->geometry().contains(p)) + if (t->geometry().tqcontains(p)) { - int index = list.findIndex(t->window()); + int index = list.tqfindIndex(t->window()); if (index > currentIndex) { currentIndex = index; @@ -295,7 +295,7 @@ void TaskManager::windowAdded(WId w ) WId transient_for = (WId) transient_for_tmp; // check if it's transient for a skiptaskbar window - if( _skiptaskbar_windows.contains( transient_for )) + if( _skiptaskbar_windows.tqcontains( transient_for )) return; // lets see if this is a transient for an existing task @@ -807,7 +807,7 @@ bool Task::isModified() const static TQString modStr = TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]"); - int modStrPos = _info.visibleName().find(modStr); + int modStrPos = _info.visibleName().tqfind(modStr); return ( modStrPos != -1 ); } @@ -831,7 +831,7 @@ void Task::updateDemandsAttentionState( WId w ) NETWinInfo i( qt_xdisplay(), w, qt_xrootwin(), NET::WMState ); if(i.state() & NET::DemandsAttention) { - if (!_transients_demanding_attention.contains(w)) + if (!_transients_demanding_attention.tqcontains(w)) { _transients_demanding_attention.append(w); } @@ -984,10 +984,10 @@ bool Task::idMatch( const TQString& id1, const TQString& id2 ) if ( id1.isEmpty() || id2.isEmpty() ) return false; - if ( id1.contains( id2 ) > 0 ) + if ( id1.tqcontains( id2 ) > 0 ) return true; - if ( id2.contains( id1 ) > 0 ) + if ( id2.tqcontains( id1 ) > 0 ) return true; return false; @@ -1305,7 +1305,7 @@ void Task::updateThumbnail() // by the thumbnail generation. This makes things much smoother // on slower machines. // - TQWidget *rootWin = qApp->desktop(); + TQWidget *rootWin = TQT_TQWIDGET(tqApp->desktop()); TQRect geom = _info.geometry(); _grab = TQPixmap::grabWindow(rootWin->winId(), geom.x(), geom.y(), @@ -1329,7 +1329,7 @@ void Task::generateThumbnail() width = width * _thumbSize; height = height * _thumbSize; - img = img.smoothScale( qRound(width), qRound(height) ); + img = img.smoothScale( tqRound(width), tqRound(height) ); _thumb = img; _grab.resize( 0, 0 ); // Makes grab a null image. @@ -1356,7 +1356,7 @@ TQPixmap Task::thumbnail(int maxDimension) Picture picture = XRenderCreatePicture(dpy, m_windowPixmap, format, CPSubwindowMode, &picAttr); - // Get shaped windows handled correctly. + // Get tqshaped windows handled correctly. XserverRegion region = XFixesCreateRegionFromWindow(dpy, m_frameId, WindowRegionBounding); XFixesSetPictureClipRegion(dpy, picture, 0, 0, region); @@ -1375,7 +1375,7 @@ TQPixmap Task::thumbnail(int maxDimension) int thumbnailHeight = (int)(winAttr.height * factor); TQPixmap thumbnail(thumbnailWidth, thumbnailHeight); - thumbnail.fill(TQApplication::palette().active().background()); + thumbnail.fill(TQApplication::tqpalette().active().background()); #if 0 // TQImage::smoothScale() scaling TQPixmap full(winAttr.width, winAttr.height); @@ -1499,7 +1499,7 @@ bool TaskDrag::canDecode(const TQMimeSource* e) Task::List TaskDrag::decode( const TQMimeSource* e ) { - TQByteArray data(e->encodedData("taskbar/task")); + TQByteArray data(e->tqencodedData("taskbar/task")); Task::List tasks; if (data.size()) diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h index 8f5876360..a12a062d1 100644 --- a/kicker/taskmanager/taskmanager.h +++ b/kicker/taskmanager/taskmanager.h @@ -282,7 +282,7 @@ public: //* @internal void removeTransient( WId w ); //* @internal - bool hasTransient(WId w) const { return _transients.find(w) != _transients.end(); } + bool hasTransient(WId w) const { return _transients.tqfind(w) != _transients.end(); } //* @internal void updateDemandsAttentionState( WId w ); //* @internal @@ -483,7 +483,7 @@ private: /** * Provids a drag object for tasks across desktops. */ -class KDE_EXPORT TaskDrag : public QStoredDrag +class KDE_EXPORT TaskDrag : public TQStoredDrag { public: /** @@ -565,7 +565,7 @@ private: * @see Startup * @see KWinModule */ -class KDE_EXPORT TaskManager : public QObject +class KDE_EXPORT TaskManager : public TQObject { Q_OBJECT Q_PROPERTY( int currentDesktop READ currentDesktop ) diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp index fb4c9ae87..bb5ee6035 100644 --- a/kicker/taskmanager/taskrmbmenu.cpp +++ b/kicker/taskmanager/taskrmbmenu.cpp @@ -236,7 +236,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t) m->insertSeparator(); for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { - TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); + TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).tqreplace('&', "&&")); id = m->insertItem( name, t, TQT_SLOT( toDesktop(int) ) ); m->setItemParameter( id, i ); m->setItemChecked( id, !t->isOnAllDesktops() && t->desktop() == i ); @@ -256,7 +256,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu() m->insertSeparator(); for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { - TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); + TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).tqreplace('&', "&&")); id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) ); m->setItemParameter( id, i ); } diff --git a/kicker/taskmanager/taskrmbmenu.h b/kicker/taskmanager/taskrmbmenu.h index 6657bf909..d95230f9b 100644 --- a/kicker/taskmanager/taskrmbmenu.h +++ b/kicker/taskmanager/taskrmbmenu.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -class KDE_EXPORT TaskRMBMenu : public QPopupMenu +class KDE_EXPORT TaskRMBMenu : public TQPopupMenu { Q_OBJECT diff --git a/kioslave/cgi/cgi.cpp b/kioslave/cgi/cgi.cpp index 5f57c3fe8..7af02aa58 100644 --- a/kioslave/cgi/cgi.cpp +++ b/kioslave/cgi/cgi.cpp @@ -71,7 +71,8 @@ static TQCString extractQCString( const TQByteArray &ba, uint start, uint len = if ( ( ba.size() - start ) < len ) realLen = ba.size() - start; - return TQCString( &ba[ start ], realLen + 1 ); +// return TQCString( &ba[ start ], realLen + 1 ); + return TQCString( ba ).mid(start, realLen + 1); } /** @@ -80,7 +81,7 @@ static TQCString extractQCString( const TQByteArray &ba, uint start, uint len = */ static int qByteArrayFindStr( const TQByteArray &ba, const char *str ) { - int strLen = qstrlen( str ); + int strLen = tqstrlen( str ); int searchLen = ba.size() - strLen; for ( int i = 0; i <= searchLen; ++i ) { @@ -116,7 +117,7 @@ void CgiProtocol::get( const KURL& url ) TQString file; - int pos = path.findRev('/'); + int pos = path.tqfindRev('/'); if ( pos >= 0 ) file = path.mid( pos + 1 ); else file = path; @@ -189,8 +190,8 @@ void CgiProtocol::get( const KURL& url ) // Access the buffer in-place by using setRawData() output.setRawData( buffer, n ); - int colon = output.find( ':' ); - int newline = output.find( '\n' ); + int colon = output.tqfind( ':' ); + int newline = output.tqfind( '\n' ); int semicolon = qByteArrayFindRev( output, ';', newline ); int end; if ( semicolon < 0 ) end = newline; diff --git a/kioslave/cgi/kcmcgi/kcmcgi.cpp b/kioslave/cgi/kcmcgi/kcmcgi.cpp index 521c0fd95..d1a798aa2 100644 --- a/kioslave/cgi/kcmcgi/kcmcgi.cpp +++ b/kioslave/cgi/kcmcgi/kcmcgi.cpp @@ -48,7 +48,7 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name) TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - TQGroupBox *topBox = new TQGroupBox( 1, Horizontal, i18n("Paths to Local CGI Programs"), this ); + TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Paths to Local CGI Programs"), this ); topLayout->addWidget( topBox ); mListBox = new TQListBox( topBox ); diff --git a/kioslave/filter/filter.cc b/kioslave/filter/filter.cc index 8392dd160..5ae1a8867 100644 --- a/kioslave/filter/filter.cc +++ b/kioslave/filter/filter.cc @@ -56,7 +56,7 @@ int kdemain( int argc, char ** argv) FilterProtocol::FilterProtocol( const TQCString & protocol, const TQCString &pool, const TQCString &app ) : KIO::SlaveBase( protocol, pool, app ) { - TQString mimetype = TQString::fromLatin1("application/x-") + TQString::fromLatin1(protocol); + TQString mimetype = TQString::tqfromLatin1("application/x-") + TQString::tqfromLatin1(protocol); filter = KFilterBase::findFilterByMimeType( mimetype ); Q_ASSERT(filter); } @@ -157,7 +157,7 @@ void FilterProtocol::get( const KURL & ) void FilterProtocol::put( const KURL &/*url*/, int, bool /*_overwrite*/, bool /*_resume*/ ) { - error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("put")); + error( KIO::ERR_UNSUPPORTED_ACTION, TQString::tqfromLatin1("put")); } void FilterProtocol::setSubURL(const KURL &url) diff --git a/kioslave/finger/kio_finger.cpp b/kioslave/finger/kio_finger.cpp index 8bfc25106..a8ea0b844 100644 --- a/kioslave/finger/kio_finger.cpp +++ b/kioslave/finger/kio_finger.cpp @@ -112,7 +112,7 @@ void FingerProtocol::get(const KURL& url ) // Check the validity of the query TQRegExp regExp("?refreshRate=[0-9][0-9]*", true, true); - if (query.contains(regExp)) { + if (query.tqcontains(regExp)) { //kdDebug() << "looks like a valid query" << endl; TQRegExp regExp( "([0-9]+)" ); regExp.search(query); @@ -133,7 +133,7 @@ void FingerProtocol::get(const KURL& url ) myKProcess->start(KProcess::Block, KProcess::All); - data(TQCString(myStdStream->local8Bit())); + data(TQCString(TQString(*myStdStream).local8Bit())); data(TQByteArray()); finished(); diff --git a/kioslave/fish/fish.cpp b/kioslave/fish/fish.cpp index 77533964c..7290d13c6 100644 --- a/kioslave/fish/fish.cpp +++ b/kioslave/fish/fish.cpp @@ -558,7 +558,7 @@ int fishProtocol::establishConnection(char *buffer, KIO::fileoffset_t len) { buf.truncate(buf.length()-1); myDebug( << "establishing: got " << buf << endl); - while (childPid && ((pos = buf.find('\n')) >= 0 || + while (childPid && ((pos = buf.tqfind('\n')) >= 0 || buf.endsWith(":") || buf.endsWith("?"))) { pos++; TQString str = buf.left(pos); @@ -738,11 +738,11 @@ bool fishProtocol::sendCommand(fish_command_type cmd, ...) { TQString arg(va_arg(list, const char *)); int pos = -2; while ((pos = rx.search(arg,pos+2)) >= 0) { - arg.replace(pos,0,TQString("\\")); + arg.tqreplace(pos,0,TQString("\\")); } //myDebug( << "arg " << i << ": " << arg << endl); realCmd.append(" ").append(arg); - realAlt.replace(TQRegExp("%"+TQString::number(i+1)),arg); + realAlt.tqreplace(TQRegExp("%"+TQString::number(i+1)),arg); } TQString s("#"); s.append(realCmd).append("\n ").append(realAlt).append(" 2>&1;echo '### 000'\n"); @@ -790,7 +790,7 @@ int fishProtocol::makeTimeFromLs(const TQString &monthStr, const TQString &daySt break; } - int pos = timeyearStr.find(':'); + int pos = timeyearStr.tqfind(':'); if (timeyearStr.length() == 4 && pos == -1) { year = timeyearStr.toInt(); } else if (pos == -1) { @@ -820,7 +820,7 @@ void fishProtocol::manageConnection(const TQString &l) { case FISH_VER: if (line.startsWith("VER 0.0.3")) { line.append(" "); - hasAppend = line.contains(" append "); + hasAppend = line.tqcontains(" append "); } else { error(ERR_UNSUPPORTED_PROTOCOL,line); shutdownConnection(); @@ -897,7 +897,7 @@ void fishProtocol::manageConnection(const TQString &l) { atom.m_uds = UDS_USER; atom.m_long = 0; - pos = line.find('.',12); + pos = line.tqfind('.',12); if (pos < 0) { errorCount++; break; @@ -913,8 +913,8 @@ void fishProtocol::manageConnection(const TQString &l) { case 'd': atom.m_uds = UDS_MODIFICATION_TIME; - pos = line.find(' '); - pos2 = line.find(' ',pos+1); + pos = line.tqfind(' '); + pos2 = line.tqfind(' ',pos+1); if (pos < 0 || pos2 < 0) break; errorCount--; atom.m_long = makeTimeFromLs(line.mid(1,pos-1), line.mid(pos+1,pos2-pos), line.mid(pos2+1)); @@ -923,14 +923,14 @@ void fishProtocol::manageConnection(const TQString &l) { case 'D': atom.m_uds = UDS_MODIFICATION_TIME; - pos = line.find(' '); - pos2 = line.find(' ',pos+1); - pos3 = line.find(' ',pos2+1); + pos = line.tqfind(' '); + pos2 = line.tqfind(' ',pos+1); + pos3 = line.tqfind(' ',pos2+1); if (pos < 0 || pos2 < 0 || pos3 < 0) break; dt.setDate(TQDate(line.mid(1,pos-1).toInt(),line.mid(pos+1,pos2-pos-1).toInt(),line.mid(pos2+1,pos3-pos2-1).toInt())); pos = pos3; - pos2 = line.find(' ',pos+1); - pos3 = line.find(' ',pos2+1); + pos2 = line.tqfind(' ',pos+1); + pos3 = line.tqfind(' ',pos2+1); if (pos < 0 || pos2 < 0 || pos3 < 0) break; dt.setTime(TQTime(line.mid(pos+1,pos2-pos-1).toInt(),line.mid(pos2+1,pos3-pos2-1).toInt(),line.mid(pos3+1).toInt())); errorCount--; @@ -953,7 +953,7 @@ void fishProtocol::manageConnection(const TQString &l) { case ':': atom.m_uds = UDS_NAME; atom.m_long = 0; - pos = line.findRev('/'); + pos = line.tqfindRev('/'); atom.m_str = thisFn = line.mid(pos < 0?1:pos+1); if (fishCommand == FISH_LIST) udsEntry.append(atom); @@ -981,7 +981,7 @@ void fishProtocol::manageConnection(const TQString &l) { // This is getting ugly. file(1) makes some uneducated // guesses, so we must try to ignore them (#51274) else if (mimeAtom.m_str.isEmpty() && line.right(8) != "/unknown" && - (thisFn.find('.') < 0 || (line.left(8) != "Mtext/x-" + (thisFn.tqfind('.') < 0 || (line.left(8) != "Mtext/x-" && line != "Mtext/plain"))) { mimeAtom.m_str = type; } @@ -1186,7 +1186,7 @@ void fishProtocol::writeStdin(const TQString &line) if (writeReady) { writeReady = false; - //myDebug( << "Writing: " << qlist.first().mid(0,qlist.first().find('\n')) << endl); + //myDebug( << "Writing: " << qlist.first().mid(0,qlist.first().tqfind('\n')) << endl); myDebug( << "Writing: " << qlist.first() << endl); myDebug( << "---------" << endl); writeChild((const char *)qlist.first().latin1(), qlist.first().length()); @@ -1218,7 +1218,7 @@ void fishProtocol::sent() if (qlist.count() == 0) { writeReady = true; } else { - //myDebug( << "Writing: " << qlist.first().mid(0,qlist.first().find('\n')) << endl); + //myDebug( << "Writing: " << qlist.first().mid(0,qlist.first().tqfind('\n')) << endl); myDebug( << "Writing: " << qlist.first() << endl); myDebug( << "---------" << endl); writeChild((const char *)qlist.first().latin1(),qlist.first().length()); @@ -1236,7 +1236,7 @@ int fishProtocol::received(const char *buffer, KIO::fileoffset_t buflen) int dataSize = (rawRead > buflen?buflen:rawRead); if (!mimeTypeSent) { - int mimeSize = QMIN(dataSize, (int)mimeBuffer.size()-dataRead); + int mimeSize = TQMIN(dataSize, (int)mimeBuffer.size()-dataRead); memcpy(mimeBuffer.data()+dataRead,buffer,mimeSize); dataRead += mimeSize; rawRead -= mimeSize; @@ -1364,7 +1364,7 @@ void fishProtocol::finished() { udsEntry.clear(); udsStatEntry.clear(); writeStdin(commandList.first()); - //if (fishCommand != FISH_APPEND && fishCommand != FISH_WRITE) infoMessage("Sending "+(commandList.first().mid(1,commandList.first().find("\n")-1))+"..."); + //if (fishCommand != FISH_APPEND && fishCommand != FISH_WRITE) infoMessage("Sending "+(commandList.first().mid(1,commandList.first().tqfind("\n")-1))+"..."); commandList.remove(commandList.begin()); commandCodes.remove(commandCodes.begin()); } else { @@ -1436,7 +1436,7 @@ void fishProtocol::run() { if (rc > 0) { int noff = received(buf,rc+offset); if (noff > 0) memmove(buf,buf+offset+rc-noff,noff); - //myDebug( << "left " << noff << " bytes: " << TQString::fromLatin1(buf,offset) << endl); + //myDebug( << "left " << noff << " bytes: " << TQString::tqfromLatin1(buf,offset) << endl); offset = noff; } else { if (errno == EINTR) diff --git a/kioslave/floppy/kio_floppy.cpp b/kioslave/floppy/kio_floppy.cpp index a0c68a9d2..bd24aca0c 100644 --- a/kioslave/floppy/kio_floppy.cpp +++ b/kioslave/floppy/kio_floppy.cpp @@ -195,51 +195,51 @@ bool FloppyProtocol::stopAfterError(const KURL& url, const TQString& drive) TQTextIStream output(&outputString); TQString line=output.readLine(); kdDebug(7101)<<"line: -"< -1) + if (line.tqfind("resource busy") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access drive %1.\nThe drive is still busy.\nWait until it is inactive and then try again.").arg(drive)); } - else if ((line.find("Disk full") > -1) || (line.find("No free cluster") > -1)) + else if ((line.tqfind("Disk full") > -1) || (line.tqfind("No free cluster") > -1)) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not write to file %1.\nThe disk in drive %2 is probably full.").arg(url.prettyURL(),drive)); } //file not found - else if (line.find("not found") > -1) + else if (line.tqfind("not found") > -1) { error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL()); } //no disk - else if (line.find("not configured") > -1) + else if (line.tqfind("not configured") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThere is probably no disk in the drive %2").arg(url.prettyURL(),drive)); } - else if (line.find("No such device") > -1) + else if (line.tqfind("No such device") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThere is probably no disk in the drive %2 or you do not have enough permissions to access the drive.").arg(url.prettyURL(),drive)); } - else if (line.find("not supported") > -1) + else if (line.tqfind("not supported") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThe drive %2 is not supported.").arg(url.prettyURL(),drive)); } //not supported or no such drive - else if (line.find("Permission denied") > -1) + else if (line.tqfind("Permission denied") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nMake sure the floppy in drive %2 is a DOS-formatted floppy disk \nand that the permissions of the device file (e.g. /dev/fd0) are set correctly (e.g. rwxrwxrwx).").arg(url.prettyURL(),drive)); } - else if (line.find("non DOS media") > -1) + else if (line.tqfind("non DOS media") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThe disk in drive %2 is probably not a DOS-formatted floppy disk.").arg(url.prettyURL(),drive)); } - else if (line.find("Read-only") > -1) + else if (line.tqfind("Read-only") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Access denied.\nCould not write to %1.\nThe disk in drive %2 is probably write-protected.").arg(url.prettyURL(),drive)); } - else if ((outputString.find("already exists") > -1) || (outputString.find("Skipping ") > -1)) + else if ((outputString.tqfind("already exists") > -1) || (outputString.tqfind("Skipping ") > -1)) { error( KIO::ERR_FILE_ALREADY_EXIST,url.prettyURL()); //return false; } - else if (outputString.find("could not read boot sector") > -1) + else if (outputString.tqfind("could not read boot sector") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not read boot sector for %1.\nThere is probably not any disk in drive %2.").arg(url.prettyURL(),drive)); //return false; @@ -404,7 +404,7 @@ StatInfo FloppyProtocol::createStatInfo(const TQString line, bool makeStat, cons if (line.length()==41) { - int nameLength=line.find(' '); + int nameLength=line.tqfind(' '); kdDebug(7101)<<"Floppy::createStatInfo: line find: "<0) { @@ -669,7 +669,7 @@ int FloppyProtocol::freeSpace(const KURL& url) while (!output.atEnd()) { line=output.readLine(); - if (line.find("bytes free")==36) + if (line.tqfind("bytes free")==36) { TQString tmp=line.mid(24,3); tmp=tmp.stripWhiteSpace(); diff --git a/kioslave/home/homeimpl.cpp b/kioslave/home/homeimpl.cpp index 12a692319..6f4f86759 100644 --- a/kioslave/home/homeimpl.cpp +++ b/kioslave/home/homeimpl.cpp @@ -37,7 +37,7 @@ bool HomeImpl::parseURL(const KURL &url, TQString &name, TQString &path) const { TQString url_path = url.path(); - int i = url_path.find('/', 1); + int i = url_path.tqfind('/', 1); if (i > 0) { name = url_path.mid(1, i-1); @@ -90,7 +90,7 @@ bool HomeImpl::listHomes(TQValueList &list) for(; it!=users_end; ++it) { if ((*it).uid()>=MINIMUM_UID - && !uid_list.contains( (*it).uid() ) ) + && !uid_list.tqcontains( (*it).uid() ) ) { uid_list.append( (*it).uid() ); KIO::UDSEntry entry; @@ -185,7 +185,7 @@ void HomeImpl::slotStatResult(KIO::Job *job) m_entryBuffer = stat_job->statResult(); } - qApp->eventLoop()->exitLoop(); + tqApp->eventLoop()->exitLoop(); } KIO::UDSEntry HomeImpl::extractUrlInfos(const KURL &url) @@ -195,7 +195,7 @@ KIO::UDSEntry HomeImpl::extractUrlInfos(const KURL &url) KIO::StatJob *job = KIO::stat(url, false); connect( job, TQT_SIGNAL( result(KIO::Job *) ), this, TQT_SLOT( slotStatResult(KIO::Job *) ) ); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); KIO::UDSEntry::iterator it = m_entryBuffer.begin(); KIO::UDSEntry::iterator end = m_entryBuffer.end(); diff --git a/kioslave/home/kdedmodule/homedirnotify.cpp b/kioslave/home/kdedmodule/homedirnotify.cpp index 823027fe2..f2da9fcf7 100644 --- a/kioslave/home/kdedmodule/homedirnotify.cpp +++ b/kioslave/home/kdedmodule/homedirnotify.cpp @@ -53,7 +53,7 @@ void HomeDirNotify::init() for(; it!=users_end; ++it) { if ((*it).uid()>=MINIMUM_UID - && !uid_list.contains( (*it).uid() ) ) + && !uid_list.tqcontains( (*it).uid() ) ) { uid_list.append( (*it).uid() ); @@ -147,7 +147,7 @@ inline void evil_hack(const KURL::List &list) { KURL url = (*it).upURL(); - if (!notified.contains(url)) + if (!notified.tqcontains(url)) { notifier.FilesAdded(url); notified.append(url); diff --git a/kioslave/info/info.cc b/kioslave/info/info.cc index ab35f282b..418600ffa 100644 --- a/kioslave/info/info.cc +++ b/kioslave/info/info.cc @@ -93,7 +93,7 @@ void InfoProtocol::get( const KURL& url ) decodeURL( url ); TQString path = KGlobal::iconLoader()->iconPath("up", KIcon::Toolbar, true); - int revindex = path.findRev('/'); + int revindex = path.tqfindRev('/'); path = path.left(revindex); TQString cmd = KProcess::quote(m_perl); @@ -205,7 +205,7 @@ void InfoProtocol::decodePath( TQString path ) } //kdDebug( 7108 ) << "Path: " << path << endl; - int slashPos = path.find( "/" ); + int slashPos = path.tqfind( "/" ); if( slashPos < 0 ) { diff --git a/kioslave/ldap/kio_ldap.cpp b/kioslave/ldap/kio_ldap.cpp index 7abc95509..872950a9b 100644 --- a/kioslave/ldap/kio_ldap.cpp +++ b/kioslave/ldap/kio_ldap.cpp @@ -166,22 +166,22 @@ void LDAPProtocol::controlsFromMetaData( LDAPControl ***serverctrls, { TQString oid; bool critical; TQByteArray value; int i = 0; - while ( hasMetaData( TQString::fromLatin1("SERVER_CTRL%1").arg(i) ) ) { - TQCString val = metaData( TQString::fromLatin1("SERVER_CTRL%1").arg(i) ).utf8(); + while ( hasMetaData( TQString::tqfromLatin1("SERVER_CTRL%1").arg(i) ) ) { + TQCString val = metaData( TQString::tqfromLatin1("SERVER_CTRL%1").arg(i) ).utf8(); LDIF::splitControl( val, oid, critical, value ); kdDebug(7125) << "server ctrl #" << i << " value: " << val << " oid: " << oid << " critical: " << critical << " value: " << - TQString::fromUtf8( value, value.size() ) << endl; + TQString(TQString::fromUtf8( value, value.size() )) << endl; addControlOp( serverctrls, oid, value, critical ); i++; } i = 0; - while ( hasMetaData( TQString::fromLatin1("CLIENT_CTRL%1").arg(i) ) ) { - TQCString val = metaData( TQString::fromLatin1("CLIENT_CTRL%1").arg(i) ).utf8(); + while ( hasMetaData( TQString::tqfromLatin1("CLIENT_CTRL%1").arg(i) ) ) { + TQCString val = metaData( TQString::tqfromLatin1("CLIENT_CTRL%1").arg(i) ).utf8(); LDIF::splitControl( val, oid, critical, value ); kdDebug(7125) << "client ctrl #" << i << " value: " << val << " oid: " << oid << " critical: " << critical << " value: " << - TQString::fromUtf8( value, value.size() ) << endl; + TQString(TQString::fromUtf8( value, value.size() )) << endl; addControlOp( clientctrls, oid, value, critical ); i++; } @@ -285,7 +285,7 @@ void LDAPProtocol::addControlOp( LDAPControl ***pctrls, const TQString &oid, ctrls = *pctrls; kdDebug(7125) << "addControlOp: oid:'" << oid << "' val: '" << - TQString::fromUtf8(value, value.size()) << "'" << endl; + TQString(TQString::fromUtf8(value, value.size())) << "'" << endl; int vallen = value.size(); ctrl->ldctl_value.bv_len = vallen; if ( vallen ) { @@ -390,11 +390,11 @@ void LDAPProtocol::LDAPEntry2UDSEntry( const TQString &dn, UDSEntry &entry, atom.m_uds = UDS_NAME; atom.m_long = 0; TQString name = dn; - if ( (pos = name.find(",")) > 0 ) + if ( (pos = name.tqfind(",")) > 0 ) name = name.left( pos ); - if ( (pos = name.find("=")) > 0 ) + if ( (pos = name.tqfind("=")) > 0 ) name.remove( 0, pos+1 ); - name.replace(' ', "_"); + name.tqreplace(' ', "_"); if ( !dir ) name += ".ldif"; atom.m_str = name; entry.append( atom ); @@ -519,7 +519,7 @@ void LDAPProtocol::fillAuthInfo( AuthInfo &info ) info.url.setPort( mPort ); info.url.setUser( mUser ); info.caption = i18n("LDAP Login"); - info.comment = TQString::fromLatin1( mProtocol ) + "://" + mHost + ":" + + info.comment = TQString::tqfromLatin1( mProtocol ) + "://" + mHost + ":" + TQString::number( mPort ); info.commentLabel = i18n("site:"); info.username = mAuthSASL ? mUser : mBindName; diff --git a/kioslave/mac/kio_mac.cpp b/kioslave/mac/kio_mac.cpp index e64d22d65..21b998ad1 100644 --- a/kioslave/mac/kio_mac.cpp +++ b/kioslave/mac/kio_mac.cpp @@ -86,8 +86,8 @@ void MacProtocol::get(const KURL& url) { //find out if a mode has been specified in the query e.g. ?mode=t //or if it's a text file then set the mode to text - int modepos = query.find("mode="); - int textpos = mime.find("text"); + int modepos = query.tqfind("mode="); + int textpos = mime.tqfind("text"); if (modepos != -1) { mode += query.mid(modepos + 5, 1); if (mode != "-r" && mode != "-b" && mode != "-m" && mode != "-t" && mode != "-a") { @@ -157,7 +157,7 @@ void MacProtocol::listDir(const KURL& url) { while (line != NULL) { //1.0.4 puts this funny line in sometimes, we don't want it - if (line.contains("Thread ") == 0) { + if (line.tqcontains("Thread ") == 0) { entry = makeUDS(line); listEntry(entry, false); } @@ -207,11 +207,11 @@ TQValueList MacProtocol::doStat(const KURL& url) { this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int))); if (standardOutputStream.isEmpty()) { - filename.replace("\\ ", " "); //get rid of escapes - filename.replace("\\&", "&"); //mm, slashes... - filename.replace("\\!", "!"); - filename.replace("\\(", "("); - filename.replace("\\)", ")"); + filename.tqreplace("\\ ", " "); //get rid of escapes + filename.tqreplace("\\&", "&"); //mm, slashes... + filename.tqreplace("\\!", "!"); + filename.tqreplace("\\(", "("); + filename.tqreplace("\\)", ")"); error(ERR_DOES_NOT_EXIST, filename); } else { //remove trailing \n @@ -242,7 +242,7 @@ TQString MacProtocol::prepareHP(const KURL& url) { KConfig* config = new KConfig("macrc"); TQString query = url.query(); - int modepos = query.find("dev="); + int modepos = query.tqfind("dev="); if (modepos == -1) { //no device specified, read from config or go with #define PARTITION device = config->readEntry("device",PARTITION); @@ -264,7 +264,7 @@ TQString MacProtocol::prepareHP(const KURL& url) { bool version102 = true; - if (standardOutputStream.contains("options") != 0) { + if (standardOutputStream.tqcontains("options") != 0) { version102 = false; } @@ -297,15 +297,15 @@ TQString MacProtocol::prepareHP(const KURL& url) { //escape any funny characters //TODO are there any more characters to escape? - path.replace(" ", "\\ "); - path.replace("&", "\\&"); - path.replace("!", "\\!"); - path.replace("(", "\\("); - path.replace(")", "\\)"); + path.tqreplace(" ", "\\ "); + path.tqreplace("&", "\\&"); + path.tqreplace("!", "\\!"); + path.tqreplace("(", "\\("); + path.tqreplace(")", "\\)"); //then change to the right directory int s; TQString dir; - s = path.find('/'); + s = path.tqfind('/'); while (s != -1) { dir = path.left(s); path = path.mid(s+1); @@ -324,7 +324,7 @@ TQString MacProtocol::prepareHP(const KURL& url) { //clean up delete myKProcess; myKProcess = 0; - s = path.find('/'); + s = path.tqfind('/'); } return path; @@ -455,12 +455,12 @@ int MacProtocol::makeTime(TQString mday, TQString mon, TQString third) { // otherwise it only prints the year TQRegExp hourMin("(..):(..)"); if (hourMin.exactMatch(third)) { - TQDate currentDate(TQDate::currentDate()); + TQDate tqcurrentDate(TQDate::currentDate()); - if (month > currentDate.month()) { - year = currentDate.year() - 1; + if (month > tqcurrentDate.month()) { + year = tqcurrentDate.year() - 1; } else { - year = currentDate.year(); + year = tqcurrentDate.year(); } TQString h(hourMin.cap(1)); TQString m(hourMin.cap(2)); diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp index 013a15248..2bce71229 100644 --- a/kioslave/man/kio_man.cpp +++ b/kioslave/man/kio_man.cpp @@ -60,17 +60,17 @@ void stripExtension( TQString *name ) { int pos = name->length(); - if ( name->find(".gz", -3) != -1 ) + if ( name->tqfind(".gz", -3) != -1 ) pos -= 3; - else if ( name->find(".z", -2, false) != -1 ) + else if ( name->tqfind(".z", -2, false) != -1 ) pos -= 2; - else if ( name->find(".bz2", -4) != -1 ) + else if ( name->tqfind(".bz2", -4) != -1 ) pos -= 4; - else if ( name->find(".bz", -3) != -1 ) + else if ( name->tqfind(".bz", -3) != -1 ) pos -= 3; if ( pos > 0 ) - pos = name->findRev('.', pos-1); + pos = name->tqfindRev('.', pos-1); if ( pos > 0 ) name->truncate( pos ); @@ -98,7 +98,7 @@ bool parseUrl(const TQString& _url, TQString &title, TQString §ion) title = url; - int pos = url.find('('); + int pos = url.tqfind('('); if (pos < 0) return true; @@ -144,7 +144,7 @@ void MANProtocol::parseWhatIs( TQMap &i, TQTextStream &t, co { TQString names = l.left(pos); TQString descr = l.mid(pos + re.matchedLength()); - while ((pos = names.find(",")) != -1) + while ((pos = names.tqfind(",")) != -1) { i[names.left(pos++)] = descr; while (names[pos] == ' ') @@ -172,9 +172,9 @@ TQMap MANProtocol::buildIndexMap(const TQString §ion) TQStringList man_dirs = manDirectories(); // Supplementary places for whatis databases man_dirs += m_mandbpath; - if (man_dirs.find("/var/cache/man")==man_dirs.end()) + if (man_dirs.tqfind("/var/cache/man")==man_dirs.end()) man_dirs << "/var/cache/man"; - if (man_dirs.find("/var/catman")==man_dirs.end()) + if (man_dirs.tqfind("/var/catman")==man_dirs.end()) man_dirs << "/var/catman"; TQStringList names; @@ -238,14 +238,14 @@ TQStringList MANProtocol::manDirectories() && S_ISDIR( sbuf.st_mode ) ) { const TQString p = TQDir(dir).canonicalPath(); - if (!man_dirs.contains(p)) man_dirs += p; + if (!man_dirs.tqcontains(p)) man_dirs += p; } } } // Untranslated pages in "" const TQString p = TQDir(*it_dir).canonicalPath(); - if (!man_dirs.contains(p)) man_dirs += p; + if (!man_dirs.tqcontains(p)) man_dirs += p; } return man_dirs; } @@ -331,7 +331,7 @@ TQStringList MANProtocol::findPages(const TQString &_section, if (sect.lower()==it_real) it_real = sect; // Only add sect if not already contained, avoid duplicates - if (!sect_list.contains(sect) && _section.isEmpty()) { + if (!sect_list.tqcontains(sect) && _section.isEmpty()) { kdDebug() << "another section " << sect << endl; sect_list += sect; } @@ -425,11 +425,11 @@ static TQString text2html(const TQString& txt) { TQString reply = txt; - reply = reply.replace('&', "&"); - reply = reply.replace('<', "<"); - reply = reply.replace('>', ">"); - reply = reply.replace('"', "&dquot;"); - reply = reply.replace('\'', """); + reply = reply.tqreplace('&', "&"); + reply = reply.tqreplace('<', "<"); + reply = reply.tqreplace('>', ">"); + reply = reply.tqreplace('"', "&dquot;"); + reply = reply.tqreplace('\'', """); return reply; } @@ -534,7 +534,7 @@ char *MANProtocol::readManPage(const char *_filename) * If the path name constains the string sman, assume that it's SGML and * convert it to roff format (used on Solaris). */ //TQString file_mimetype = KMimeType::findByPath(TQString(filename), 0, false)->name(); - if (filename.contains("sman", false)) //file_mimetype == "text/html" || ) + if (filename.tqcontains("sman", false)) //file_mimetype == "text/html" || ) { myStdStream =TQString::null; KProcess proc; @@ -560,14 +560,14 @@ char *MANProtocol::readManPage(const char *_filename) kdDebug(7107) << "relative " << filename << endl; filename = TQDir::cleanDirPath(lastdir + "/" + filename).utf8(); if (!KStandardDirs::exists(filename)) { // exists perhaps with suffix - lastdir = filename.left(filename.findRev('/')); + lastdir = filename.left(filename.tqfindRev('/')); TQDir mandir(lastdir); - mandir.setNameFilter(filename.mid(filename.findRev('/') + 1) + ".*"); + mandir.setNameFilter(filename.mid(filename.tqfindRev('/') + 1) + ".*"); filename = lastdir + "/" + TQFile::encodeName(mandir.entryList().first()); } kdDebug(7107) << "resolved to " << filename << endl; } - lastdir = filename.left(filename.findRev('/')); + lastdir = filename.left(filename.tqfindRev('/')); myStdStream = TQString::null; KProcess proc; @@ -883,7 +883,7 @@ void MANProtocol::constructPath(TQStringList& constr_path, TQStringList constr_c } } /* sections are not used - else if ( section_regex.find(line, 0) == 0 ) + else if ( section_regex.tqfind(line, 0) == 0 ) { if ( !conf_section.isEmpty() ) conf_section += ':'; @@ -920,7 +920,7 @@ void MANProtocol::constructPath(TQStringList& constr_path, TQStringList constr_c int i = 0; while (manpaths[i]) { - if ( constr_path.findIndex( TQString( manpaths[i] ) ) == -1 ) + if ( constr_path.tqfindIndex( TQString( manpaths[i] ) ) == -1 ) constr_path += TQString( manpaths[i] ); i++; } @@ -944,35 +944,35 @@ void MANProtocol::constructPath(TQStringList& constr_path, TQStringList constr_c if ( !mandir.isEmpty() ) { // a path mapping exists - if ( constr_path.findIndex( mandir ) == -1 ) + if ( constr_path.tqfindIndex( mandir ) == -1 ) constr_path += mandir; } else { // no manpath mapping, use "/man" and "/../man" mandir = dir + TQString( "/man" ); - if ( constr_path.findIndex( mandir ) == -1 ) + if ( constr_path.tqfindIndex( mandir ) == -1 ) constr_path += mandir; - int pos = dir.findRev( '/' ); + int pos = dir.tqfindRev( '/' ); if ( pos > 0 ) { mandir = dir.left( pos ) + TQString("/man"); - if ( constr_path.findIndex( mandir ) == -1 ) + if ( constr_path.tqfindIndex( mandir ) == -1 ) constr_path += mandir; } } TQString catmandir = mandb_map[ mandir ]; if ( !mandir.isEmpty() ) { - if ( constr_catmanpath.findIndex( catmandir ) == -1 ) + if ( constr_catmanpath.tqfindIndex( catmandir ) == -1 ) constr_catmanpath += catmandir; } else { // What is the default mapping? catmandir = mandir; - catmandir.replace("/usr/share/","/var/cache/"); - if ( constr_catmanpath.findIndex( catmandir ) == -1 ) + catmandir.tqreplace("/usr/share/","/var/cache/"); + if ( constr_catmanpath.tqfindIndex( catmandir ) == -1 ) constr_catmanpath += catmandir; } } @@ -1001,7 +1001,7 @@ void MANProtocol::checkManPaths() if ( manpath_env.isEmpty() || manpath_env[0] == ':' || manpath_env[manpath_env.length()-1] == ':' - || manpath_env.contains( "::" ) ) + || manpath_env.tqcontains( "::" ) ) { construct_path = true; // need to read config file } @@ -1041,7 +1041,7 @@ void MANProtocol::checkManPaths() if ( !dir.isEmpty() ) { // Add dir to the man path if it exists - if ( m_manpath.findIndex( dir ) == -1 ) { + if ( m_manpath.tqfindIndex( dir ) == -1 ) { if ( ::stat( TQFile::encodeName( dir ), &sbuf ) == 0 && S_ISDIR( sbuf.st_mode ) ) { @@ -1060,7 +1060,7 @@ void MANProtocol::checkManPaths() dir = (*it2); if ( !dir.isEmpty() ) { - if ( m_manpath.findIndex( dir ) == -1 ) { + if ( m_manpath.tqfindIndex( dir ) == -1 ) { if ( ::stat( TQFile::encodeName( dir ), &sbuf ) == 0 && S_ISDIR( sbuf.st_mode ) ) { @@ -1080,7 +1080,7 @@ void MANProtocol::checkManPaths() { "1", "2", "3", "4", "5", "6", "7", "8", "9", "n", 0L }; for ( int i = 0; default_sect[i] != 0L; i++ ) - if ( m_mansect.findIndex( TQString( default_sect[i] ) ) == -1 ) + if ( m_mansect.tqfindIndex( TQString( default_sect[i] ) ) == -1 ) m_mansect += TQString( default_sect[i] ); */ @@ -1239,7 +1239,7 @@ void MANProtocol::showIndex(const TQString& section) stripExtension( &fileName ); - pos = fileName.findRev('/'); + pos = fileName.tqfindRev('/'); if (pos > 0) fileName = fileName.mid(pos+1); @@ -1253,7 +1253,7 @@ void MANProtocol::showIndex(const TQString& section) { os << "
    " << endl; } @@ -1384,12 +1384,12 @@ void MANProtocol::showIndex(const TQString& section) { struct man_index_t *manindex = indexlist[i]; - // qstrncmp(): + // tqstrncmp(): // "last_man" has already a \0 string ending, but // "manindex->manpage_begin" has not, // so do compare at most "manindex->manpage_len" of the strings. if (last_index->manpage_len == manindex->manpage_len && - !qstrncmp(last_index->manpage_begin, + !tqstrncmp(last_index->manpage_begin, manindex->manpage_begin, manindex->manpage_len) ) @@ -1415,7 +1415,7 @@ void MANProtocol::showIndex(const TQString& section) ((char *)manindex->manpage_begin)[manindex->manpage_len] = '\0'; os << manindex->manpage_begin << "" << endl; last_index = manindex; } @@ -1438,12 +1438,12 @@ void MANProtocol::showIndex(const TQString& section) { struct man_index_t *manindex = mit.current(); - // qstrncmp(): + // tqstrncmp(): // "last_man" has already a \0 string ending, but // "manindex->manpage_begin" has not, // so do compare at most "manindex->manpage_len" of the strings. if (last_index->manpage_len == manindex->manpage_len && - !qstrncmp(last_index->manpage_begin, + !tqstrncmp(last_index->manpage_begin, manindex->manpage_begin, manindex->manpage_len) ) @@ -1457,7 +1457,7 @@ void MANProtocol::showIndex(const TQString& section) manindex->manpage_begin[manindex->manpage_len] = '\0'; os << manindex->manpage_begin << "" << endl; last_index = manindex; } diff --git a/kioslave/man/kmanpart.cpp b/kioslave/man/kmanpart.cpp index b52085596..e48754a55 100644 --- a/kioslave/man/kmanpart.cpp +++ b/kioslave/man/kmanpart.cpp @@ -50,10 +50,10 @@ KManPartFactory::~KManPartFactory() delete s_about; } -KParts::Part* KManPartFactory::createPartObject( TQWidget * parentWidget, const char* /*widgetName*/, TQObject *, +KParts::Part* KManPartFactory::createPartObject( TQWidget * tqparentWidget, const char* /*widgetName*/, TQObject *, const char* name, const char* /*className*/,const TQStringList & ) { - KManPart* part = new KManPart(parentWidget, name ); + KManPart* part = new KManPart(tqparentWidget, name ); return part; } diff --git a/kioslave/man/kmanpart.h b/kioslave/man/kmanpart.h index f2d9e3891..92d51e18b 100644 --- a/kioslave/man/kmanpart.h +++ b/kioslave/man/kmanpart.h @@ -44,7 +44,7 @@ class KManPartFactory: public KParts::Factory KManPartFactory( TQObject * parent = 0, const char * name = 0 ); virtual ~KManPartFactory(); - virtual KParts::Part* createPartObject( TQWidget * parentWidget, const char * widgetName , + virtual KParts::Part* createPartObject( TQWidget * tqparentWidget, const char * widgetName , TQObject* parent, const char* name, const char * classname, const TQStringList &args); diff --git a/kioslave/man/man2html.cpp b/kioslave/man/man2html.cpp index 089ba239b..e9e0c1f19 100644 --- a/kioslave/man/man2html.cpp +++ b/kioslave/man/man2html.cpp @@ -822,7 +822,7 @@ static void add_links(char *c) e=h+1; sec=f[1]; subsec=f[2]; - int index = fstr.find(')', 2); + int index = fstr.tqfind(')', 2); if (index != -1) subsec = fstr.mid(2, index - 2); else // No closing ')' found, take first character as subsection. @@ -882,7 +882,7 @@ static void add_links(char *c) if (g-7>=c && g[-1]==':') { // We have perhaps an email address starting with mailto: - if (!qstrncmp("mailto:",g-7,7)) + if (!tqstrncmp("mailto:",g-7,7)) g-=7; } h=f+1; @@ -1166,7 +1166,7 @@ static TQCString scan_named_character( char*& c ) { TQCString cstr; c = scan_escape_direct( c+1, cstr ); - const int result = cstr.find(']'); + const int result = cstr.tqfind(']'); if ( result == -1 ) name += cstr; else @@ -1198,7 +1198,7 @@ static TQCString scan_named_character( char*& c ) { TQCString cstr; c = scan_escape_direct( c+1, cstr ); - const int result = cstr.find('\''); + const int result = cstr.tqfind('\''); if ( result == -1 ) name += cstr; else @@ -1223,7 +1223,7 @@ static TQCString scan_named_character( char*& c ) // Note: characters with a one character length name doe not exist, as they would collide with other escapes // Now we have the name, let us find it between the string names - TQMap::iterator it=s_characterDefinitionMap.find(name); + TQMap::iterator it=s_characterDefinitionMap.tqfind(name); if (it==s_characterDefinitionMap.end()) { kdDebug(7107) << "EXCEPTION: cannot find character with name: " << name << endl; @@ -1270,7 +1270,7 @@ static TQCString scan_named_string(char*& c) { TQCString cstr; c = scan_escape_direct( c+1, cstr ); - const int result = cstr.find(']'); + const int result = cstr.tqfind(']'); if ( result == -1 ) name += cstr; else @@ -1299,7 +1299,7 @@ static TQCString scan_named_string(char*& c) c++; } // Now we have the name, let us find it between the string names - TQMap::iterator it=s_stringDefinitionMap.find(name); + TQMap::iterator it=s_stringDefinitionMap.tqfind(name); if (it==s_stringDefinitionMap.end()) { kdDebug(7107) << "EXCEPTION: cannot find string with name: " << name << endl; @@ -1514,7 +1514,7 @@ static int scan_number_register( char*& c) } else { - TQMap< TQCString, NumberDefinition >::iterator it = s_numberDefinitionMap.find( name ); + TQMap< TQCString, NumberDefinition >::iterator it = s_numberDefinitionMap.tqfind( name ); if ( it == s_numberDefinitionMap.end() ) { return 0; // Undefined variable @@ -1560,7 +1560,7 @@ static TQCString scan_named_font( char*& c ) { TQCString cstr; c = scan_escape_direct( c+1, cstr ); - const int result = cstr.find(']'); + const int result = cstr.tqfind(']'); if ( result == -1 ) name += cstr; else @@ -2085,7 +2085,7 @@ static char *scan_table(char *c) /* scan table options */ while (c::iterator it=s_stringDefinitionMap.find(macroName); + TQMap::iterator it=s_stringDefinitionMap.tqfind(macroName); if (it!=s_stringDefinitionMap.end()) { kdDebug(7107) << "CALLING MACRO: " << macroName << endl; @@ -3237,11 +3237,11 @@ static char *scan_request(char *c) while (*c && *c!='\n') c++; c++; h=c; - while (*c && qstrncmp(c,".di",3)) while (*c && *c++!='\n'); + while (*c && tqstrncmp(c,".di",3)) while (*c && *c++!='\n'); *c='\0'; char* result=0; scan_troff(h,0,&result); - TQMap::iterator it=s_stringDefinitionMap.find(name); + TQMap::iterator it=s_stringDefinitionMap.tqfind(name); if (it==s_stringDefinitionMap.end()) { StringDefinition def; @@ -3276,7 +3276,7 @@ static char *scan_request(char *c) curpos=0; char* result=0; c=scan_troff(c,1,&result); - TQMap::iterator it=s_stringDefinitionMap.find(name); + TQMap::iterator it=s_stringDefinitionMap.tqfind(name); if (it==s_stringDefinitionMap.end()) { StringDefinition def; @@ -3358,7 +3358,7 @@ static char *scan_request(char *c) { char *line=NULL; c=scan_troff(c,1, &line); - if (line && qstrncmp(line, "
    ", 4)) + if (line && tqstrncmp(line, "
    ", 4)) { out_html(line); out_html("
    \n"); @@ -3489,7 +3489,7 @@ static char *scan_request(char *c) while (*c && *c!='\n') c++,i++; } c++; - while (*c && qstrncmp(c,endwith,i)) while (*c++!='\n'); + while (*c && tqstrncmp(c,endwith,i)) while (*c++!='\n'); while (*c && *c++!='\n'); break; } @@ -4015,7 +4015,7 @@ static char *scan_request(char *c) out_html("\n

    "); else out_html("\n

    "); - mandoc_synopsis = qstrncmp(c, "SYNOPSIS", 8) == 0; + mandoc_synopsis = tqstrncmp(c, "SYNOPSIS", 8) == 0; c = mandoc_command ? scan_troff_mandoc(c,1,NULL) : scan_troff(c,1,NULL); if (mode) out_html("

    \n"); @@ -4064,8 +4064,8 @@ static char *scan_request(char *c) { if (wordlist[i][0] == '\007') wordlist[i]++; - if (wordlist[i][qstrlen(wordlist[i])-1] == '\007') - wordlist[i][qstrlen(wordlist[i])-1] = 0; + if (wordlist[i][tqstrlen(wordlist[i])-1] == '\007') + wordlist[i][tqstrlen(wordlist[i])-1] = 0; } output_possible=true; out_html( DOCTYPE"\n\n"); @@ -4147,7 +4147,7 @@ static char *scan_request(char *c) out_html(set_font("I")); if (words>1) wordlist[1][-1]='\0'; const char *c2=lookup_abbrev(wordlist[0]); - curpos+=qstrlen(c2); + curpos+=tqstrlen(c2); out_html(c2); out_html(set_font("R")); if (words>1) @@ -4181,7 +4181,7 @@ static char *scan_request(char *c) } } c=skip_till_newline(c); - TQMap::iterator it=s_stringDefinitionMap.find(name); + TQMap::iterator it=s_stringDefinitionMap.tqfind(name); if (it==s_stringDefinitionMap.end()) { kdDebug(7107) << "EXCEPTION: cannot find string to rename or remove: " << name << endl; @@ -4240,7 +4240,7 @@ static char *scan_request(char *c) c=scan_expression( c, &increment ); } c = skip_till_newline( c ); - TQMap ::iterator it = s_numberDefinitionMap.find( name ); + TQMap ::iterator it = s_numberDefinitionMap.tqfind( name ); if ( it == s_numberDefinitionMap.end() ) { if ( sign < 1 ) @@ -4293,8 +4293,8 @@ static char *scan_request(char *c) } c = next_line; sl=c; - const int length=qstrlen(endmacro); - while (*c && qstrncmp(c,endmacro,length)) + const int length=tqstrlen(endmacro); + while (*c && tqstrncmp(c,endmacro,length)) c=skip_till_newline(c); TQCString macro; @@ -4310,7 +4310,7 @@ static char *scan_request(char *c) sl++; } - TQMap::iterator it=s_stringDefinitionMap.find(name); + TQMap::iterator it=s_stringDefinitionMap.tqfind(name); if (it==s_stringDefinitionMap.end()) { StringDefinition def; @@ -4322,7 +4322,8 @@ static char *scan_request(char *c) { // .am Append Macro (*it).m_length=0; // It could be formerly a string - if ((*it).m_output.right(1)!='\n') +// if ((*it).m_output.right(1)!='\n') + if (*((*it).m_output.right(1).data())!='\n') (*it).m_output+='\n'; (*it).m_output+=macro; } @@ -4401,7 +4402,7 @@ static char *scan_request(char *c) case REQ_It: // mdoc(7) "list ITem" { c=c+j; - if (qstrncmp(c, "Xo", 2) == 0 && isspace(*(c+2))) + if (tqstrncmp(c, "Xo", 2) == 0 && isspace(*(c+2))) c = skip_till_newline(c); if (dl_set[itemdepth] & BL_DESC_LIST) { @@ -5090,7 +5091,7 @@ static char *scan_request(char *c) break; } // Second parametr is origin (unlike in .rn) - TQMap::iterator it=s_stringDefinitionMap.find(name2); + TQMap::iterator it=s_stringDefinitionMap.tqfind(name2); if (it==s_stringDefinitionMap.end()) { kdDebug(7107) << "EXCEPTION: cannot find string to make alias: " << name2 << endl; @@ -5114,7 +5115,7 @@ static char *scan_request(char *c) break; } c = skip_till_newline( c ); - TQMap ::iterator it = s_numberDefinitionMap.find( name ); + TQMap ::iterator it = s_numberDefinitionMap.tqfind( name ); if ( it == s_numberDefinitionMap.end() ) { kdDebug(7107) << "EXCEPTION: trying to remove inexistant number register: " << endl; @@ -5144,7 +5145,7 @@ static char *scan_request(char *c) break; } c = skip_till_newline( c ); - TQMap::iterator it=s_numberDefinitionMap.find(name); + TQMap::iterator it=s_numberDefinitionMap.tqfind(name); if (it==s_numberDefinitionMap.end()) { kdDebug(7107) << "EXCEPTION: cannot find number register to rename: " << name << endl; @@ -5188,7 +5189,7 @@ static char *scan_request(char *c) break; } // Second parametr is origin (unlike in .rnn) - TQMap::iterator it=s_numberDefinitionMap.find(name2); + TQMap::iterator it=s_numberDefinitionMap.tqfind(name2); if (it==s_numberDefinitionMap.end()) { kdDebug(7107) << "EXCEPTION: cannot find string to make alias: " << name2 << endl; @@ -5303,7 +5304,7 @@ static char *scan_troff(char *c, bool san, char **result) if (result) { if (*result) { buffer=*result; - buffpos=qstrlen(buffer); + buffpos=tqstrlen(buffer); buffmax=buffpos; } else { buffer = stralloc(LARGE_STR_MAX); @@ -5528,7 +5529,7 @@ void scan_man_page(const char *man_page) s_dollarZero = ""; // No macro called yet! output_possible = false; - int strLength = qstrlen(man_page); + int strLength = tqstrlen(man_page); char *buf = new char[strLength + 2]; qstrcpy(buf+1, man_page); buf[0] = '\n'; diff --git a/kioslave/media/kcmodule/managermoduleview.ui b/kioslave/media/kcmodule/managermoduleview.ui index 598718389..d5d42a066 100644 --- a/kioslave/media/kcmodule/managermoduleview.ui +++ b/kioslave/media/kcmodule/managermoduleview.ui @@ -1,6 +1,6 @@ ManagerModuleView - + ManagerModuleView @@ -16,7 +16,7 @@ unnamed - + kcfg_HalBackendEnabled @@ -27,7 +27,7 @@ Select this if you want to enable the Hardware Abstraction Layer (http://hal.freedesktop.org/wiki/Software/hal) support. - + kcfg_CdPollingEnabled @@ -38,7 +38,7 @@ Select this to enable the CD polling. - + kcfg_AutostartEnabled @@ -59,7 +59,7 @@ Expanding - + 21 360 diff --git a/kioslave/media/kcmodule/mimetypelistboxitem.h b/kioslave/media/kcmodule/mimetypelistboxitem.h index f61afba3d..e02f58b11 100644 --- a/kioslave/media/kcmodule/mimetypelistboxitem.h +++ b/kioslave/media/kcmodule/mimetypelistboxitem.h @@ -1,6 +1,6 @@ /* This file is part of the KDE Project Copyright (c) 2005 Jean-Remy Falleri - Copyright (c) 2005 Kévin Ottens + Copyright (c) 2005 K�vin Ottens This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -23,7 +23,7 @@ #include #include -class MimetypeListBoxItem : public QListBoxText +class MimetypeListBoxItem : public TQListBoxText { public: MimetypeListBoxItem(const TQString &mimetype, TQListBox *parent); diff --git a/kioslave/media/kcmodule/notifiermodule.cpp b/kioslave/media/kcmodule/notifiermodule.cpp index c7871c953..5c4e4c357 100644 --- a/kioslave/media/kcmodule/notifiermodule.cpp +++ b/kioslave/media/kcmodule/notifiermodule.cpp @@ -159,7 +159,7 @@ void NotifierModule::slotAdd() if ( value == TQDialog::Accepted ) { - m_settings.addAction( action ); + m_settings.tqaddAction( action ); updateListBox(); emit changed( true ); } @@ -212,7 +212,7 @@ void NotifierModule::slotToggleAuto() int index = m_view->actionsList->index( action_item ); - if ( action->autoMimetypes().contains( m_mimetype ) ) + if ( action->autoMimetypes().tqcontains( m_mimetype ) ) { m_settings.resetAutoAction( m_mimetype ); } diff --git a/kioslave/media/kcmodule/notifiermoduleview.ui b/kioslave/media/kcmodule/notifiermoduleview.ui index 87edc0f36..50f93bc40 100644 --- a/kioslave/media/kcmodule/notifiermoduleview.ui +++ b/kioslave/media/kcmodule/notifiermoduleview.ui @@ -1,6 +1,6 @@ NotifierModuleView - + NotifierModuleView @@ -16,7 +16,7 @@ unnamed - + layout4 @@ -24,7 +24,7 @@ unnamed - + layout2 @@ -32,7 +32,7 @@ unnamed - + mediumType @@ -66,7 +66,7 @@ - + layout3 @@ -74,7 +74,7 @@ unnamed - + layout1 @@ -138,7 +138,7 @@ Expanding - + 70 101 diff --git a/kioslave/media/kcmodule/serviceconfigdialog.cpp b/kioslave/media/kcmodule/serviceconfigdialog.cpp index 61dd060f2..76b342f92 100644 --- a/kioslave/media/kcmodule/serviceconfigdialog.cpp +++ b/kioslave/media/kcmodule/serviceconfigdialog.cpp @@ -63,7 +63,7 @@ ServiceConfigDialog::ServiceConfigDialog(NotifierServiceAction *action, { TQListBox *list; - if ( action_mimetypes.contains( *it ) ) + if ( action_mimetypes.tqcontains( *it ) ) { list = m_view->mimetypesSelector->selectedListBox(); } diff --git a/kioslave/media/kcmodule/serviceview.ui b/kioslave/media/kcmodule/serviceview.ui index 938a9bf89..6ae357699 100644 --- a/kioslave/media/kcmodule/serviceview.ui +++ b/kioslave/media/kcmodule/serviceview.ui @@ -1,6 +1,6 @@ ServiceView - + ServiceView @@ -20,7 +20,7 @@ 0 - + 640 480 @@ -33,7 +33,7 @@ unnamed - + groupBox1 @@ -52,7 +52,7 @@ unnamed - + layout8 @@ -60,7 +60,7 @@ unnamed - + layout6 @@ -80,13 +80,13 @@ 0 - + 40 40 - + 40 40 @@ -99,7 +99,7 @@ 32 - + layout5 @@ -117,7 +117,7 @@ Minimum - + 20 20 @@ -147,7 +147,7 @@ Minimum - + 20 21 @@ -194,7 +194,7 @@ false - + layout7 diff --git a/kioslave/media/kfile-plugin/kfilemediaplugin.cpp b/kioslave/media/kfile-plugin/kfilemediaplugin.cpp index bda34bff2..580a678bc 100644 --- a/kioslave/media/kfile-plugin/kfilemediaplugin.cpp +++ b/kioslave/media/kfile-plugin/kfilemediaplugin.cpp @@ -140,7 +140,7 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) group = appendGroup(info, "mediumSummary"); - appendItem(group, "percent", TQString("%1%").arg(percent)); + appendItem(group, "percent", TQString("%1%").tqarg(percent)); TQPixmap bar(150, 20); TQPainter p(&bar); @@ -148,9 +148,9 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) p.fillRect(0, 0, length, 20, Qt::red); p.fillRect(length, 0, 150-length, 20, Qt::green); - TQColorGroup cg = TQApplication::palette().active(); + TQColorGroup cg = TQApplication::tqpalette().active(); - TQApplication::style().drawPrimitive(TQStyle::PE_Panel, &p, + TQApplication::tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &p, TQRect(0, 0, 150, 20), cg, TQStyle::Style_Sunken); diff --git a/kioslave/media/libmediacommon/actionlistboxitem.cpp b/kioslave/media/libmediacommon/actionlistboxitem.cpp index 271d2e487..42a724c75 100644 --- a/kioslave/media/libmediacommon/actionlistboxitem.cpp +++ b/kioslave/media/libmediacommon/actionlistboxitem.cpp @@ -29,7 +29,7 @@ ActionListBoxItem::ActionListBoxItem(NotifierAction *action, TQString mimetype, { TQString text = m_action->label(); - if ( m_action->autoMimetypes().contains( mimetype ) ) + if ( m_action->autoMimetypes().tqcontains( mimetype ) ) { text += " (" + i18n( "Auto Action" ) + ")"; } diff --git a/kioslave/media/libmediacommon/actionlistboxitem.h b/kioslave/media/libmediacommon/actionlistboxitem.h index 0378e1d6f..254f065de 100644 --- a/kioslave/media/libmediacommon/actionlistboxitem.h +++ b/kioslave/media/libmediacommon/actionlistboxitem.h @@ -1,6 +1,6 @@ /* This file is part of the KDE Project Copyright (c) 2005 Jean-Remy Falleri - Copyright (c) 2005 Kévin Ottens + Copyright (c) 2005 K�vin Ottens This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -25,7 +25,7 @@ #include "notifieraction.h" -class ActionListBoxItem : public QListBoxPixmap +class ActionListBoxItem : public TQListBoxPixmap { public: ActionListBoxItem(NotifierAction *action, TQString mimetype, TQListBox *parent); diff --git a/kioslave/media/libmediacommon/medium.cpp b/kioslave/media/libmediacommon/medium.cpp index e7e91dd54..2aa7359ad 100644 --- a/kioslave/media/libmediacommon/medium.cpp +++ b/kioslave/media/libmediacommon/medium.cpp @@ -109,7 +109,7 @@ Medium::List Medium::createList(const TQStringList &properties) l.append(m); TQStringList::iterator first = props.begin(); - TQStringList::iterator last = props.find(SEPARATOR); + TQStringList::iterator last = props.tqfind(SEPARATOR); ++last; props.erase(first, last); } diff --git a/kioslave/media/libmediacommon/medium.h b/kioslave/media/libmediacommon/medium.h index 54e1556dc..eeef12eb2 100644 --- a/kioslave/media/libmediacommon/medium.h +++ b/kioslave/media/libmediacommon/medium.h @@ -109,8 +109,8 @@ namespace MediaManagerUtils { for (TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it) { - TQString key = (*it).left((*it).find('=')); - TQString value = (*it).mid((*it).find('=') + 1); + TQString key = (*it).left((*it).tqfind('=')); + TQString value = (*it).mid((*it).tqfind('=') + 1); valids[key] = value; } return valids; diff --git a/kioslave/media/libmediacommon/notifieraction.cpp b/kioslave/media/libmediacommon/notifieraction.cpp index d10314701..9a6572150 100644 --- a/kioslave/media/libmediacommon/notifieraction.cpp +++ b/kioslave/media/libmediacommon/notifieraction.cpp @@ -69,7 +69,7 @@ TQString NotifierAction::label() const void NotifierAction::addAutoMimetype( const TQString &mimetype ) { - if ( !m_autoMimetypes.contains( mimetype ) ) + if ( !m_autoMimetypes.tqcontains( mimetype ) ) { m_autoMimetypes.append( mimetype ); } diff --git a/kioslave/media/libmediacommon/notifieropenaction.cpp b/kioslave/media/libmediacommon/notifieropenaction.cpp index 4d6d8025c..01c8b010f 100644 --- a/kioslave/media/libmediacommon/notifieropenaction.cpp +++ b/kioslave/media/libmediacommon/notifieropenaction.cpp @@ -40,6 +40,6 @@ void NotifierOpenAction::execute(KFileItem &medium) bool NotifierOpenAction::supportsMimetype( const TQString &mimetype ) const { - return !mimetype.contains( "blank" ) && !mimetype.contains( "encrypted" ); + return !mimetype.tqcontains( "blank" ) && !mimetype.tqcontains( "encrypted" ); } diff --git a/kioslave/media/libmediacommon/notifierserviceaction.cpp b/kioslave/media/libmediacommon/notifierserviceaction.cpp index c7bece4f8..8cf916848 100644 --- a/kioslave/media/libmediacommon/notifierserviceaction.cpp +++ b/kioslave/media/libmediacommon/notifierserviceaction.cpp @@ -99,7 +99,7 @@ void NotifierServiceAction::updateFilePath() if ( !m_filePath.isEmpty() ) return; TQString action_name = m_service.m_strName; - action_name.replace( " ", "_" ); + action_name.tqreplace( " ", "_" ); TQDir actions_dir( locateLocal( "data", "konqueror/servicemenus/", true ) ); @@ -144,7 +144,7 @@ bool NotifierServiceAction::isWritable() const bool NotifierServiceAction::supportsMimetype(const TQString &mimetype) const { - return m_mimetypes.contains(mimetype); + return m_mimetypes.tqcontains(mimetype); } void NotifierServiceAction::save() const diff --git a/kioslave/media/libmediacommon/notifiersettings.cpp b/kioslave/media/libmediacommon/notifiersettings.cpp index d1ab55d87..fd0aefc67 100644 --- a/kioslave/media/libmediacommon/notifiersettings.cpp +++ b/kioslave/media/libmediacommon/notifiersettings.cpp @@ -109,9 +109,9 @@ TQValueList NotifierSettings::actionsForMimetype( const TQStrin return result; } -bool NotifierSettings::addAction( NotifierServiceAction *action ) +bool NotifierSettings::tqaddAction( NotifierServiceAction *action ) { - if ( !m_idMap.contains( action->id() ) ) + if ( !m_idMap.tqcontains( action->id() ) ) { m_actions.insert( --m_actions.end(), action ); m_idMap[ action->id() ] = action; @@ -153,7 +153,7 @@ void NotifierSettings::setAutoAction( const TQString &mimetype, NotifierAction * void NotifierSettings::resetAutoAction( const TQString &mimetype ) { - if ( m_autoMimetypesMap.contains( mimetype ) ) + if ( m_autoMimetypesMap.tqcontains( mimetype ) ) { NotifierAction *action = m_autoMimetypesMap[mimetype]; action->removeAutoMimetype( mimetype ); @@ -179,7 +179,7 @@ void NotifierSettings::clearAutoActions() NotifierAction *NotifierSettings::autoActionForMimetype( const TQString &mimetype ) { - if ( m_autoMimetypesMap.contains( mimetype ) ) + if ( m_autoMimetypesMap.tqcontains( mimetype ) ) { return m_autoMimetypesMap[mimetype]; } @@ -238,7 +238,7 @@ void NotifierSettings::reload() TQString mime = auto_it.key(); TQString action_id = auto_it.data(); - if ( m_idMap.contains( action_id ) ) + if ( m_idMap.tqcontains( action_id ) ) { setAutoAction( mime, m_idMap[action_id] ); } @@ -349,7 +349,7 @@ bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString } } } - else if ( types.contains(mimetype) ) + else if ( types.tqcontains(mimetype) ) { return true; } diff --git a/kioslave/media/libmediacommon/notifiersettings.h b/kioslave/media/libmediacommon/notifiersettings.h index dee5c440b..a1f46f961 100644 --- a/kioslave/media/libmediacommon/notifiersettings.h +++ b/kioslave/media/libmediacommon/notifiersettings.h @@ -36,7 +36,7 @@ public: TQValueList actions(); TQValueList actionsForMimetype( const TQString &mimetype ); - bool addAction( NotifierServiceAction *action ); + bool tqaddAction( NotifierServiceAction *action ); bool deleteAction( NotifierServiceAction *action ); void setAutoAction( const TQString &mimetype, NotifierAction *action ); diff --git a/kioslave/media/mediaimpl.cpp b/kioslave/media/mediaimpl.cpp index b55b37e5d..c097fcca4 100644 --- a/kioslave/media/mediaimpl.cpp +++ b/kioslave/media/mediaimpl.cpp @@ -43,7 +43,7 @@ bool MediaImpl::parseURL(const KURL &url, TQString &name, TQString &path) const { TQString url_path = url.path(); - int i = url_path.find('/', 1); + int i = url_path.tqfind('/', 1); if (i > 0) { name = url_path.mid(1, i-1); @@ -267,7 +267,7 @@ bool MediaImpl::ensureMediumMounted(Medium &medium) if (!m_lastErrorMessage.isEmpty()) m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; else { - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } mp_mounting = 0L; @@ -304,7 +304,7 @@ void MediaImpl::slotMountResult(KIO::Job *job) { m_lastErrorCode = job->error(); m_lastErrorMessage = job->errorText(); - qApp->eventLoop()->exitLoop(); + tqApp->eventLoop()->exitLoop(); } } @@ -317,7 +317,7 @@ void MediaImpl::slotMediumChanged(const TQString &name) kdDebug(1219) << "MediaImpl::slotMediumChanged: updating mp_mounting" << endl; bool ok; *mp_mounting = findMediumByName(name, ok); - qApp->eventLoop()->exitLoop(); + tqApp->eventLoop()->exitLoop(); } } @@ -351,7 +351,7 @@ void MediaImpl::slotStatResult(KIO::Job *job) m_entryBuffer = stat_job->statResult(); } - qApp->eventLoop()->exitLoop(); + tqApp->eventLoop()->exitLoop(); } KIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url) @@ -364,7 +364,7 @@ KIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url) this, TQT_SLOT( slotStatResult(KIO::Job *) ) ); connect( job, TQT_SIGNAL( warning( KIO::Job *, const TQString & ) ), this, TQT_SLOT( slotWarning( KIO::Job *, const TQString & ) ) ); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); KIO::UDSEntry::iterator it = m_entryBuffer.begin(); KIO::UDSEntry::iterator end = m_entryBuffer.end(); diff --git a/kioslave/media/mediamanager/fstabbackend.cpp b/kioslave/media/mediamanager/fstabbackend.cpp index 189f52aee..71dbdb1f0 100644 --- a/kioslave/media/mediamanager/fstabbackend.cpp +++ b/kioslave/media/mediamanager/fstabbackend.cpp @@ -137,24 +137,24 @@ bool inExclusionPattern(KMountPoint *mount, bool networkSharesOnly) || mount->mountType() == "fdescfs" || mount->mountType() == "kernfs" || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) + || mount->mountType().tqcontains( "proc" ) || mount->mountType() == "unknown" || mount->mountType() == "none" || mount->mountType() == "sunrpc" || mount->mountedFrom() == "none" || mount->mountedFrom() == "tmpfs" - || mount->mountedFrom().find("shm") != -1 + || mount->mountedFrom().tqfind("shm") != -1 || mount->mountPoint() == "/dev/swap" || mount->mountPoint() == "/dev/pts" - || mount->mountPoint().find("/proc") == 0 - || mount->mountPoint().find("/sys") == 0 + || mount->mountPoint().tqfind("/proc") == 0 + || mount->mountPoint().tqfind("/sys") == 0 // We might want to display only network shares // since HAL doesn't handle them || ( networkSharesOnly - && mount->mountType().find( "smb" ) == -1 - && mount->mountType().find( "cifs" ) == -1 - && mount->mountType().find( "nfs" ) == -1 + && mount->mountType().tqfind( "smb" ) == -1 + && mount->mountType().tqfind( "cifs" ) == -1 + && mount->mountType().tqfind( "nfs" ) == -1 ) ) { @@ -187,7 +187,7 @@ void FstabBackend::handleMtabChange(bool allowNotification) nothing has changed, do not stat the mount point. Avoids hang if network shares are stalling */ TQString mtabEntry = dev + "*" + mp + "*" + fs; - if(m_mtabEntries.contains(mtabEntry)) { + if(m_mtabEntries.tqcontains(mtabEntry)) { new_mtabIds += m_mtabEntries[mtabEntry]; continue; } @@ -196,7 +196,7 @@ void FstabBackend::handleMtabChange(bool allowNotification) new_mtabIds+=id; m_mtabEntries[mtabEntry] = id; - if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) + if ( !m_mtabIds.tqcontains(id) && m_fstabIds.tqcontains(id) ) { TQString mime, icon, label; guess(dev, mp, fs, true, mime, icon, label); @@ -204,7 +204,7 @@ void FstabBackend::handleMtabChange(bool allowNotification) mime, icon, label); } #if 0 - else if ( !m_mtabIds.contains(id) ) + else if ( !m_mtabIds.tqcontains(id) ) { TQString name = generateName(dev, fs); @@ -229,7 +229,7 @@ void FstabBackend::handleMtabChange(bool allowNotification) for (; it2!=end2; ++it2) { - if ( !new_mtabIds.contains(*it2) && m_fstabIds.contains(*it2) ) + if ( !new_mtabIds.tqcontains(*it2) && m_fstabIds.tqcontains(*it2) ) { const Medium *medium = m_mediaList.findById(*it2); @@ -248,7 +248,7 @@ void FstabBackend::handleMtabChange(bool allowNotification) mime, icon, label); } #if 0 - else if ( !new_mtabIds.contains(*it2) ) + else if ( !new_mtabIds.tqcontains(*it2) ) { m_mediaList.removeMedium(*it2, allowNotification); } @@ -277,7 +277,7 @@ void FstabBackend::handleFstabChange(bool allowNotification) TQString id = generateId(dev, mp); new_fstabIds+=id; - if ( !m_fstabIds.contains(id) ) + if ( !m_fstabIds.tqcontains(id) ) { TQString name = generateName(dev, fs); @@ -301,7 +301,7 @@ void FstabBackend::handleFstabChange(bool allowNotification) for (; it2!=end2; ++it2) { - if ( !new_fstabIds.contains(*it2) ) + if ( !new_fstabIds.tqcontains(*it2) ) { m_mediaList.removeMedium(*it2, allowNotification); } @@ -317,8 +317,8 @@ TQString FstabBackend::generateId(const TQString &devNode, TQString m = KStandardDirs::realPath(mountPoint); return "/org/kde/mediamanager/fstab/" - +d.replace("/", "") - +m.replace("/", ""); + +d.tqreplace("/", "") + +m.tqreplace("/", ""); } TQString FstabBackend::generateName(const TQString &devNode, const TQString &fsType) @@ -363,7 +363,7 @@ void FstabBackend::guess(const TQString &devNode, const TQString &mountPoint, { TQString buf; m.readLine(buf, 1024); - if(buf.contains("cdrom")) + if(buf.tqcontains("cdrom")) isCd=true; m.close(); } @@ -387,37 +387,37 @@ void FstabBackend::guess(const TQString &devNode, const TQString &mountPoint, } #endif if ( devType == CDWRITER - || devNode.find("cdwriter")!=-1 || mountPoint.find("cdwriter")!=-1 - || devNode.find("cdrecorder")!=-1 || mountPoint.find("cdrecorder")!=-1 - || devNode.find("cdburner")!=-1 || mountPoint.find("cdburner")!=-1 - || devNode.find("cdrw")!=-1 || mountPoint.find("cdrw")!=-1 - || devNode.find("graveur")!=-1 + || devNode.tqfind("cdwriter")!=-1 || mountPoint.tqfind("cdwriter")!=-1 + || devNode.tqfind("cdrecorder")!=-1 || mountPoint.tqfind("cdrecorder")!=-1 + || devNode.tqfind("cdburner")!=-1 || mountPoint.tqfind("cdburner")!=-1 + || devNode.tqfind("cdrw")!=-1 || mountPoint.tqfind("cdrw")!=-1 + || devNode.tqfind("graveur")!=-1 ) { mimeType = "media/cdwriter"; label = i18n("CD Recorder"); } else if ( devType == DVD || devType == DVDWRITER - || devNode.find("dvd")!=-1 || mountPoint.find("dvd")!=-1 ) + || devNode.tqfind("dvd")!=-1 || mountPoint.tqfind("dvd")!=-1 ) { mimeType = "media/dvd"; label = i18n("DVD"); } else if ( devType == CD - || devNode.find("cdrom")!=-1 || mountPoint.find("cdrom")!=-1 + || devNode.tqfind("cdrom")!=-1 || mountPoint.tqfind("cdrom")!=-1 // LINUX SPECIFIC - || devNode.find("/dev/scd")!=-1 || devNode.find("/dev/sr")!=-1 + || devNode.tqfind("/dev/scd")!=-1 || devNode.tqfind("/dev/sr")!=-1 // FREEBSD SPECIFIC - || devNode.find("/acd")!=-1 || devNode.find("/scd")!=-1 + || devNode.tqfind("/acd")!=-1 || devNode.tqfind("/scd")!=-1 ) { mimeType = "media/cdrom"; label = i18n("CD-ROM"); } - else if ( devNode.find("fd")!=-1 || mountPoint.find("fd")!=-1 - || devNode.find("floppy")!=-1 || mountPoint.find("floppy")!=-1 ) + else if ( devNode.tqfind("fd")!=-1 || mountPoint.tqfind("fd")!=-1 + || devNode.tqfind("floppy")!=-1 || mountPoint.tqfind("floppy")!=-1 ) { - if ( devNode.find("360")!=-1 || devNode.find("1200")!=-1 ) + if ( devNode.tqfind("360")!=-1 || devNode.tqfind("1200")!=-1 ) { mimeType = "media/floppy5"; } @@ -427,32 +427,32 @@ void FstabBackend::guess(const TQString &devNode, const TQString &mountPoint, } label = i18n("Floppy"); } - else if ( mountPoint.find("zip")!=-1 + else if ( mountPoint.tqfind("zip")!=-1 // FREEBSD SPECIFIC - || devNode.find("/afd")!=-1 + || devNode.tqfind("/afd")!=-1 ) { mimeType = "media/zip"; label = i18n("Zip Disk"); } - else if ( mountPoint.find("removable")!=-1 - || mountPoint.find("hotplug")!=-1 - || mountPoint.find("usb")!=-1 - || mountPoint.find("firewire")!=-1 - || mountPoint.find("ieee1394")!=-1 - || devNode.find("/usb/")!= -1 + else if ( mountPoint.tqfind("removable")!=-1 + || mountPoint.tqfind("hotplug")!=-1 + || mountPoint.tqfind("usb")!=-1 + || mountPoint.tqfind("firewire")!=-1 + || mountPoint.tqfind("ieee1394")!=-1 + || devNode.tqfind("/usb/")!= -1 ) { mimeType = "media/removable"; label = i18n("Removable Device"); } - else if ( fsType.find("nfs")!=-1 ) + else if ( fsType.tqfind("nfs")!=-1 ) { mimeType = "media/nfs"; label = i18n("Remote Share"); } - else if ( fsType.find("smb")!=-1 || fsType.find("cifs")!=-1 - || devNode.find("//")!=-1 ) + else if ( fsType.tqfind("smb")!=-1 || fsType.tqfind("cifs")!=-1 + || devNode.tqfind("//")!=-1 ) { mimeType = "media/smb"; label = i18n("Remote Share"); diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp index 7b56d46ad..d44826590 100644 --- a/kioslave/media/mediamanager/halbackend.cpp +++ b/kioslave/media/mediamanager/halbackend.cpp @@ -447,7 +447,7 @@ const char* HALBackend::findMediumUdiFromUdi(const char* udi) void HALBackend::ResetProperties(const char* mediumUdi, bool allowNotification) { kdDebug(1219) << "HALBackend::setProperties" << endl; - if ( TQString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) + if ( TQString::tqfromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) { const Medium *cmedium = m_mediaList.findById(mediumUdi); if ( cmedium ) @@ -942,7 +942,7 @@ TQStringList HALBackend::mountoptions(const TQString &name) result << TQString("automount=%1").arg(value ? "true" : "false"); - if (valids.contains("ro")) + if (valids.tqcontains("ro")) { value = config.readBoolEntry("ro", false); tmp = TQString("ro=%1").arg(value ? "true" : "false"); @@ -950,7 +950,7 @@ TQStringList HALBackend::mountoptions(const TQString &name) result << tmp; } - if (valids.contains("quiet")) + if (valids.tqcontains("quiet")) { value = config.readBoolEntry("quiet", false); tmp = TQString("quiet=%1").arg(value ? "true" : "false"); @@ -958,28 +958,28 @@ TQStringList HALBackend::mountoptions(const TQString &name) result << tmp; } - if (valids.contains("flush")) + if (valids.tqcontains("flush")) { value = config.readBoolEntry("flush", fstype.endsWith("fat")); tmp = TQString("flush=%1").arg(value ? "true" : "false"); result << tmp; } - if (valids.contains("uid")) + if (valids.tqcontains("uid")) { value = config.readBoolEntry("uid", true); tmp = TQString("uid=%1").arg(value ? "true" : "false"); result << tmp; } - if (valids.contains("utf8")) + if (valids.tqcontains("utf8")) { value = config.readBoolEntry("utf8", true); tmp = TQString("utf8=%1").arg(value ? "true" : "false"); result << tmp; } - if (valids.contains("shortname")) + if (valids.tqcontains("shortname")) { TQString svalue = config.readEntry("shortname", "lower").lower(); if (svalue == "winnt") @@ -993,7 +993,7 @@ TQStringList HALBackend::mountoptions(const TQString &name) } // pass our locale to the ntfs-3g driver so it can translate local characters - if (valids.contains("locale") && fstype == "ntfs-3g") + if (valids.tqcontains("locale") && fstype == "ntfs-3g") { // have to obtain LC_CTYPE as returned by the `locale` command // check in the same order as `locale` does @@ -1003,15 +1003,15 @@ TQStringList HALBackend::mountoptions(const TQString &name) } } - if (valids.contains("sync")) + if (valids.tqcontains("sync")) { - value = config.readBoolEntry("sync", ( valids.contains("flush") && !fstype.endsWith("fat") ) && removable); + value = config.readBoolEntry("sync", ( valids.tqcontains("flush") && !fstype.endsWith("fat") ) && removable); tmp = TQString("sync=%1").arg(value ? "true" : "false"); if (fstype != "iso9660") // makes no sense result << tmp; } - if (valids.contains("noatime")) + if (valids.tqcontains("noatime")) { value = config.readBoolEntry("atime", !fstype.endsWith("fat")); tmp = TQString("atime=%1").arg(value ? "true" : "false"); @@ -1031,7 +1031,7 @@ TQStringList HALBackend::mountoptions(const TQString &name) result << TQString("mountpoint=%1").arg(mount_point); result << TQString("filesystem=%1").arg(fstype); - if (valids.contains("data")) + if (valids.tqcontains("data")) { TQString svalue = config.readEntry("journaling").lower(); if (svalue == "ordered") @@ -1058,19 +1058,19 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; for (int index = 0; names[index]; ++index) - if (valids.contains(names[index])) + if (valids.tqcontains(names[index])) config.writeEntry(names[index], valids[names[index]] == "true"); - if (valids.contains("shortname")) + if (valids.tqcontains("shortname")) config.writeEntry("shortname", valids["shortname"]); - if (valids.contains("journaling")) + if (valids.tqcontains("journaling")) config.writeEntry("journaling", valids["journaling"]); - if (!mountoptions(name).contains(TQString("mountpoint=%1").arg(valids["mountpoint"]))) + if (!mountoptions(name).tqcontains(TQString("mountpoint=%1").arg(valids["mountpoint"]))) config.writeEntry("mountpoint", valids["mountpoint"]); - if (valids.contains("automount")) { + if (valids.tqcontains("automount")) { TQString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); config.setGroup(drive_udi); config.writeEntry("automount", valids["automount"]); @@ -1376,7 +1376,7 @@ TQString HALBackend::isInFstab(const Medium *medium) if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && reald == medium->deviceNode() ) ) { TQStringList opts = (*it)->mountOptions(); - if (opts.contains("user") || opts.contains("users")) + if (opts.tqcontains("user") || opts.tqcontains("users")) return (*it)->mountPoint(); } } @@ -1451,17 +1451,17 @@ TQString HALBackend::mount(const Medium *medium) if (mount_point.startsWith("/media/")) mount_point = mount_point.mid(7); - if (valids.contains("shortname")) + if (valids.tqcontains("shortname")) { soptions << TQString("shortname=%1").arg(valids["shortname"]); } - if (valids.contains("locale")) + if (valids.tqcontains("locale")) { soptions << TQString("locale=%1").arg(valids["locale"]); } - if (valids.contains("journaling")) + if (valids.tqcontains("journaling")) { TQString option = valids["journaling"]; if (option == "data") diff --git a/kioslave/media/mediamanager/linuxcdpolling.cpp b/kioslave/media/mediamanager/linuxcdpolling.cpp index 945fd950a..5a1359b6d 100644 --- a/kioslave/media/mediamanager/linuxcdpolling.cpp +++ b/kioslave/media/mediamanager/linuxcdpolling.cpp @@ -110,7 +110,7 @@ DiscType::operator int() const } -class PollingThread : public QThread +class PollingThread : public TQThread { public: PollingThread(const TQCString &devNode) : m_dev(devNode) @@ -209,14 +209,14 @@ void LinuxCDPolling::slotMediumAdded(const TQString &id) { kdDebug(1219) << "LinuxCDPolling::slotMediumAdded(" << id << ")" << endl; - if (m_threads.contains(id)) return; + if (m_threads.tqcontains(id)) return; const Medium *medium = m_mediaList.findById(id); TQString mime = medium->mimeType(); kdDebug(1219) << "mime == " << mime << endl; - if (mime.find("dvd")==-1 && mime.find("cd")==-1) return; + if (mime.tqfind("dvd")==-1 && mime.tqfind("cd")==-1) return; if (!medium->isMounted()) { @@ -234,7 +234,7 @@ void LinuxCDPolling::slotMediumRemoved(const TQString &id) { kdDebug(1219) << "LinuxCDPolling::slotMediumRemoved(" << id << ")" << endl; - if (!m_threads.contains(id)) return; + if (!m_threads.tqcontains(id)) return; PollingThread *thread = m_threads[id]; m_threads.remove(id); @@ -255,9 +255,9 @@ void LinuxCDPolling::slotMediumStateChanged(const TQString &id) TQString mime = medium->mimeType(); kdDebug(1219) << "mime == " << mime << endl; - if (mime.find("dvd")==-1 && mime.find("cd")==-1) return; + if (mime.tqfind("dvd")==-1 && mime.tqfind("cd")==-1) return; - if (!m_threads.contains(id) && !medium->isMounted()) + if (!m_threads.tqcontains(id) && !medium->isMounted()) { // It is just a mount state change, no need to notify m_excludeNotification.append( id ); @@ -268,7 +268,7 @@ void LinuxCDPolling::slotMediumStateChanged(const TQString &id) thread->start(); m_timer.start(500); } - else if (m_threads.contains(id) && medium->isMounted()) + else if (m_threads.tqcontains(id) && medium->isMounted()) { PollingThread *thread = m_threads[id]; m_threads.remove(id); @@ -319,7 +319,7 @@ static TQString baseType(const Medium *medium) FstabBackend::guess(devNode, mountPoint, fsType, mounted, mimeType, iconName, label); - if (devNode.find("dvd")!=-1) + if (devNode.tqfind("dvd")!=-1) { kdDebug(1219) << "=> dvd" << endl; return "dvd"; @@ -360,7 +360,7 @@ void LinuxCDPolling::applyType(DiscType type, const Medium *medium) TQString id = medium->id(); TQString dev = medium->deviceNode(); - bool notify = !m_excludeNotification.contains(id); + bool notify = !m_excludeNotification.tqcontains(id); m_excludeNotification.remove(id); switch (type) diff --git a/kioslave/media/mediamanager/medialist.cpp b/kioslave/media/mediamanager/medialist.cpp index bb0de6248..2e766bb07 100644 --- a/kioslave/media/mediamanager/medialist.cpp +++ b/kioslave/media/mediamanager/medialist.cpp @@ -38,7 +38,7 @@ const Medium *MediaList::findById(const TQString &id) const { kdDebug(1219) << "MediaList::findById(" << id << ")" << endl; - if ( !m_idMap.contains(id) ) return 0L; + if ( !m_idMap.tqcontains(id) ) return 0L; return m_idMap[id]; } @@ -47,7 +47,7 @@ const Medium *MediaList::findByName(const TQString &name) const { kdDebug(1219) << "MediaList::findByName(" << name << ")" << endl; - if ( !m_nameMap.contains(name) ) return 0L; + if ( !m_nameMap.tqcontains(name) ) return 0L; return m_nameMap[name]; } @@ -70,13 +70,13 @@ TQString MediaList::addMedium(Medium *medium, bool allowNotification) kdDebug(1219) << "MediaList::addMedium(@" << medium->id() << ")" << endl; TQString id = medium->id(); - if ( m_idMap.contains(id) ) return TQString::null; + if ( m_idMap.tqcontains(id) ) return TQString::null; m_media.append( medium ); m_idMap[id] = medium; TQString name = medium->name(); - if ( !m_nameMap.contains(name) ) + if ( !m_nameMap.tqcontains(name) ) { m_nameMap[name] = medium; @@ -90,7 +90,7 @@ TQString MediaList::addMedium(Medium *medium, bool allowNotification) TQString base_name = name+"_"; int i = 1; - while ( m_nameMap.contains(base_name+TQString::number(i)) ) + while ( m_nameMap.tqcontains(base_name+TQString::number(i)) ) { i++; } @@ -109,7 +109,7 @@ bool MediaList::removeMedium(const TQString &id, bool allowNotification) { kdDebug(1219) << "MediaList::removeMedium(" << id << ")" << endl; - if ( !m_idMap.contains(id) ) return false; + if ( !m_idMap.tqcontains(id) ) return false; Medium *medium = m_idMap[id]; TQString name = medium->name(); @@ -126,7 +126,7 @@ bool MediaList::changeMediumState(const Medium &medium, bool allowNotification) { kdDebug(1219) << "MediaList::changeMediumState(const Medium &)" << endl; - if ( !m_idMap.contains(medium.id()) ) return false; + if ( !m_idMap.tqcontains(medium.id()) ) return false; Medium *m = m_idMap[medium.id()]; @@ -177,7 +177,7 @@ bool MediaList::changeMediumState(const TQString &id, << baseURL << ", " << mimeType << ", " << iconName << ")" << endl; - if ( !m_idMap.contains(id) ) return false; + if ( !m_idMap.tqcontains(id) ) return false; Medium *medium = m_idMap[id]; @@ -218,7 +218,7 @@ bool MediaList::changeMediumState(const TQString &id, << mounted << ", " << mimeType << ", " << iconName << ")" << endl; - if ( !m_idMap.contains(id) ) return false; + if ( !m_idMap.tqcontains(id) ) return false; Medium *medium = m_idMap[id]; @@ -255,7 +255,7 @@ bool MediaList::changeMediumState(const TQString &id, bool mounted, << mounted << ", " << mimeType << ", " << iconName << ")" << endl; - if ( !m_idMap.contains(id) ) return false; + if ( !m_idMap.tqcontains(id) ) return false; Medium *medium = m_idMap[id]; @@ -287,7 +287,7 @@ bool MediaList::setUserLabel(const TQString &name, const TQString &label) kdDebug(1219) << "MediaList::setUserLabel(" << name << ", " << label << ")" << endl; - if ( !m_nameMap.contains(name) ) return false; + if ( !m_nameMap.tqcontains(name) ) return false; Medium *medium = m_nameMap[name]; medium->setUserLabel(label); diff --git a/kioslave/media/mediamanager/removablebackend.cpp b/kioslave/media/mediamanager/removablebackend.cpp index f307ee2f8..7db497c38 100644 --- a/kioslave/media/mediamanager/removablebackend.cpp +++ b/kioslave/media/mediamanager/removablebackend.cpp @@ -60,7 +60,7 @@ bool RemovableBackend::plug(const TQString &devNode, const TQString &label) TQString name = generateName(devNode); TQString id = generateId(devNode); - if (!m_removableIds.contains(id)) + if (!m_removableIds.tqcontains(id)) { Medium *medium = new Medium(id, name); medium->mountableState(devNode, TQString::null, @@ -95,7 +95,7 @@ bool RemovableBackend::plug(const TQString &devNode, const TQString &label) bool RemovableBackend::unplug(const TQString &devNode) { TQString id = generateId(devNode); - if (m_removableIds.contains(id)) + if (m_removableIds.tqcontains(id)) { m_removableIds.remove(id); return m_mediaList.removeMedium(id); @@ -106,7 +106,7 @@ bool RemovableBackend::unplug(const TQString &devNode) bool RemovableBackend::camera(const TQString &devNode) { TQString id = generateId(devNode); - if (m_removableIds.contains(id)) + if (m_removableIds.tqcontains(id)) { return m_mediaList.changeMediumState(id, TQString("camera:/"), false, "media/gphoto2camera"); @@ -140,8 +140,8 @@ void RemovableBackend::handleMtabChange() TQString id = generateId(dev); new_mtabIds+=id; - if ( !m_mtabIds.contains(id) - && m_removableIds.contains(id) ) + if ( !m_mtabIds.tqcontains(id) + && m_removableIds.tqcontains(id) ) { m_mediaList.changeMediumState(id, dev, mp, fs, true, false, "media/removable_mounted"); @@ -153,8 +153,8 @@ void RemovableBackend::handleMtabChange() for (; it2!=end2; ++it2) { - if ( !new_mtabIds.contains(*it2) - && m_removableIds.contains(*it2) ) + if ( !new_mtabIds.tqcontains(*it2) + && m_removableIds.tqcontains(*it2) ) { m_mediaList.changeMediumState(*it2, false, false, "media/removable_unmounted"); @@ -169,7 +169,7 @@ TQString RemovableBackend::generateId(const TQString &devNode) TQString dev = KStandardDirs::realFilePath(devNode); return "/org/kde/mediamanager/removable/" - +dev.replace("/", ""); + +dev.tqreplace("/", ""); } TQString RemovableBackend::generateName(const TQString &devNode) diff --git a/kioslave/media/medianotifier/medianotifier.cpp b/kioslave/media/medianotifier/medianotifier.cpp index b0596e31d..ad9d00db8 100644 --- a/kioslave/media/medianotifier/medianotifier.cpp +++ b/kioslave/media/medianotifier/medianotifier.cpp @@ -113,7 +113,7 @@ bool MediaNotifier::autostart( const KFileItem &medium ) TQString mimetype = medium.mimetype(); bool is_cdrom = mimetype.startsWith( "media/cd" ) || mimetype.startsWith( "media/dvd" ); - bool is_mounted = mimetype.contains( "_mounted" ); + bool is_mounted = mimetype.tqcontains( "_mounted" ); // We autorun only on CD/DVD or removable disks (USB, Firewire) if ( !( is_cdrom || is_mounted ) @@ -222,7 +222,7 @@ bool MediaNotifier::execAutoopen( const KFileItem &medium, const TQString &path, // The relative path MUST NOT contain path components that // refer to a parent directory ( ../ ) - if ( relative_path.startsWith( "/" ) || relative_path.contains( "../" ) ) + if ( relative_path.startsWith( "/" ) || relative_path.tqcontains( "../" ) ) { return false; } @@ -369,7 +369,7 @@ void MediaNotifier::slotFreeCancel() void MediaNotifier::slotFreeFinished( KMessageBox::ButtonCode res ) { - TQCheckBox *checkbox = ::qt_cast( m_freeDialog->child( 0, "TQCheckBox" ) ); + TQCheckBox *checkbox = ::tqqt_cast( m_freeDialog->child( 0, "TQCheckBox" ) ); if ( checkbox && checkbox->isChecked() ) KMessageBox::saveDontShowAgainYesNo("dontagainfreespace", res); m_freeDialog->delayedDestruct(); diff --git a/kioslave/media/medianotifier/notificationdialog.cpp b/kioslave/media/medianotifier/notificationdialog.cpp index 7ba172601..9913f033d 100644 --- a/kioslave/media/medianotifier/notificationdialog.cpp +++ b/kioslave/media/medianotifier/notificationdialog.cpp @@ -53,7 +53,7 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett updateActionsListBox(); - resize( TQSize(400,400).expandedTo( minimumSizeHint() ) ); + resize( TQSize(400,400).expandedTo( tqminimumSizeHint() ) ); m_actionWatcher = new KDirWatch(); diff --git a/kioslave/media/medianotifier/notificationdialogview.ui b/kioslave/media/medianotifier/notificationdialogview.ui index f37a007b2..032ea1f10 100644 --- a/kioslave/media/medianotifier/notificationdialogview.ui +++ b/kioslave/media/medianotifier/notificationdialogview.ui @@ -1,6 +1,6 @@ NotificationDialogView - + NotificationDialogView @@ -19,7 +19,7 @@ 15 - + layout2 @@ -30,7 +30,7 @@ 20 - + iconLabel @@ -42,13 +42,13 @@ 0 - + 64 64 - + 64 64 @@ -61,7 +61,7 @@ true - + textLabel1 @@ -74,7 +74,7 @@ - + mimetypeLabel @@ -95,7 +95,7 @@ actionsList - + autoActionCheck diff --git a/kioslave/media/mounthelper/decryptdialog.ui b/kioslave/media/mounthelper/decryptdialog.ui index 15790c8ef..dfb8c17d0 100644 --- a/kioslave/media/mounthelper/decryptdialog.ui +++ b/kioslave/media/mounthelper/decryptdialog.ui @@ -1,6 +1,6 @@ DecryptDialog - + DecryptDialog @@ -27,7 +27,7 @@ unnamed - + layout5 @@ -35,7 +35,7 @@ unnamed - + layout4 @@ -43,7 +43,7 @@ unnamed - + encryptedIcon @@ -55,13 +55,13 @@ 0 - + 48 48 - + 32 32 @@ -70,7 +70,7 @@ true - + AlignTop @@ -84,7 +84,7 @@ Expanding - + 31 41 @@ -93,7 +93,7 @@ - + descLabel @@ -109,13 +109,13 @@ <p><b>%1</b> is an encrypted storage device.</p> <p>Please enter the password to decrypt the storage device.</p> - + WordBreak|AlignTop - + layout4 @@ -123,7 +123,7 @@ unnamed - + textLabel1 @@ -134,7 +134,7 @@ passwordEdit - + passwordEdit @@ -155,7 +155,7 @@ - + errorBox @@ -174,7 +174,7 @@ unnamed - + errorLabel @@ -189,7 +189,7 @@ - + WordBreak|AlignTop diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.cpp b/kioslave/media/mounthelper/kio_media_mounthelper.cpp index 01448f79d..83d57df85 100644 --- a/kioslave/media/mounthelper/kio_media_mounthelper.cpp +++ b/kioslave/media/mounthelper/kio_media_mounthelper.cpp @@ -88,8 +88,8 @@ MountHelper::MountHelper() : KApplication() TQString device = medium.deviceNode(); TQString mount_point = medium.mountPoint(); - m_isCdrom = medium.mimeType().find("dvd")!=-1 - || medium.mimeType().find("cd")!=-1; + m_isCdrom = medium.mimeType().tqfind("dvd")!=-1 + || medium.mimeType().tqfind("cd")!=-1; if (args->isSet("d")) { @@ -182,7 +182,7 @@ MountHelper::MountHelper() : KApplication() void MountHelper::invokeEject(const TQString &device, bool quiet) { - KProcess *proc = new KProcess(this); + KProcess *proc = new KProcess(TQT_TQOBJECT(this)); *proc << "kdeeject"; if (quiet) { diff --git a/kioslave/media/propsdlgplugin/propertiespage.cpp b/kioslave/media/propsdlgplugin/propertiespage.cpp index 14ac2b33f..209f350a8 100644 --- a/kioslave/media/propsdlgplugin/propertiespage.cpp +++ b/kioslave/media/propsdlgplugin/propertiespage.cpp @@ -54,55 +54,55 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id) for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - TQString key = (*it).left((*it).find('=')); - TQString value = (*it).mid((*it).find('=') + 1); + TQString key = (*it).left((*it).tqfind('=')); + TQString value = (*it).mid((*it).tqfind('=') + 1); kdDebug() << "key '" << key << "' value '" << value << "'\n"; options[key] = value; } - if (!options.contains("ro")) + if (!options.tqcontains("ro")) option_ro->hide(); else option_ro->setChecked(options["ro"] == "true"); connect( option_ro, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.contains("quiet")) + if (!options.tqcontains("quiet")) option_quiet->hide(); else option_quiet->setChecked(options["quiet"] == "true"); connect( option_quiet, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.contains("sync")) + if (!options.tqcontains("sync")) option_sync->hide(); else option_sync->setChecked(options["sync"] == "true"); connect( option_sync, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.contains("atime")) + if (!options.tqcontains("atime")) option_atime->hide(); else option_atime->setChecked(options["atime"] == "true"); connect( option_atime, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.contains("flush")) + if (!options.tqcontains("flush")) option_flush->hide(); else option_flush->setChecked(options["flush"] == "true"); connect( option_flush, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.contains("utf8")) + if (!options.tqcontains("utf8")) option_utf8->hide(); else option_utf8->setChecked(options["utf8"] == "true"); connect( option_utf8, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.contains("uid")) + if (!options.tqcontains("uid")) option_uid->hide(); else option_uid->setChecked(options["uid"] == "true"); connect( option_uid, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.contains("shortname")) + if (!options.tqcontains("shortname")) { option_shortname->hide(); text_shortname->hide(); @@ -118,7 +118,7 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id) connect( option_shortname, TQT_SIGNAL( activated(int) ), TQT_SIGNAL( changed() ) ); } - if (!options.contains("journaling")) + if (!options.tqcontains("journaling")) { text_journaling->hide(); option_journaling->hide(); @@ -140,11 +140,11 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id) option_automount->setChecked(options["automount"] == "true"); connect( option_automount, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.contains("journaling") && - !options.contains("shortname") && - !options.contains("uid") && - !options.contains("utf8") && - !options.contains("flush")) + if (!options.tqcontains("journaling") && + !options.tqcontains("shortname") && + !options.tqcontains("uid") && + !options.tqcontains("utf8") && + !options.tqcontains("flush")) groupbox_specific->hide(); } else { @@ -163,31 +163,31 @@ bool PropertiesPage::save() { TQStringList result; - if (options.contains("ro")) + if (options.tqcontains("ro")) result << TQString("ro=%1").arg(option_ro->isChecked() ? "true" : "false"); - if (options.contains("quiet")) + if (options.tqcontains("quiet")) result << TQString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false"); - if (options.contains("sync")) + if (options.tqcontains("sync")) result << TQString("sync=%1").arg(option_sync->isChecked() ? "true" : "false"); - if (options.contains("atime")) + if (options.tqcontains("atime")) result << TQString("atime=%1").arg(option_atime->isChecked() ? "true" : "false"); - if (options.contains("flush")) + if (options.tqcontains("flush")) result << TQString("flush=%1").arg(option_flush->isChecked() ? "true" : "false"); - if (options.contains("utf8")) + if (options.tqcontains("utf8")) result << TQString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false"); - if (options.contains("uid")) + if (options.tqcontains("uid")) result << TQString("uid=%1").arg(option_uid->isChecked() ? "true" : "false"); - if (options.contains("shortname")) + if (options.tqcontains("shortname")) result << TQString("shortname=%1").arg(short_names[option_shortname->currentItem()]); - if (options.contains("journaling")) + if (options.tqcontains("journaling")) result << TQString("journaling=%1").arg(journales[option_journaling->currentItem()]); TQString mp = option_mountpoint->text(); diff --git a/kioslave/media/propsdlgplugin/propertiespagegui.ui b/kioslave/media/propsdlgplugin/propertiespagegui.ui index c4de4c059..416c85c13 100644 --- a/kioslave/media/propsdlgplugin/propertiespagegui.ui +++ b/kioslave/media/propsdlgplugin/propertiespagegui.ui @@ -352,7 +352,7 @@ Display the short name as is; store a long name when the short name is not all u Expanding - + 20 20 diff --git a/kioslave/nfs/kio_nfs.cpp b/kioslave/nfs/kio_nfs.cpp index debe19d3d..1869b4243 100644 --- a/kioslave/nfs/kio_nfs.cpp +++ b/kioslave/nfs/kio_nfs.cpp @@ -175,7 +175,7 @@ static void stripTrailingSlash(TQString& path) static void getLastPart(const TQString& path, TQString& lastPart, TQString& rest) { - int slashPos=path.findRev("/"); + int slashPos=path.tqfindRev("/"); lastPart=path.mid(slashPos+1); rest=path.left(slashPos+1); } @@ -185,7 +185,7 @@ static TQString removeFirstPart(const TQString& path) TQString result(""); if (path.isEmpty()) return result; result=path.mid(1); - int slashPos=result.find("/"); + int slashPos=result.tqfind("/"); return result.mid(slashPos+1); } @@ -293,7 +293,7 @@ void NFSProtocol::closeConnection() bool NFSProtocol::isExportedDir(const TQString& path) { - return (m_exportedDirs.find(path.mid(1))!=m_exportedDirs.end()); + return (m_exportedDirs.tqfind(path.mid(1))!=m_exportedDirs.end()); } /* This one works recursive. @@ -321,7 +321,7 @@ NFSFileHandle NFSProtocol::getFileHandle(TQString path) } //check wether we have this filehandle cached //the filehandles of the exported root dirs are always in the cache - if (m_handleCache.find(path)!=m_handleCache.end()) + if (m_handleCache.tqfind(path)!=m_handleCache.end()) { kdDebug(7121)<<"path is in the cache, returning the FH -"<pw_name)) ); + m_usercache.insert( uid, new TQString(TQString::tqfromLatin1(user->pw_name)) ); atom.m_str = user->pw_name; } else @@ -819,13 +819,13 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString& atom.m_uds = KIO::UDS_GROUP; gid_t gid = buff.st_gid; - temp = m_groupcache.find( gid ); + temp = m_groupcache.tqfind( gid ); if ( !temp ) { struct group *grp = getgrgid( gid ); if ( grp ) { - m_groupcache.insert( gid, new TQString(TQString::fromLatin1(grp->gr_name)) ); + m_groupcache.insert( gid, new TQString(TQString::tqfromLatin1(grp->gr_name)) ); atom.m_str = grp->gr_name; } else @@ -893,7 +893,7 @@ void NFSProtocol::completeUDSEntry(UDSEntry& entry, fattr& attributes) atom.m_uds = KIO::UDS_USER; uid_t uid = attributes.uid; - TQString *temp = m_usercache.find( uid ); + TQString *temp = m_usercache.tqfind( uid ); if ( !temp ) { struct passwd *user = getpwuid( uid ); @@ -911,7 +911,7 @@ void NFSProtocol::completeUDSEntry(UDSEntry& entry, fattr& attributes) atom.m_uds = KIO::UDS_GROUP; gid_t gid = attributes.gid; - temp = m_groupcache.find( gid ); + temp = m_groupcache.tqfind( gid ); if ( !temp ) { struct group *grp = getgrgid( gid ); @@ -1125,7 +1125,7 @@ void NFSProtocol::del( const KURL& url, bool isfile) (xdrproc_t) xdr_nfsstat, (char*)&nfsStat,total_timeout); if (!checkForError(clnt_stat,nfsStat,thePath)) return; kdDebug(7121)<<"removing "< 0) group = group.left(pos); + if ((pos = group.tqfind('/')) > 0) group = group.left(pos); DBG << "get group: " << group << " msg: " << msg_id << endl; if ( !nntp_open() ) @@ -228,7 +228,7 @@ bool NNTPProtocol::post_article() { pos += 2; } last_chunk_had_line_ending = (data.right(2) == "\r\n"); - while ((pos = data.find("\r\n.",pos)) > 0) { + while ((pos = data.tqfind("\r\n.",pos)) > 0) { data.insert(pos+2,'.'); pos += 4; } @@ -280,7 +280,7 @@ void NNTPProtocol::stat( const KURL& url ) { // /group = message list } else if (regGroup.search(path) == 0) { if (path.left(1) == "/") path.remove(0,1); - if ((pos = path.find('/')) > 0) group = path.left(pos); + if ((pos = path.tqfind('/')) > 0) group = path.left(pos); else group = path; DBG << "stat group: " << group << endl; // postingAllowed should be ored here with "group not moderated" flag @@ -289,11 +289,11 @@ void NNTPProtocol::stat( const KURL& url ) { // /group/ = message } else if (regMsgId.search(path) == 0) { - pos = path.find('<'); + pos = path.tqfind('<'); group = path.left(pos); msg_id = KURL::decode_string( path.right(path.length()-pos) ); if (group.left(1) == "/") group.remove(0,1); - if ((pos = group.find('/')) > 0) group = group.left(pos); + if ((pos = group.tqfind('/')) > 0) group = group.left(pos); DBG << "stat group: " << group << " msg: " << msg_id << endl; fillUDSEntry(entry, msg_id, 0, false, true); @@ -332,7 +332,7 @@ void NNTPProtocol::listDir( const KURL& url ) { TQString group; if (path.left(1) == "/") path.remove(0,1); - if ((pos = path.find('/')) > 0) + if ((pos = path.tqfind('/')) > 0) group = path.left(pos); else group = path; @@ -383,15 +383,15 @@ void NNTPProtocol::fetchGroups( const TQString &since ) DBG << " fetchGroups -- data: " << line.stripWhiteSpace() << endl; // group name - if ((pos = line.find(' ')) > 0) { + if ((pos = line.tqfind(' ')) > 0) { group = line.left(pos); // number of messages line.remove(0,pos+1); long last = 0; - if (((pos = line.find(' ')) > 0 || (pos = line.find('\t')) > 0) && - ((pos2 = line.find(' ',pos+1)) > 0 || (pos2 = line.find('\t',pos+1)) > 0)) { + if (((pos = line.tqfind(' ')) > 0 || (pos = line.tqfind('\t')) > 0) && + ((pos2 = line.tqfind(' ',pos+1)) > 0 || (pos2 = line.tqfind('\t',pos+1)) > 0)) { last = line.left(pos).toLong(); long first = line.mid(pos+1,pos2-pos-1).toLong(); msg_cnt = abs(last-first+1); @@ -441,8 +441,8 @@ bool NNTPProtocol::fetchGroup( TQString &group, unsigned long first ) { int pos, pos2; unsigned long firstSerNum; resp_line = readBuffer; - if (((pos = resp_line.find(' ',4)) > 0 || (pos = resp_line.find('\t',4)) > 0) && - ((pos2 = resp_line.find(' ',pos+1)) > 0 || (pos = resp_line.find('\t',pos+1)) > 0)) + if (((pos = resp_line.tqfind(' ',4)) > 0 || (pos = resp_line.tqfind('\t',4)) > 0) && + ((pos2 = resp_line.tqfind(' ',pos+1)) > 0 || (pos = resp_line.tqfind('\t',pos+1)) > 0)) { firstSerNum = resp_line.mid(pos+1,pos2-pos-1).toLong(); } else { @@ -481,7 +481,7 @@ bool NNTPProtocol::fetchGroupRFC977( unsigned long first ) //STAT res_line: 223 nnn ... TQString msg_id; int pos, pos2; - if ((pos = resp_line.find('<')) > 0 && (pos2 = resp_line.find('>',pos+1))) { + if ((pos = resp_line.tqfind('<')) > 0 && (pos2 = resp_line.tqfind('>',pos+1))) { msg_id = resp_line.mid(pos,pos2-pos+1); fillUDSEntry(entry, msg_id, 0, false, true); entryList.append(entry); @@ -506,7 +506,7 @@ bool NNTPProtocol::fetchGroupRFC977( unsigned long first ) //res_line: 223 nnn ... resp_line = readBuffer; - if ((pos = resp_line.find('<')) > 0 && (pos2 = resp_line.find('>',pos+1))) { + if ((pos = resp_line.tqfind('<')) > 0 && (pos2 = resp_line.tqfind('>',pos+1))) { msg_id = resp_line.mid(pos,pos2-pos+1); fillUDSEntry(entry, msg_id, 0, false, true); entryList.append(entry); @@ -589,7 +589,7 @@ bool NNTPProtocol::fetchGroupXOVER( unsigned long first, bool ¬Supported ) TQStringList::ConstIterator it2 = fields.constBegin(); ++it2; // first entry is the serial number for ( ; it != headers.constEnd() && it2 != fields.constEnd(); ++it, ++it2 ) { - if ( (*it).contains( "Message-ID:", false ) ) { + if ( (*it).tqcontains( "Message-ID:", false ) ) { msgId = (*it2); continue; } diff --git a/kioslave/pop3/pop3.cc b/kioslave/pop3/pop3.cc index 0ab27f63b..ed0664919 100644 --- a/kioslave/pop3/pop3.cc +++ b/kioslave/pop3/pop3.cc @@ -242,8 +242,8 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len, QMIN(r_len, (buf[4] == ' ' ? recv_len - 5 : recv_len - 4))); } - TQString command = TQString::fromLatin1(cmd); - TQString serverMsg = TQString::fromLatin1(buf).mid(5).stripWhiteSpace(); + TQString command = TQString::tqfromLatin1(cmd); + TQString serverMsg = TQString::tqfromLatin1(buf).mid(5).stripWhiteSpace(); if (command.left(4) == "PASS") { command = i18n("PASS "); @@ -353,7 +353,7 @@ int POP3Protocol::loginAPOP( char *challenge, KIO::AuthInfo &ai ) { char buf[512]; - TQString apop_string = TQString::fromLatin1("APOP "); + TQString apop_string = TQString::tqfromLatin1("APOP "); if (m_sUser.isEmpty() || m_sPass.isEmpty()) { // Prompt for usernames if (!openPassDlg(ai)) { @@ -461,7 +461,7 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai ) { #ifdef HAVE_LIBSASL2 char buf[512]; - TQString sasl_buffer = TQString::fromLatin1("AUTH"); + TQString sasl_buffer = TQString::tqfromLatin1("AUTH"); int result; sasl_conn_t *conn = NULL; @@ -525,19 +525,19 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai ) TQByteArray challenge, tmp; - TQString firstCommand = "AUTH " + TQString::fromLatin1( mechusing ); + TQString firstCommand = "AUTH " + TQString::tqfromLatin1( mechusing ); challenge.setRawData( out, outlen ); KCodecs::base64Encode( challenge, tmp ); challenge.resetRawData( out, outlen ); if ( !tmp.isEmpty() ) { firstCommand += " "; - firstCommand += TQString::fromLatin1( tmp.data(), tmp.size() ); + firstCommand += TQString::tqfromLatin1( tmp.data(), tmp.size() ); } challenge.resize( 2049 ); resp = command( firstCommand.latin1(), challenge.data(), 2049 ); while( resp == Cont ) { - challenge.resize(challenge.find(0)); + challenge.resize(challenge.tqfind(0)); // POP3_DEBUG << "S: " << TQCString(challenge.data(),challenge.size()+1) << endl; KCodecs::base64Decode( challenge, tmp ); do { @@ -624,7 +624,7 @@ bool POP3Protocol::loginPASS( KIO::AuthInfo &ai ) m_sOldUser = m_sUser; m_sOldPass = m_sPass; - TQString one_string = TQString::fromLatin1("USER "); + TQString one_string = TQString::tqfromLatin1("USER "); one_string.append( m_sUser ); if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) { @@ -638,7 +638,7 @@ bool POP3Protocol::loginPASS( KIO::AuthInfo &ai ) return false; } - one_string = TQString::fromLatin1("PASS "); + one_string = TQString::tqfromLatin1("PASS "); one_string.append(m_sPass); if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) { @@ -704,7 +704,7 @@ bool POP3Protocol::pop3_open() TQRegExp re("<[A-Za-z0-9\\.\\-_]+@[A-Za-z0-9\\.\\-_]+>$", false); POP3_DEBUG << "greeting: " << greeting << endl; - int apop_pos = greeting.find(re); + int apop_pos = greeting.tqfind(re); supports_apop = (bool) (apop_pos != -1); if (metaData("nologin") == "on") @@ -794,7 +794,7 @@ size_t POP3Protocol::realGetSize(unsigned int msg_num) return 0; } else { cmd = buf; - cmd.remove(0, cmd.find(" ")); + cmd.remove(0, cmd.tqfind(" ")); ret = cmd.toLong(); } delete[]buf; @@ -821,7 +821,7 @@ void POP3Protocol::special(const TQByteArray & aData) if (qstrcmp(buf, ".\r\n") == 0) break; result += " " + TQString(buf).left(strlen(buf) - 2) - .replace(" ", "-"); + .tqreplace(" ", "-"); } } if (supports_apop) @@ -866,15 +866,15 @@ void POP3Protocol::get(const KURL & url) return; } - if (((path.find('/') == -1) && (path != "index") && (path != "uidl") + if (((path.tqfind('/') == -1) && (path != "index") && (path != "uidl") && (path != "commit"))) { error(ERR_MALFORMED_URL, url.url()); m_cmd = CMD_NONE; return; } - cmd = path.left(path.find('/')); - path.remove(0, path.find('/') + 1); + cmd = path.left(path.tqfind('/')); + path.remove(0, path.tqfind('/') + 1); if (!pop3_open()) { POP3_DEBUG << "pop3_open failed" << endl; @@ -949,13 +949,13 @@ void POP3Protocol::get(const KURL & url) if ( command(list_cmd.ascii(), buf, sizeof(buf) - 1) == Ok ) { list_cmd = buf; // We need a space, otherwise we got an invalid reply - if (!list_cmd.find(" ")) { + if (!list_cmd.tqfind(" ")) { POP3_DEBUG << "List command needs a space? " << list_cmd << endl; closeConnection(); error(ERR_INTERNAL, i18n("Unexpected response from POP3 server.")); return; } - list_cmd.remove(0, list_cmd.find(" ") + 1); + list_cmd.remove(0, list_cmd.tqfind(" ") + 1); msg_len = list_cmd.toUInt(&ok); if (!ok) { POP3_DEBUG << "LIST command needs to return a number? :" << @@ -1134,13 +1134,13 @@ void POP3Protocol::listDir(const KURL &) } POP3_DEBUG << "The stat buf is :" << buf << ":" << endl; q_buf = buf; - if (q_buf.find(" ") == -1) { + if (q_buf.tqfind(" ") == -1) { error(ERR_INTERNAL, "Invalid POP3 response, we should have at least one space!"); closeConnection(); return; } - q_buf.remove(q_buf.find(" "), q_buf.length()); + q_buf.remove(q_buf.tqfind(" "), q_buf.length()); num_messages = q_buf.toUInt(&isINT); if (!isINT) { @@ -1176,7 +1176,7 @@ void POP3Protocol::listDir(const KURL &) uds_url.setUser(m_sUser); uds_url.setPass(m_sPass); uds_url.setHost(m_sServer); - uds_url.setPath(TQString::fromLatin1("/download/%1").arg(i + 1)); + uds_url.setPath(TQString::tqfromLatin1("/download/%1").arg(i + 1)); atom.m_str = uds_url.url(); atom.m_long = 0; entry.append(atom); diff --git a/kioslave/remote/kdedmodule/remotedirnotify.cpp b/kioslave/remote/kdedmodule/remotedirnotify.cpp index e6e2359a6..f87c6bb96 100644 --- a/kioslave/remote/kdedmodule/remotedirnotify.cpp +++ b/kioslave/remote/kdedmodule/remotedirnotify.cpp @@ -105,7 +105,7 @@ inline void evil_hack(const KURL::List &list) { KURL url = (*it).upURL(); - if (!notified.contains(url)) + if (!notified.tqcontains(url)) { notifier.FilesAdded(url); notified.append(url); diff --git a/kioslave/remote/kio_remote.cpp b/kioslave/remote/kio_remote.cpp index 646a99d30..68325fbb7 100644 --- a/kioslave/remote/kio_remote.cpp +++ b/kioslave/remote/kio_remote.cpp @@ -76,7 +76,7 @@ void RemoteProtocol::listDir(const KURL &url) return; } - int second_slash_idx = url.path().find( '/', 1 ); + int second_slash_idx = url.path().tqfind( '/', 1 ); TQString root_dirname = url.path().mid( 1, second_slash_idx-1 ); KURL target = m_impl.findBaseURL( root_dirname ); @@ -151,7 +151,7 @@ void RemoteProtocol::stat(const KURL &url) return; } - int second_slash_idx = url.path().find( '/', 1 ); + int second_slash_idx = url.path().tqfind( '/', 1 ); TQString root_dirname = url.path().mid( 1, second_slash_idx-1 ); if ( second_slash_idx==-1 || ( (int)url.path().length() )==second_slash_idx+1 ) diff --git a/kioslave/remote/remoteimpl.cpp b/kioslave/remote/remoteimpl.cpp index 47e41b821..ed117d03f 100644 --- a/kioslave/remote/remoteimpl.cpp +++ b/kioslave/remote/remoteimpl.cpp @@ -74,7 +74,7 @@ void RemoteImpl::listRoot(TQValueList &list) const for(; name!=endf; ++name) { - if (!names_found.contains(*name)) + if (!names_found.tqcontains(*name)) { entry.clear(); createEntry(entry, *dirpath, *name); diff --git a/kioslave/sftp/kio_sftp.cpp b/kioslave/sftp/kio_sftp.cpp index 456d47084..2c8f995a5 100644 --- a/kioslave/sftp/kio_sftp.cpp +++ b/kioslave/sftp/kio_sftp.cpp @@ -348,7 +348,7 @@ sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, KIO::filesize_t off } KIO::filesize_t fileSize = attr.fileSize(); - Q_UINT32 pflags = SSH2_FXF_READ; + TQ_UINT32 pflags = SSH2_FXF_READ; attr.clear(); TQByteArray handle; @@ -368,7 +368,7 @@ sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, KIO::filesize_t off // How big should each data packet be? Definitely not bigger than 64kb or // you will overflow the 2 byte size variable in a sftp packet. - Q_UINT32 len = 60*1024; + TQ_UINT32 len = 60*1024; code = SSH2_FX_OK; kdDebug(KIO_SFTP_DB) << "sftpGet(): offset = " << offset << endl; @@ -449,7 +449,7 @@ void sftpProtocol::get(const KURL& url) { return; // Get resume offset - Q_UINT64 offset = config()->readUnsignedLongNumEntry("resume"); + TQ_UINT64 offset = config()->readUnsignedLongNumEntry("resume"); if( offset > 0 ) { canResume(); kdDebug(KIO_SFTP_DB) << "get(): canResume(), offset = " << offset << endl; @@ -772,16 +772,16 @@ void sftpProtocol::openConnection() { kdDebug(KIO_SFTP_DB) << "openConnection(): Sending SSH2_FXP_INIT packet." << endl; TQByteArray p; TQDataStream packet(p, IO_WriteOnly); - packet << (Q_UINT32)5; // packet length - packet << (Q_UINT8) SSH2_FXP_INIT; // packet type - packet << (Q_UINT32)SSH2_FILEXFER_VERSION; // client version + packet << (TQ_UINT32)5; // packet length + packet << (TQ_UINT8) SSH2_FXP_INIT; // packet type + packet << (TQ_UINT32)SSH2_FILEXFER_VERSION; // client version putPacket(p); getPacket(p); TQDataStream s(p, IO_ReadOnly); - Q_UINT32 version; - Q_UINT8 type; + TQ_UINT32 version; + TQ_UINT8 type; s >> type; kdDebug(KIO_SFTP_DB) << "openConnection(): Got type " << type << endl; @@ -910,7 +910,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool KURL partUrl( origUrl ); partUrl.setFileName( partUrl.fileName() + ".part" ); - Q_UINT64 offset = 0; + TQ_UINT64 offset = 0; bool partExists = false; bool markPartial = config()->readBoolEntry("MarkPartial", true); @@ -974,7 +974,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool // Determine the url we will actually write to... KURL writeUrl (markPartial ? partUrl:origUrl); - Q_UINT32 pflags = 0; + TQ_UINT32 pflags = 0; if( overwrite && !resume ) pflags = SSH2_FXF_WRITE | SSH2_FXF_CREAT | SSH2_FXF_TRUNC; else if( !overwrite && !resume ) @@ -1157,7 +1157,7 @@ void sftpProtocol::mimetype ( const KURL& url ){ if( !mConnected ) return; - Q_UINT32 pflags = SSH2_FXF_READ; + TQ_UINT32 pflags = SSH2_FXF_READ; TQByteArray handle, mydata; sftpFileAttr attr(remoteEncoding()); int code; @@ -1166,8 +1166,8 @@ void sftpProtocol::mimetype ( const KURL& url ){ return; } - Q_UINT32 len = 1024; // Get first 1k for determining mimetype - Q_UINT64 offset = 0; + TQ_UINT32 len = 1024; // Get first 1k for determining mimetype + TQ_UINT64 offset = 0; code = SSH2_FX_OK; while( offset < len && code == SSH2_FX_OK ) { if( (code = sftpRead(handle, offset, len, mydata)) == SSH2_FX_OK ) { @@ -1256,13 +1256,13 @@ void sftpProtocol::mkdir(const KURL&url, int permissions){ if (permissions != -1) attr.setPermissions(permissions); - Q_UINT32 id, expectedId; + TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << Q_UINT32(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + attr.size()); - s << (Q_UINT8)SSH2_FXP_MKDIR; + s << TQ_UINT32(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + attr.size()); + s << (TQ_UINT8)SSH2_FXP_MKDIR; s << id; s.writeBytes(path.data(), len); s << attr; @@ -1272,7 +1272,7 @@ void sftpProtocol::mkdir(const KURL&url, int permissions){ putPacket(p); getPacket(p); - Q_UINT8 type; + TQ_UINT8 type; TQDataStream r(p, IO_ReadOnly); r >> type >> id; @@ -1484,7 +1484,7 @@ bool sftpProtocol::getPacket(TQByteArray& msg) { b.open( IO_WriteOnly ); while( msgLen ) { - len = atomicio(ssh.stdioFd(), buf.data(), kMin(buf.size(), msgLen), true /*read*/); + len = atomicio(ssh.stdioFd(), buf.data(), kMin((uint)buf.size(), msgLen), true /*read*/); if( len == 0 || len == -1) { TQString errmsg; @@ -1538,20 +1538,20 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){ TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); - Q_UINT32 id, expectedId; + TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << Q_UINT32(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); - s << (Q_UINT8)SSH2_FXP_REALPATH; + s << TQ_UINT32(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); + s << (TQ_UINT8)SSH2_FXP_REALPATH; s << id; s.writeBytes(path.data(), len); putPacket(p); getPacket(p); - Q_UINT8 type; + TQ_UINT8 type; TQDataStream r(p, IO_ReadOnly); r >> type >> id; @@ -1561,7 +1561,7 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){ } if( type == SSH2_FXP_STATUS ) { - Q_UINT32 code; + TQ_UINT32 code; r >> code; return code; } @@ -1571,7 +1571,7 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){ return -1; } - Q_UINT32 count; + TQ_UINT32 count; r >> count; if( count != 1 ) { kdError(KIO_SFTP_DB) << "sftpRealPath(): Bad number of file attributes for realpath command" << endl; @@ -1589,7 +1589,7 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){ return SSH2_FX_OK; } -sftpProtocol::Status sftpProtocol::doProcessStatus(Q_UINT8 code, const TQString& message) +sftpProtocol::Status sftpProtocol::doProcessStatus(TQ_UINT8 code, const TQString& message) { Status res; res.code = 0; @@ -1628,7 +1628,7 @@ sftpProtocol::Status sftpProtocol::doProcessStatus(Q_UINT8 code, const TQString& } /** Process SSH_FXP_STATUS packets. */ -void sftpProtocol::processStatus(Q_UINT8 code, const TQString& message){ +void sftpProtocol::processStatus(TQ_UINT8 code, const TQString& message){ Status st = doProcessStatus( code, message ); if( st.code != 0 ) error( st.code, st.text ); @@ -1642,21 +1642,21 @@ int sftpProtocol::sftpOpenDirectory(const KURL& url, TQByteArray& handle){ TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); - Q_UINT32 id, expectedId; + TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); - s << (Q_UINT8)SSH2_FXP_OPENDIR; - s << (Q_UINT32)id; + s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); + s << (TQ_UINT8)SSH2_FXP_OPENDIR; + s << (TQ_UINT32)id; s.writeBytes(path.data(), len); putPacket(p); getPacket(p); TQDataStream r(p, IO_ReadOnly); - Q_UINT8 type; + TQ_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -1666,7 +1666,7 @@ int sftpProtocol::sftpOpenDirectory(const KURL& url, TQByteArray& handle){ } if( type == SSH2_FXP_STATUS ) { - Q_UINT32 errCode; + TQ_UINT32 errCode; r >> errCode; return errCode; } @@ -1691,21 +1691,21 @@ int sftpProtocol::sftpClose(const TQByteArray& handle){ kdDebug(KIO_SFTP_DB) << "sftpClose()" << endl; - Q_UINT32 id, expectedId; + TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size()); - s << (Q_UINT8)SSH2_FXP_CLOSE; - s << (Q_UINT32)id; + s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size()); + s << (TQ_UINT8)SSH2_FXP_CLOSE; + s << (TQ_UINT32)id; s << handle; putPacket(p); getPacket(p); TQDataStream r(p, IO_ReadOnly); - Q_UINT8 type; + TQ_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -1718,7 +1718,7 @@ int sftpProtocol::sftpClose(const TQByteArray& handle){ return -1; } - Q_UINT32 code; + TQ_UINT32 code; r >> code; if( code != SSH2_FX_OK ) { kdError(KIO_SFTP_DB) << "sftpClose: close failed with err code " << code << endl; @@ -1735,14 +1735,14 @@ int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){ TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); - Q_UINT32 id, expectedId; + TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + attr.size()); - s << (Q_UINT8)SSH2_FXP_SETSTAT; - s << (Q_UINT32)id; + s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + attr.size()); + s << (TQ_UINT8)SSH2_FXP_SETSTAT; + s << (TQ_UINT32)id; s.writeBytes(path.data(), len); s << attr; @@ -1750,7 +1750,7 @@ int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){ getPacket(p); TQDataStream r(p, IO_ReadOnly); - Q_UINT8 type; + TQ_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -1764,7 +1764,7 @@ int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){ return -1; } - Q_UINT32 code; + TQ_UINT32 code; r >> code; if( code != SSH2_FX_OK ) { kdError(KIO_SFTP_DB) << "sftpSetStat(): set stat failed with err code " << code << endl; @@ -1781,21 +1781,21 @@ int sftpProtocol::sftpRemove(const KURL& url, bool isfile){ TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); - Q_UINT32 id, expectedId; + TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); - s << (Q_UINT8)(isfile ? SSH2_FXP_REMOVE : SSH2_FXP_RMDIR); - s << (Q_UINT32)id; + s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); + s << (TQ_UINT8)(isfile ? SSH2_FXP_REMOVE : SSH2_FXP_RMDIR); + s << (TQ_UINT32)id; s.writeBytes(path.data(), len); putPacket(p); getPacket(p); TQDataStream r(p, IO_ReadOnly); - Q_UINT8 type; + TQ_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -1808,7 +1808,7 @@ int sftpProtocol::sftpRemove(const KURL& url, bool isfile){ return -1; } - Q_UINT32 code; + TQ_UINT32 code; r >> code; if( code != SSH2_FX_OK ) { kdError(KIO_SFTP_DB) << "del(): del failed with err code " << code << endl; @@ -1828,16 +1828,16 @@ int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){ uint slen = srcPath.length(); uint dlen = destPath.length(); - Q_UINT32 id, expectedId; + TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + + s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + slen + 4 /*str length*/ + dlen); - s << (Q_UINT8)SSH2_FXP_RENAME; - s << (Q_UINT32)id; + s << (TQ_UINT8)SSH2_FXP_RENAME; + s << (TQ_UINT32)id; s.writeBytes(srcPath.data(), slen); s.writeBytes(destPath.data(), dlen); @@ -1845,7 +1845,7 @@ int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){ getPacket(p); TQDataStream r(p, IO_ReadOnly); - Q_UINT8 type; + TQ_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -1871,8 +1871,8 @@ int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){ // url is needed so we can lookup the link destination kdDebug(KIO_SFTP_DB) << "sftpReadDir(): " << url << endl; - Q_UINT32 id, expectedId, count; - Q_UINT8 type; + TQ_UINT32 id, expectedId, count; + TQ_UINT8 type; sftpFileAttr attr (remoteEncoding()); attr.setDirAttrsFlag(true); @@ -1880,9 +1880,9 @@ int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){ TQByteArray p; TQDataStream s(p, IO_WriteOnly); id = expectedId = mMsgId++; - s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size()); - s << (Q_UINT8)SSH2_FXP_READDIR; - s << (Q_UINT32)id; + s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size()); + s << (TQ_UINT8)SSH2_FXP_READDIR; + s << (TQ_UINT32)id; s << handle; putPacket(p); @@ -1943,13 +1943,13 @@ int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){ //kdDebug(KIO_SFTP_DB) << "sftpReadLink(): Encoded Path: " << path << endl; //kdDebug(KIO_SFTP_DB) << "sftpReadLink(): Encoded Size: " << len << endl; - Q_UINT32 id, expectedId; + TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); - s << (Q_UINT8)SSH2_FXP_READLINK; + s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); + s << (TQ_UINT8)SSH2_FXP_READLINK; s << id; s.writeBytes(path.data(), len); @@ -1957,7 +1957,7 @@ int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){ putPacket(p); getPacket(p); - Q_UINT8 type; + TQ_UINT8 type; TQDataStream r(p, IO_ReadOnly); r >> type >> id; @@ -1967,7 +1967,7 @@ int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){ } if( type == SSH2_FXP_STATUS ) { - Q_UINT32 code; + TQ_UINT32 code; r >> code; kdDebug(KIO_SFTP_DB) << "sftpReadLink(): read link failed with code " << code << endl; return code; @@ -1978,7 +1978,7 @@ int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){ return -1; } - Q_UINT32 count; + TQ_UINT32 count; r >> count; if( count != 1 ) { kdError(KIO_SFTP_DB) << "sftpReadLink(): Bad number of file attributes for realpath command" << endl; @@ -2005,16 +2005,16 @@ int sftpProtocol::sftpSymLink(const TQString& _target, const KURL& dest){ kdDebug(KIO_SFTP_DB) << "sftpSymLink(" << target << " -> " << destPath << ")" << endl; - Q_UINT32 id, expectedId; + TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + + s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + tlen + 4 /*str length*/ + dlen); - s << (Q_UINT8)SSH2_FXP_SYMLINK; - s << (Q_UINT32)id; + s << (TQ_UINT8)SSH2_FXP_SYMLINK; + s << (TQ_UINT32)id; s.writeBytes(target.data(), tlen); s.writeBytes(destPath.data(), dlen); @@ -2022,7 +2022,7 @@ int sftpProtocol::sftpSymLink(const TQString& _target, const KURL& dest){ getPacket(p); TQDataStream r(p, IO_ReadOnly); - Q_UINT8 type; + TQ_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -2035,7 +2035,7 @@ int sftpProtocol::sftpSymLink(const TQString& _target, const KURL& dest){ return -1; } - Q_UINT32 code; + TQ_UINT32 code; r >> code; if( code != SSH2_FX_OK ) { kdError(KIO_SFTP_DB) << "sftpSymLink(): rename failed with err code " << code << endl; @@ -2052,21 +2052,21 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) { TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); - Q_UINT32 id, expectedId; + TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); - s << (Q_UINT8)SSH2_FXP_LSTAT; - s << (Q_UINT32)id; + s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); + s << (TQ_UINT8)SSH2_FXP_LSTAT; + s << (TQ_UINT32)id; s.writeBytes(path.data(), len); putPacket(p); getPacket(p); TQDataStream r(p, IO_ReadOnly); - Q_UINT8 type; + TQ_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -2075,7 +2075,7 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) { } if( type == SSH2_FXP_STATUS ) { - Q_UINT32 errCode; + TQ_UINT32 errCode; r >> errCode; kdError(KIO_SFTP_DB) << "sftpStat(): stat failed with code " << errCode << endl; return errCode; @@ -2133,23 +2133,23 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) { } -int sftpProtocol::sftpOpen(const KURL& url, const Q_UINT32 pflags, +int sftpProtocol::sftpOpen(const KURL& url, const TQ_UINT32 pflags, const sftpFileAttr& attr, TQByteArray& handle) { kdDebug(KIO_SFTP_DB) << "sftpOpen(" << url << ", handle" << endl; TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); - Q_UINT32 id, expectedId; + TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + + s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + 4 /*pflags*/ + attr.size()); - s << (Q_UINT8)SSH2_FXP_OPEN; - s << (Q_UINT32)id; + s << (TQ_UINT8)SSH2_FXP_OPEN; + s << (TQ_UINT32)id; s.writeBytes(path.data(), len); s << pflags; s << attr; @@ -2158,7 +2158,7 @@ int sftpProtocol::sftpOpen(const KURL& url, const Q_UINT32 pflags, getPacket(p); TQDataStream r(p, IO_ReadOnly); - Q_UINT8 type; + TQ_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -2167,7 +2167,7 @@ int sftpProtocol::sftpOpen(const KURL& url, const Q_UINT32 pflags, } if( type == SSH2_FXP_STATUS ) { - Q_UINT32 errCode; + TQ_UINT32 errCode; r >> errCode; return errCode; } @@ -2188,19 +2188,19 @@ int sftpProtocol::sftpOpen(const KURL& url, const Q_UINT32 pflags, } -int sftpProtocol::sftpRead(const TQByteArray& handle, KIO::filesize_t offset, Q_UINT32 len, TQByteArray& data) +int sftpProtocol::sftpRead(const TQByteArray& handle, KIO::filesize_t offset, TQ_UINT32 len, TQByteArray& data) { // kdDebug(KIO_SFTP_DB) << "sftpRead( offset = " << offset << ", len = " << len << ")" << endl; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - Q_UINT32 id, expectedId; + TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; - s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + + s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size() + 8 /*offset*/ + 4 /*length*/); - s << (Q_UINT8)SSH2_FXP_READ; - s << (Q_UINT32)id; + s << (TQ_UINT8)SSH2_FXP_READ; + s << (TQ_UINT32)id; s << handle; s << offset; // we don't have a convienient 64 bit int so set upper int to zero s << len; @@ -2209,7 +2209,7 @@ int sftpProtocol::sftpRead(const TQByteArray& handle, KIO::filesize_t offset, Q_ getPacket(p); TQDataStream r(p, IO_ReadOnly); - Q_UINT8 type; + TQ_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -2218,7 +2218,7 @@ int sftpProtocol::sftpRead(const TQByteArray& handle, KIO::filesize_t offset, Q_ } if( type == SSH2_FXP_STATUS ) { - Q_UINT32 errCode; + TQ_UINT32 errCode; r >> errCode; kdError(KIO_SFTP_DB) << "sftpRead: read failed with code " << errCode << endl; return errCode; @@ -2241,14 +2241,14 @@ int sftpProtocol::sftpWrite(const TQByteArray& handle, KIO::filesize_t offset, c TQByteArray p; TQDataStream s(p, IO_WriteOnly); - Q_UINT32 id, expectedId; + TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; - s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + + s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size() + 8 /*offset*/ + 4 /* data size */ + data.size()); - s << (Q_UINT8)SSH2_FXP_WRITE; - s << (Q_UINT32)id; + s << (TQ_UINT8)SSH2_FXP_WRITE; + s << (TQ_UINT32)id; s << handle; s << offset; // we don't have a convienient 64 bit int so set upper int to zero s << data; @@ -2264,7 +2264,7 @@ int sftpProtocol::sftpWrite(const TQByteArray& handle, KIO::filesize_t offset, c // kdDebug(KIO_SFTP_DB) << "sftpWrite(): received packet [" << p << "]" << endl; TQDataStream r(p, IO_ReadOnly); - Q_UINT8 type; + TQ_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -2278,7 +2278,7 @@ int sftpProtocol::sftpWrite(const TQByteArray& handle, KIO::filesize_t offset, c return -1; } - Q_UINT32 code; + TQ_UINT32 code; r >> code; return code; } diff --git a/kioslave/sftp/kio_sftp.h b/kioslave/sftp/kio_sftp.h index 22cd4764a..951d3e46e 100644 --- a/kioslave/sftp/kio_sftp.h +++ b/kioslave/sftp/kio_sftp.h @@ -109,9 +109,9 @@ private: // private methods /** Send an sftp packet to stdin of the ssh process. */ bool putPacket(TQByteArray& p); /** Process SSH_FXP_STATUS packets. */ - void processStatus(Q_UINT8, const TQString& message = TQString::null); + void processStatus(TQ_UINT8, const TQString& message = TQString::null); /** Process SSH_FXP_STATUS packes and return the result. */ - Status doProcessStatus(Q_UINT8, const TQString& message = TQString::null); + Status doProcessStatus(TQ_UINT8, const TQString& message = TQString::null); /** Opens a directory handle for url.path. Returns true if succeeds. */ int sftpOpenDirectory(const KURL& url, TQByteArray& handle); /** Closes a directory or file handle. */ @@ -131,9 +131,9 @@ private: // private methods /** Stats a file. */ int sftpStat(const KURL& url, sftpFileAttr& attr); /** No descriptions */ - int sftpOpen(const KURL& url, const Q_UINT32 pflags, const sftpFileAttr& attr, TQByteArray& handle); + int sftpOpen(const KURL& url, const TQ_UINT32 pflags, const sftpFileAttr& attr, TQByteArray& handle); /** No descriptions */ - int sftpRead(const TQByteArray& handle, KIO::filesize_t offset, Q_UINT32 len, TQByteArray& data); + int sftpRead(const TQByteArray& handle, KIO::filesize_t offset, TQ_UINT32 len, TQByteArray& data); /** No descriptions */ int sftpWrite(const TQByteArray& handle, KIO::filesize_t offset, const TQByteArray& data); diff --git a/kioslave/sftp/ksshprocess.cpp b/kioslave/sftp/ksshprocess.cpp index 9b2323bd6..6dfdb2419 100644 --- a/kioslave/sftp/ksshprocess.cpp +++ b/kioslave/sftp/ksshprocess.cpp @@ -206,7 +206,7 @@ void KSshProcess::removeSignalHandlers() { KSshProcess::KSshProcess() : mVersion(UNKNOWN_VER), mConnected(false), mRunning(false), mConnectState(0) { - mSshPath = KStandardDirs::findExe(TQString::fromLatin1("ssh")); + mSshPath = KStandardDirs::findExe(TQString::tqfromLatin1("ssh")); kdDebug(KSSHPROC) << "KSshProcess::KSshProcess(): ssh path [" << mSshPath << "]" << endl; @@ -266,7 +266,7 @@ KSshProcess::SshVersion KSshProcess::version() { mVersion = UNKNOWN_VER; for(int i = 0; i < SSH_VER_MAX; i++) { - if( ver.find(versionStrs[i]) != -1 ) { + if( ver.tqfind(versionStrs[i]) != -1 ) { mVersion = (SshVersion)i; break; } @@ -292,7 +292,7 @@ TQString KSshProcess::versionStr() { return TQString::null; } - return TQString::fromLatin1(versionStrs[mVersion]); + return TQString::tqfromLatin1(versionStrs[mVersion]); } */ @@ -380,8 +380,8 @@ bool KSshProcess::setOptions(const SshOptList& opts) { // since KSshProcess depends on specific setting of these for // preforming authentication correctly. tmp = (*it).str.latin1(); - if( tmp.contains("NumberOfPasswordPrompts") || - tmp.contains("StrictHostKeyChecking") ) { + if( tmp.tqcontains("NumberOfPasswordPrompts") || + tmp.tqcontains("StrictHostKeyChecking") ) { mError = ERR_INVALID_OPT; return false; } @@ -776,26 +776,26 @@ bool KSshProcess::connect() { i18n("Error encountered while talking to ssh."); mConnectState = STATE_FATAL; } - else if( line.find(TQString::fromLatin1(passwordPrompt[mVersion]), 0, false) != -1 ) { + else if( line.tqfind(TQString::tqfromLatin1(passwordPrompt[mVersion]), 0, false) != -1 ) { mConnectState = STATE_TRY_PASSWD; } - else if( line.find(passphrasePrompt[mVersion]) != -1 ) { + else if( line.tqfind(passphrasePrompt[mVersion]) != -1 ) { mConnectState = STATE_TRY_PASSPHRASE; } - else if( line.find(authSuccessMsg[mVersion]) != -1 ) { + else if( line.tqfind(authSuccessMsg[mVersion]) != -1 ) { return true; } - else if( line.find(authFailedMsg[mVersion]) != -1 - && line.find(tryAgainMsg[mVersion]) == -1 ) { + else if( line.tqfind(authFailedMsg[mVersion]) != -1 + && line.tqfind(tryAgainMsg[mVersion]) == -1 ) { mConnectState = STATE_AUTH_FAILED; } - else if( line.find(hostKeyMissingMsg[mVersion]) != -1 ) { + else if( line.tqfind(hostKeyMissingMsg[mVersion]) != -1 ) { mConnectState = STATE_NEW_KEY_WAIT_CONTINUE; } - else if( line.find(hostKeyChangedMsg[mVersion]) != -1 ) { + else if( line.tqfind(hostKeyChangedMsg[mVersion]) != -1 ) { mConnectState = STATE_DIFF_KEY_WAIT_CONTINUE; } - else if( line.find(continuePrompt[mVersion]) != -1 ) { + else if( line.tqfind(continuePrompt[mVersion]) != -1 ) { //mConnectState = STATE_SEND_CONTINUE; kdDebug(KSSHPROC) << "KSshProcess:connect(): " "Got continue prompt where we shouldn't (STATE_WAIT_PROMPT)" @@ -804,12 +804,12 @@ bool KSshProcess::connect() { mErrorMsg = i18n("Error encountered while talking to ssh."); } - else if( line.find(connectionClosedMsg[mVersion]) != -1 ) { + else if( line.tqfind(connectionClosedMsg[mVersion]) != -1 ) { mConnectState = STATE_FATAL; mError = ERR_CLOSED_BY_REMOTE_HOST; mErrorMsg = i18n("Connection closed by remote host."); } - else if( line.find(changeHostKeyOnDiskPrompt[mVersion]) != -1 ) { + else if( line.tqfind(changeHostKeyOnDiskPrompt[mVersion]) != -1 ) { // always say yes to this. It always comes after commerical ssh // prints a "continue to connect prompt". We assume that if the // user choose to continue, then they also want to save the @@ -924,9 +924,9 @@ bool KSshProcess::connect() { i18n("Error encountered while talking to ssh."); mConnectState = STATE_FATAL; } - else if( (line.find(authFailedMsg[mVersion]) != -1 - && line.find(tryAgainMsg[mVersion]) == -1) - || line.find(hostKeyVerifyFailedMsg[mVersion]) != -1 ) { + else if( (line.tqfind(authFailedMsg[mVersion]) != -1 + && line.tqfind(tryAgainMsg[mVersion]) == -1) + || line.tqfind(hostKeyVerifyFailedMsg[mVersion]) != -1 ) { mError = ERR_AUTH_FAILED_NEW_KEY; mErrorMsg = i18n( "The identity of the remote host '%1' could not be verified " @@ -948,15 +948,15 @@ bool KSshProcess::connect() { mConnectState = STATE_FATAL; } - else if( line.find(continuePrompt[mVersion]) != -1 ) { + else if( line.tqfind(continuePrompt[mVersion]) != -1 ) { mConnectState = STATE_NEW_KEY_CONTINUE; } - else if( line.find(connectionClosedMsg[mVersion]) != -1 ) { + else if( line.tqfind(connectionClosedMsg[mVersion]) != -1 ) { mConnectState = STATE_FATAL; mError = ERR_CLOSED_BY_REMOTE_HOST; mErrorMsg = i18n("Connection closed by remote host."); } - else if( line.find(keyFingerprintMsg[mVersion]) != -1 ) { + else if( line.tqfind(keyFingerprintMsg[mVersion]) != -1 ) { mKeyFingerprint = keyFingerprintMsg[mVersion].cap(); kdDebug(KSSHPROC) << "Found key fingerprint: " << mKeyFingerprint << endl; mConnectState = STATE_NEW_KEY_WAIT_CONTINUE; @@ -996,9 +996,9 @@ bool KSshProcess::connect() { i18n("Error encountered while talking to ssh."); mConnectState = STATE_FATAL; } - else if( (line.find(authFailedMsg[mVersion]) != -1 - && line.find(tryAgainMsg[mVersion]) == -1) - || line.find(hostKeyVerifyFailedMsg[mVersion]) != -1 ) { + else if( (line.tqfind(authFailedMsg[mVersion]) != -1 + && line.tqfind(tryAgainMsg[mVersion]) == -1) + || line.tqfind(hostKeyVerifyFailedMsg[mVersion]) != -1 ) { mError = ERR_AUTH_FAILED_DIFF_KEY; mErrorMsg = i18n( "WARNING: The identity of the remote host '%1' has changed!\n\n" @@ -1011,15 +1011,15 @@ bool KSshProcess::connect() { ).arg(mHost).arg(mKeyFingerprint).arg(mKnownHostsFile); mConnectState = STATE_FATAL; } - else if( line.find(continuePrompt[mVersion]) != -1 ) { + else if( line.tqfind(continuePrompt[mVersion]) != -1 ) { mConnectState = STATE_DIFF_KEY_CONTINUE; } - else if( line.find(keyFingerprintMsg[mVersion]) != -1 ) { + else if( line.tqfind(keyFingerprintMsg[mVersion]) != -1 ) { mKeyFingerprint = keyFingerprintMsg[mVersion].cap(); kdDebug(KSSHPROC) << "Found key fingerprint: " << mKeyFingerprint << endl; mConnectState = STATE_DIFF_KEY_WAIT_CONTINUE; } - else if( line.find(knownHostsFileMsg[mVersion]) != -1 ) { + else if( line.tqfind(knownHostsFileMsg[mVersion]) != -1 ) { mKnownHostsFile = (knownHostsFileMsg[mVersion]).cap(1); kdDebug(KSSHPROC) << "Found known hosts file name: " << mKnownHostsFile << endl; mConnectState = STATE_DIFF_KEY_WAIT_CONTINUE; diff --git a/kioslave/sftp/ksshprocess.h b/kioslave/sftp/ksshprocess.h index 7fe8dd814..5130628e4 100644 --- a/kioslave/sftp/ksshprocess.h +++ b/kioslave/sftp/ksshprocess.h @@ -116,9 +116,9 @@ public: */ class SshOpt { public: - Q_UINT32 opt; + TQ_UINT32 opt; TQString str; - Q_INT32 num; + TQ_INT32 num; bool boolean; }; diff --git a/kioslave/sftp/process.cpp b/kioslave/sftp/process.cpp index ca99b36bb..b97d5860b 100644 --- a/kioslave/sftp/process.cpp +++ b/kioslave/sftp/process.cpp @@ -107,7 +107,7 @@ TQCString MyPtyProcess::readLineFrom(int fd, TQCString& inbuf, bool block) if (!inbuf.isEmpty()) { - pos = inbuf.find('\n'); + pos = inbuf.tqfind('\n'); if (pos == -1) { @@ -155,7 +155,7 @@ TQCString MyPtyProcess::readLineFrom(int fd, TQCString& inbuf, bool block) buf[nbytes] = '\000'; inbuf += buf; - pos = inbuf.find('\n'); + pos = inbuf.tqfind('\n'); if (pos == -1) { ret = inbuf; @@ -260,7 +260,7 @@ int MyPtyProcess::exec(TQCString command, QCStringList args) // From now on, terminal output goes through the tty. TQCString path; - if (command.contains('/')) + if (command.tqcontains('/')) path = command; else { diff --git a/kioslave/sftp/sftpfileattr.cpp b/kioslave/sftp/sftpfileattr.cpp index 42148ac28..9b7bf9b34 100644 --- a/kioslave/sftp/sftpfileattr.cpp +++ b/kioslave/sftp/sftpfileattr.cpp @@ -44,7 +44,7 @@ sftpFileAttr::sftpFileAttr(KRemoteEncoding* encoding){ /** Constructor to initialize the file attributes on declaration. */ sftpFileAttr::sftpFileAttr(Q_ULLONG size, uid_t uid, gid_t gid, mode_t permissions, time_t atime, - time_t mtime, Q_UINT32 extendedCount) { + time_t mtime, TQ_UINT32 extendedCount) { clear(); mDirAttrs = false; mSize = size; @@ -124,22 +124,22 @@ UDSEntry sftpFileAttr::entry() { /** Use to output the file attributes to a sftp packet */ TQDataStream& operator<< (TQDataStream& s, const sftpFileAttr& fa) { - s << (Q_UINT32)fa.mFlags; + s << (TQ_UINT32)fa.mFlags; if( fa.mFlags & SSH2_FILEXFER_ATTR_SIZE ) { s << (Q_ULLONG)fa.mSize; } if( fa.mFlags & SSH2_FILEXFER_ATTR_UIDGID ) - { s << (Q_UINT32)fa.mUid << (Q_UINT32)fa.mGid; } + { s << (TQ_UINT32)fa.mUid << (TQ_UINT32)fa.mGid; } if( fa.mFlags & SSH2_FILEXFER_ATTR_PERMISSIONS ) - { s << (Q_UINT32)fa.mPermissions; } + { s << (TQ_UINT32)fa.mPermissions; } if( fa.mFlags & SSH2_FILEXFER_ATTR_ACMODTIME ) - { s << (Q_UINT32)fa.mAtime << (Q_UINT32)fa.mMtime; } + { s << (TQ_UINT32)fa.mAtime << (TQ_UINT32)fa.mMtime; } if( fa.mFlags & SSH2_FILEXFER_ATTR_EXTENDED ) { - s << (Q_UINT32)fa.mExtendedCount; + s << (TQ_UINT32)fa.mExtendedCount; // XXX: Write extensions to data stream here // s.writeBytes(extendedtype).writeBytes(extendeddata); } @@ -175,7 +175,7 @@ TQDataStream& operator>> (TQDataStream& s, sftpFileAttr& fa) { fa.setFileSize(fileSize); } - Q_UINT32 x; + TQ_UINT32 x; if( fa.mFlags & SSH2_FILEXFER_ATTR_UIDGID ) { s >> x; fa.setUid(x); @@ -295,8 +295,8 @@ void sftpFileAttr::clear(){ } /** Return the size of the sftp attribute. */ -Q_UINT32 sftpFileAttr::size() const{ - Q_UINT32 size = 4; // for the attr flag +TQ_UINT32 sftpFileAttr::size() const{ + TQ_UINT32 size = 4; // for the attr flag if( mFlags & SSH2_FILEXFER_ATTR_SIZE ) size += 8; diff --git a/kioslave/sftp/sftpfileattr.h b/kioslave/sftp/sftpfileattr.h index a2a9cf87e..006f1d124 100644 --- a/kioslave/sftp/sftpfileattr.h +++ b/kioslave/sftp/sftpfileattr.h @@ -42,7 +42,7 @@ private: // Private attributes TQString mFilename; /** Specifies which fields of the file attribute are available. */ - Q_UINT32 mFlags; + TQ_UINT32 mFlags; /** Size of the file in bytes. Should be 64 bit safe. */ Q_ULLONG mSize; @@ -64,7 +64,7 @@ private: // Private attributes /** Number of file attribute extensions. Not currently implemented */ - Q_UINT32 mExtendedCount; + TQ_UINT32 mExtendedCount; /** Longname of the file as found in a SSH_FXP_NAME sftp packet. These contents are parse to return the file's owner name and @@ -95,10 +95,10 @@ public: /** Constructor to initialize the file attributes on declaration. */ sftpFileAttr(Q_ULLONG size_, uid_t uid_, gid_t gid_, mode_t permissions_, - time_t atime_, time_t mtime_, Q_UINT32 extendedCount_ = 0); + time_t atime_, time_t mtime_, TQ_UINT32 extendedCount_ = 0); /** Return the size of the sftp attribute not including filename or longname*/ - Q_UINT32 size() const; + TQ_UINT32 size() const; /** Clear all attributes and flags. */ void clear(); diff --git a/kioslave/smb/kio_smb_auth.cpp b/kioslave/smb/kio_smb_auth.cpp index d4a48239f..d82301e94 100644 --- a/kioslave/smb/kio_smb_auth.cpp +++ b/kioslave/smb/kio_smb_auth.cpp @@ -118,7 +118,7 @@ bool SMBSlave::checkPassword(SMBUrl &url) info.url.setHost(url.host()); TQString share = url.path(); - int index = share.find('/', 1); + int index = share.tqfind('/', 1); if (index > 1) share = share.left(index); if (share.at(0) == '/') diff --git a/kioslave/smb/kio_smb_browse.cpp b/kioslave/smb/kio_smb_browse.cpp index e9a216fd3..cab3fe9be 100644 --- a/kioslave/smb/kio_smb_browse.cpp +++ b/kioslave/smb/kio_smb_browse.cpp @@ -208,13 +208,13 @@ KURL SMBSlave::checkURL(const KURL& kurl) const // smb:/ normaly have no userinfo // we must redirect ourself to remove the username and password - if (surl.contains('@') && !surl.contains("smb://")) { + if (surl.tqcontains('@') && !surl.tqcontains("smb://")) { KURL url(kurl); - url.setPath("/"+kurl.url().right( kurl.url().length()-kurl.url().find('@') -1)); - TQString userinfo = kurl.url().mid(5, kurl.url().find('@')-5); - if(userinfo.contains(':')) { - url.setUser(userinfo.left(userinfo.find(':'))); - url.setPass(userinfo.right(userinfo.length()-userinfo.find(':')-1)); + url.setPath("/"+kurl.url().right( kurl.url().length()-kurl.url().tqfind('@') -1)); + TQString userinfo = kurl.url().mid(5, kurl.url().tqfind('@')-5); + if(userinfo.tqcontains(':')) { + url.setUser(userinfo.left(userinfo.tqfind(':'))); + url.setPass(userinfo.right(userinfo.length()-userinfo.tqfind(':')-1)); } else { url.setUser(userinfo); } @@ -409,7 +409,7 @@ void SMBSlave::listDir( const KURL& kurl ) udsentry.append(atom); atom.m_uds = KIO::UDS_MIME_TYPE; - atom.m_str = TQString::fromLatin1("application/x-smb-server"); + atom.m_str = TQString::tqfromLatin1("application/x-smb-server"); udsentry.append(atom); } @@ -429,7 +429,7 @@ void SMBSlave::listDir( const KURL& kurl ) udsentry.append(atom); atom.m_uds = KIO::UDS_MIME_TYPE; - atom.m_str = TQString::fromLatin1("application/x-smb-workgroup"); + atom.m_str = TQString::tqfromLatin1("application/x-smb-workgroup"); udsentry.append(atom); atom.m_uds = KIO::UDS_URL; diff --git a/kioslave/smb/kio_smb_mount.cpp b/kioslave/smb/kio_smb_mount.cpp index f9c366235..04d4f56fd 100644 --- a/kioslave/smb/kio_smb_mount.cpp +++ b/kioslave/smb/kio_smb_mount.cpp @@ -59,7 +59,7 @@ void SMBSlave::special( const TQByteArray & data) kdDebug(KIO_SMB)<<"special() host -"<< host <<"- share -" << share <<"-"<', ">" ) - .replace( '<', "<" ) - .replace( '"', """ ) + .tqreplace( '&', "&" ) + .tqreplace( '>', ">" ) + .tqreplace( '<', "<" ) + .tqreplace( '"', """ ) ; } diff --git a/kioslave/smtp/request.cc b/kioslave/smtp/request.cc index ab02abc1c..22042769b 100644 --- a/kioslave/smtp/request.cc +++ b/kioslave/smtp/request.cc @@ -50,7 +50,7 @@ namespace KioSMTP { kdDebug(7112) << "Parsing request from query:\n" + query.join("\n" ) << endl; #endif for ( TQStringList::const_iterator it = query.begin() ; it != query.end() ; ++it ) { - int equalsPos = (*it).find( '=' ); + int equalsPos = (*it).tqfind( '=' ); if ( equalsPos <= 0 ) continue; @@ -93,7 +93,7 @@ namespace KioSMTP { static bool isUsAscii( const TQString & s ) { for ( uint i = 0 ; i < s.length() ; ++i ) - if ( s[i].unicode() > 127 ) return false; + if ( s[i].tqunicode() > 127 ) return false; return true; } @@ -101,7 +101,7 @@ namespace KioSMTP { static inline bool isSpecial( char ch ) { static const TQCString specials = "()<>[]:;@\\,.\""; - return specials.find( ch ) >= 0; + return specials.tqfind( ch ) >= 0; } @@ -159,7 +159,7 @@ namespace KioSMTP { static TQCString formatSubject( TQString s ) { if ( isUsAscii( s ) ) - return s.remove( '\n' ).latin1(); // don't break header folding, + return TQString(s.remove( '\n' )).latin1(); // don't break header folding, // so remove any line break // that happen to be around else diff --git a/kioslave/smtp/response.cc b/kioslave/smtp/response.cc index ec5067871..8ae8cdceb 100644 --- a/kioslave/smtp/response.cc +++ b/kioslave/smtp/response.cc @@ -103,10 +103,10 @@ namespace KioSMTP { TQString msg; if ( lines().count() > 1 ) msg = i18n("The server responded:\n%1") - .arg( join( '\n', lines() ) ); + .arg( static_cast(join( '\n', lines()) ) ); else msg = i18n("The server responded: \"%1\"") - .arg( lines().front() ); + .arg( static_cast(lines().front()) ); if ( first() == 4 ) msg += '\n' + i18n("This is a temporary failure. " "You may try again later."); diff --git a/kioslave/smtp/response.h b/kioslave/smtp/response.h index 26c79b9c1..2fd48ebf3 100644 --- a/kioslave/smtp/response.h +++ b/kioslave/smtp/response.h @@ -49,7 +49,7 @@ namespace KioSMTP { mWellFormed(true) {} void parseLine( const char * line ) { - parseLine( line, qstrlen( line ) ); + parseLine( line, tqstrlen( line ) ); } void parseLine( const char * line, int len ); diff --git a/kioslave/smtp/smtp.cc b/kioslave/smtp/smtp.cc index e493f5132..883ee3ebb 100644 --- a/kioslave/smtp/smtp.cc +++ b/kioslave/smtp/smtp.cc @@ -200,7 +200,7 @@ void SMTPProtocol::put(const KURL & url, int /*permissions */ , KURL open_url = url; if ( !request.hasProfile() ) { //kdDebug(7112) << "kio_smtp: Profile is null" << endl; - bool hasProfile = mset.profiles().contains( open_url.host() ); + bool hasProfile = mset.profiles().tqcontains( open_url.host() ); if ( hasProfile ) { mset.setProfile(open_url.host()); open_url.setHost(mset.getSetting(KEMailSettings::OutServer)); diff --git a/kioslave/smtp/smtp.h b/kioslave/smtp/smtp.h index 18f489c2c..bcdcaaae3 100644 --- a/kioslave/smtp/smtp.h +++ b/kioslave/smtp/smtp.h @@ -1,6 +1,6 @@ /* -*- c++ -*- * Copyright (c) 2000, 2001 Alex Zepeda - * Copyright (c) 2001 Michael Häckel + * Copyright (c) 2001 Michael H�ckel * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,9 @@ class KURL; class TQCString; template class TQMemArray; +#ifdef USE_QT3 typedef TQMemArray TQByteArray; +#endif // USE_QT3 namespace KioSMTP { class Response; diff --git a/kioslave/smtp/test_commands.cc b/kioslave/smtp/test_commands.cc index 680514b10..fd3adb949 100644 --- a/kioslave/smtp/test_commands.cc +++ b/kioslave/smtp/test_commands.cc @@ -55,7 +55,7 @@ public: } bool usingSSL() const { return usesSSL; } bool usingTLS() const { return usesTLS; } - bool haveCapability( const char * cap ) const { return caps.contains( cap ); } + bool haveCapability( const char * cap ) const { return caps.tqcontains( cap ); } void error( int id, const TQString & msg ) { lastErrorCode = id; lastErrorMessage = msg; @@ -82,16 +82,16 @@ public: using namespace KioSMTP; static const char * foobarbaz = ".Foo bar baz"; -static const unsigned int foobarbaz_len = qstrlen( foobarbaz ); +static const unsigned int foobarbaz_len = tqstrlen( foobarbaz ); static const char * foobarbaz_dotstuffed = "..Foo bar baz"; -static const unsigned int foobarbaz_dotstuffed_len = qstrlen( foobarbaz_dotstuffed ); +static const unsigned int foobarbaz_dotstuffed_len = tqstrlen( foobarbaz_dotstuffed ); static const char * foobarbaz_lf = ".Foo bar baz\n"; -static const unsigned int foobarbaz_lf_len = qstrlen( foobarbaz_lf ); +static const unsigned int foobarbaz_lf_len = tqstrlen( foobarbaz_lf ); static const char * foobarbaz_crlf = "..Foo bar baz\r\n"; -static const unsigned int foobarbaz_crlf_len = qstrlen( foobarbaz_crlf ); +static const unsigned int foobarbaz_crlf_len = tqstrlen( foobarbaz_crlf ); static void checkSuccessfulTransferCommand( bool, bool, bool, bool, bool ); @@ -657,10 +657,10 @@ void checkSuccessfulTransferCommand( bool error, bool preload, bool ungetLast, mailEndsInNewline ? foobarbaz_lf : foobarbaz : mailEndsInNewline ? foobarbaz_crlf : foobarbaz_dotstuffed ; - const unsigned int s_pre_len = qstrlen( s_pre ); + const unsigned int s_pre_len = tqstrlen( s_pre ); const char * s_post = mailEndsInNewline ? foobarbaz_crlf : foobarbaz_dotstuffed ; - //const unsigned int s_post_len = qstrlen( s_post ); + //const unsigned int s_post_len = tqstrlen( s_post ); TransferCommand xfer( &smtp, preload ? s_post : 0 ); diff --git a/kioslave/system/kdedmodule/systemdirnotify.cpp b/kioslave/system/kdedmodule/systemdirnotify.cpp index 162d96621..70d9057a6 100644 --- a/kioslave/system/kdedmodule/systemdirnotify.cpp +++ b/kioslave/system/kdedmodule/systemdirnotify.cpp @@ -59,7 +59,7 @@ void SystemDirNotify::init() for(; name!=endf; ++name) { - if (!names_found.contains(*name)) + if (!names_found.tqcontains(*name)) { KDesktopFile desktop(*dirpath+*name, true); diff --git a/kioslave/system/systemimpl.cpp b/kioslave/system/systemimpl.cpp index 63171009a..4dc5e3008 100644 --- a/kioslave/system/systemimpl.cpp +++ b/kioslave/system/systemimpl.cpp @@ -62,7 +62,7 @@ bool SystemImpl::listRoot(TQValueList &list) for(; filename!=endf; ++filename) { - if (!names_found.contains(*filename)) + if (!names_found.tqcontains(*filename)) { entry.clear(); createEntry(entry, *dirpath, *filename); @@ -82,7 +82,7 @@ bool SystemImpl::parseURL(const KURL &url, TQString &name, TQString &path) const { TQString url_path = url.path(); - int i = url_path.find('/', 1); + int i = url_path.tqfind('/', 1); if (i > 0) { name = url_path.mid(1, i-1); @@ -285,7 +285,7 @@ void SystemImpl::createEntry(KIO::UDSEntry &entry, const KIO::UDSEntryList &) ) ); connect( job, TQT_SIGNAL( result(KIO::Job *) ), this, TQT_SLOT( slotResult(KIO::Job *) ) ); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); if (m_lastListingEmpty) icon = empty_icon; } @@ -299,13 +299,13 @@ void SystemImpl::slotEntries(KIO::Job *job, const KIO::UDSEntryList &list) { job->kill(true); m_lastListingEmpty = false; - qApp->eventLoop()->exitLoop(); + tqApp->eventLoop()->exitLoop(); } } void SystemImpl::slotResult(KIO::Job *) { - qApp->eventLoop()->exitLoop(); + tqApp->eventLoop()->exitLoop(); } diff --git a/kioslave/system/systemimpl.h b/kioslave/system/systemimpl.h index 45de39b3b..31dc2daad 100644 --- a/kioslave/system/systemimpl.h +++ b/kioslave/system/systemimpl.h @@ -29,7 +29,7 @@ #include #include -class SystemImpl : public QObject +class SystemImpl : public TQObject { Q_OBJECT public: diff --git a/kioslave/tar/tar.cc b/kioslave/tar/tar.cc index 8afc1d0e8..b55fd317e 100644 --- a/kioslave/tar/tar.cc +++ b/kioslave/tar/tar.cc @@ -103,7 +103,7 @@ bool ArchiveProtocol::checkNewFile( const KURL & url, TQString & path, KIO::Erro kdDebug(7109) << "the full path is " << fullPath << endl; KDE_struct_stat statbuf; statbuf.st_mode = 0; // be sure to clear the directory bit - while ( (pos=fullPath.find( '/', pos+1 )) != -1 ) + while ( (pos=fullPath.tqfind( '/', pos+1 )) != -1 ) { TQString tryPath = fullPath.left( pos ); kdDebug(7109) << fullPath << " trying " << tryPath << endl; @@ -125,7 +125,7 @@ bool ArchiveProtocol::checkNewFile( const KURL & url, TQString & path, KIO::Erro path.truncate( len - 1 ); } else - path = TQString::fromLatin1("/"); + path = TQString::tqfromLatin1("/"); kdDebug(7109) << "Found. archiveFile=" << archiveFile << " path=" << path << endl; break; } @@ -248,9 +248,9 @@ void ArchiveProtocol::listDir( const KURL & url ) if ( path.isEmpty() ) { - KURL redir( url.protocol() + TQString::fromLatin1( ":/") ); + KURL redir( url.protocol() + TQString::tqfromLatin1( ":/") ); kdDebug( 7109 ) << "url.path()==" << url.path() << endl; - redir.setPath( url.path() + TQString::fromLatin1("/") ); + redir.setPath( url.path() + TQString::tqfromLatin1("/") ); kdDebug( 7109 ) << "ArchiveProtocol::listDir: redirection " << redir.url() << endl; redirection( redir ); finished(); @@ -264,7 +264,7 @@ void ArchiveProtocol::listDir( const KURL & url ) const KArchiveDirectory* dir; if (!path.isEmpty() && path != "/") { - kdDebug(7109) << TQString("Looking for entry %1").arg(path) << endl; + kdDebug(7109) << TQString(TQString("Looking for entry %1").arg(path)) << endl; const KArchiveEntry* e = root->entry( path ); if ( !e ) { @@ -360,7 +360,7 @@ void ArchiveProtocol::stat( const KURL & url ) const KArchiveEntry* archiveEntry; if ( path.isEmpty() ) { - path = TQString::fromLatin1( "/" ); + path = TQString::tqfromLatin1( "/" ); archiveEntry = root; } else { path = TQString::fromLocal8Bit(remoteEncoding()->encode(path)); @@ -504,9 +504,9 @@ void ArchiveProtocol::get( const KURL & url ) if ( !firstRead ) { bufferSize = kMin( maxSize, fileSize ); - buffer.resize( bufferSize, TQGArray::SpeedOptim ); + buffer.tqresize( bufferSize, TQGArray::SpeedOptim ); } - const Q_LONG read = io->readBlock( buffer.data(), buffer.size() ); // Avoid to use bufferSize here, in case something went wrong. + const TQ_LONG read = io->readBlock( buffer.data(), buffer.size() ); // Avoid to use bufferSize here, in case something went wrong. if ( read != bufferSize ) { kdWarning(7109) << "Read " << read << " bytes but expected " << bufferSize << endl; diff --git a/kioslave/thumbnail/cursorcreator.cpp b/kioslave/thumbnail/cursorcreator.cpp index d77629acf..a8f6a2eb9 100644 --- a/kioslave/thumbnail/cursorcreator.cpp +++ b/kioslave/thumbnail/cursorcreator.cpp @@ -48,14 +48,14 @@ bool CursorCreator::create( const TQString &path, int width, int height, TQImage img.setAlphaBuffer( true ); // Convert the image to non-premultiplied alpha - Q_UINT32 *pixels = reinterpret_cast( img.bits() ); + TQ_UINT32 *pixels = reinterpret_cast( img.bits() ); for ( int i = 0; i < (img.width() * img.height()); i++ ) { - float alpha = qAlpha( pixels[i] ) / 255.0; + float alpha = tqAlpha( pixels[i] ) / 255.0; if ( alpha > 0.0 && alpha < 1.0 ) - pixels[i] = qRgba( int( qRed(pixels[i]) / alpha ), - int( qGreen(pixels[i]) / alpha ), - int( qBlue(pixels[i]) / alpha ), - qAlpha(pixels[i]) ); + pixels[i] = tqRgba( int( tqRed(pixels[i]) / alpha ), + int( tqGreen(pixels[i]) / alpha ), + int( tqBlue(pixels[i]) / alpha ), + tqAlpha(pixels[i]) ); } // Create a deep copy of the image so the image data is preserved diff --git a/kioslave/thumbnail/exrcreator.cpp b/kioslave/thumbnail/exrcreator.cpp index 633ad5095..d0edbd38e 100644 --- a/kioslave/thumbnail/exrcreator.cpp +++ b/kioslave/thumbnail/exrcreator.cpp @@ -50,7 +50,7 @@ bool EXRCreator::create(const TQString &path, int, int, TQImage &img) for ( unsigned int y=0; y < preview.height(); y++ ) { for ( unsigned int x=0; x < preview.width(); x++ ) { const Imf::PreviewRgba &q = preview.pixels()[x+(y*preview.width())]; - qpreview.setPixel( x, y, qRgba(q.r, q.g, q.b, q.a) ); + qpreview.setPixel( x, y, tqRgba(q.r, q.g, q.b, q.a) ); } } img = qpreview; diff --git a/kioslave/thumbnail/htmlcreator.cpp b/kioslave/thumbnail/htmlcreator.cpp index c9ddf0204..43aec5f39 100644 --- a/kioslave/thumbnail/htmlcreator.cpp +++ b/kioslave/thumbnail/htmlcreator.cpp @@ -63,7 +63,7 @@ bool HTMLCreator::create(const TQString &path, int width, int height, TQImage &i int t = startTimer(5000); - qApp->enter_loop(); + tqApp->enter_loop(); killTimer(t); @@ -101,12 +101,12 @@ bool HTMLCreator::create(const TQString &path, int width, int height, TQImage &i void HTMLCreator::timerEvent(TQTimerEvent *) { - qApp->exit_loop(); + tqApp->exit_loop(); } void HTMLCreator::slotCompleted() { - qApp->exit_loop(); + tqApp->exit_loop(); } ThumbCreator::Flags HTMLCreator::flags() const diff --git a/kioslave/thumbnail/textcreator.cpp b/kioslave/thumbnail/textcreator.cpp index 31f4c4254..db39e9652 100644 --- a/kioslave/thumbnail/textcreator.cpp +++ b/kioslave/thumbnail/textcreator.cpp @@ -148,7 +148,7 @@ bool TextCreator::create(const TQString &path, int width, int height, TQImage &i // physical newline in the file if we don't come from one if ( !newLine ) { - int pos = text.find( '\n', i ); + int pos = text.tqfind( '\n', i ); if ( pos == -1 ) break; i = pos + 1; @@ -174,7 +174,7 @@ bool TextCreator::create(const TQString &path, int width, int height, TQImage &i rect = m_splitter->coordinates( ch ); if ( !rect.isEmpty() ) { - bitBlt( &m_pixmap, TQPoint(x,y), fontPixmap, rect, Qt::CopyROP ); + bitBlt( &m_pixmap, TQPoint(x,y), fontPixmap, rect, TQt::CopyROP ); } x += xOffset; // next character diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp index 272e34eed..55ac3c80b 100644 --- a/kioslave/thumbnail/thumbnail.cpp +++ b/kioslave/thumbnail/thumbnail.cpp @@ -298,9 +298,9 @@ void ThumbnailProtocol::get(const KURL &url) { double imgRatio = (double)img.height() / (double)img.width(); if (imgRatio > (double)m_height / (double)m_width) - img = img.smoothScale( int(QMAX((double)m_height / imgRatio, 1)), m_height); + img = img.smoothScale( int(TQMAX((double)m_height / imgRatio, 1)), m_height); else - img = img.smoothScale(m_width, int(QMAX((double)m_width * imgRatio, 1))); + img = img.smoothScale(m_width, int(TQMAX((double)m_width * imgRatio, 1))); } // ### FIXME @@ -322,7 +322,7 @@ void ThumbnailProtocol::get(const KURL &url) p.drawLine( 0, 0, 0, y2 ); p.end(); - const TQBitmap *mask = pix.mask(); + const TQBitmap *mask = pix.tqmask(); if ( mask ) // need to update it so we can see the frame { TQBitmap bitmap( *mask ); @@ -417,7 +417,7 @@ void ThumbnailProtocol::get(const KURL &url) const TQImage& ThumbnailProtocol::getIcon() { - TQImage* icon = m_iconDict.find(m_mimeType); + TQImage* icon = m_iconDict.tqfind(m_mimeType); if ( !icon ) // generate it! { icon = new TQImage( KMimeType::mimeType(m_mimeType)->pixmap( KIcon::Desktop, m_iconSize ).convertToImage() ); diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp index 1210bb59a..4d4330ea9 100644 --- a/kioslave/trash/kio_trash.cpp +++ b/kioslave/trash/kio_trash.cpp @@ -78,10 +78,10 @@ TrashProtocol::TrashProtocol( const TQCString& protocol, const TQCString &pool, { struct passwd *user = getpwuid( getuid() ); if ( user ) - m_userName = TQString::fromLatin1(user->pw_name); + m_userName = TQString::tqfromLatin1(user->pw_name); struct group *grp = getgrgid( getgid() ); if ( grp ) - m_groupName = TQString::fromLatin1(grp->gr_name); + m_groupName = TQString::tqfromLatin1(grp->gr_name); } TrashProtocol::~TrashProtocol() @@ -540,7 +540,7 @@ void TrashProtocol::get( const KURL& url ) this, TQT_SLOT( slotMimetype( KIO::Job*, const TQString& ) ) ); connect( job, TQT_SIGNAL( result(KIO::Job *) ), this, TQT_SLOT( jobFinished(KIO::Job *) ) ); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } void TrashProtocol::slotData( KIO::Job*, const TQByteArray&arr ) @@ -559,7 +559,7 @@ void TrashProtocol::jobFinished( KIO::Job* job ) error( job->error(), job->errorText() ); else finished(); - qApp->eventLoop()->exitLoop(); + tqApp->eventLoop()->exitLoop(); } #if 0 diff --git a/kioslave/trash/ktrash.cpp b/kioslave/trash/ktrash.cpp index 0c9710367..4f85ba50c 100644 --- a/kioslave/trash/ktrash.cpp +++ b/kioslave/trash/ktrash.cpp @@ -77,7 +77,7 @@ int main(int argc, char *argv[]) TQCString restoreArg = args->getOption( "restore" ); if ( !restoreArg.isEmpty() ) { - if (restoreArg.find("system:/trash")==0) { + if (restoreArg.tqfind("system:/trash")==0) { restoreArg.remove(0, 13); restoreArg.prepend("trash:"); } diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp index fb6927d3e..c847d9302 100644 --- a/kioslave/trash/testtrash.cpp +++ b/kioslave/trash/testtrash.cpp @@ -152,10 +152,10 @@ void TestTrash::setup() for ( TrashImpl::TrashDirMap::ConstIterator it = trashDirs.begin(); it != trashDirs.end() ; ++it ) { if ( it.key() == 0 ) { assert( it.data() == m_trashDir ); - assert( topDirs.find( 0 ) == topDirs.end() ); + assert( topDirs.tqfind( 0 ) == topDirs.end() ); foundTrashDir = true; } else { - assert( topDirs.find( it.key() ) != topDirs.end() ); + assert( topDirs.tqfind( it.key() ) != topDirs.end() ); const TQString topdir = topDirs[it.key()]; if ( TQFileInfo( topdir ).isWritable() ) { writableTopDirs.append( it.key() ); @@ -383,7 +383,7 @@ static void checkInfoFile( const TQString& infoPath, const TQString& origFilePat assert( origPath == KURL::encode_string( origFilePath, KGlobal::locale()->fileEncodingMib() ) ); const TQString date = infoFile.readEntry( "DeletionDate" ); assert( !date.isEmpty() ); - assert( date.contains( "T" ) ); + assert( date.tqcontains( "T" ) ); } static void createTestFile( const TQString& path ) @@ -1104,7 +1104,7 @@ void TestTrash::listRootDir() assert( m_entryCount > 1 ); kdDebug() << k_funcinfo << m_listResult << endl; - assert( m_listResult.contains( "." ) == 1 ); // found it, and only once + assert( m_listResult.tqcontains( "." ) == 1 ); // found it, and only once } void TestTrash::listRecursiveRootDir() @@ -1121,7 +1121,7 @@ void TestTrash::listRecursiveRootDir() assert( m_entryCount > 1 ); kdDebug() << k_funcinfo << m_listResult << endl; - assert( m_listResult.contains( "." ) == 1 ); // found it, and only once + assert( m_listResult.tqcontains( "." ) == 1 ); // found it, and only once } void TestTrash::listSubDir() @@ -1138,8 +1138,8 @@ void TestTrash::listSubDir() assert( m_entryCount == 2 ); kdDebug() << k_funcinfo << m_listResult << endl; - assert( m_listResult.contains( "." ) == 1 ); // found it, and only once - assert( m_listResult.contains( "testfile" ) == 1 ); // found it, and only once + assert( m_listResult.tqcontains( "." ) == 1 ); // found it, and only once + assert( m_listResult.tqcontains( "testfile" ) == 1 ); // found it, and only once } void TestTrash::slotEntries( KIO::Job*, const KIO::UDSEntryList& lst ) diff --git a/kioslave/trash/trashimpl.cpp b/kioslave/trash/trashimpl.cpp index f43e7929f..80343c98a 100644 --- a/kioslave/trash/trashimpl.cpp +++ b/kioslave/trash/trashimpl.cpp @@ -262,7 +262,7 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi info += KURL::encode_string( makeRelativePath( topDirectoryPath( trashId ), origPath ), m_mibEnum ).latin1(); info += "\n"; info += "DeletionDate="; - info += TQDateTime::currentDateTime().toString( Qt::ISODate ).latin1(); + info += TQDateTime::tqcurrentDateTime().toString( Qt::ISODate ).latin1(); info += "\n"; size_t sz = info.size() - 1; // avoid trailing 0 from QCString @@ -372,7 +372,7 @@ bool TrashImpl::move( const TQString& src, const TQString& dest ) #endif connect( job, TQT_SIGNAL( result(KIO::Job *) ), this, TQT_SLOT( jobFinished(KIO::Job *) ) ); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); return m_lastErrorCode == 0; } @@ -381,7 +381,7 @@ void TrashImpl::jobFinished(KIO::Job* job) { kdDebug() << k_funcinfo << " error=" << job->error() << endl; error( job->error(), job->errorText() ); - qApp->eventLoop()->exitLoop(); + tqApp->eventLoop()->exitLoop(); } bool TrashImpl::copyToTrash( const TQString& origPath, int trashId, const TQString& fileId ) @@ -419,7 +419,7 @@ bool TrashImpl::copy( const TQString& src, const TQString& dest ) #endif connect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( jobFinished( KIO::Job* ) ) ); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); return m_lastErrorCode == 0; } @@ -429,7 +429,7 @@ bool TrashImpl::directRename( const TQString& src, const TQString& dest ) kdDebug() << k_funcinfo << src << " -> " << dest << endl; if ( ::rename( TQFile::encodeName( src ), TQFile::encodeName( dest ) ) != 0 ) { if (errno == EXDEV) { - error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename") ); + error( KIO::ERR_UNSUPPORTED_ACTION, TQString::tqfromLatin1("rename") ); } else { if (( errno == EACCES ) || (errno == EPERM)) { error( KIO::ERR_ACCESS_DENIED, dest ); @@ -508,14 +508,14 @@ bool TrashImpl::synchronousDel( const TQString& path, bool setLastErrorCode, boo KIO::ChmodJob* chmodJob = KIO::chmod( fileItemList, 0200, 0200, TQString::null, TQString::null, true /*recursive*/, false /*showProgressInfo*/ ); connect( chmodJob, TQT_SIGNAL( result(KIO::Job *) ), this, TQT_SLOT( jobFinished(KIO::Job *) ) ); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } kdDebug() << k_funcinfo << "deleting " << url << endl; KIO::DeleteJob *job = KIO::del( url, false, false ); connect( job, TQT_SIGNAL( result(KIO::Job *) ), this, TQT_SLOT( jobFinished(KIO::Job *) ) ); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); bool ok = m_lastErrorCode == 0; if ( !setLastErrorCode ) { m_lastErrorCode = oldErrorCode; @@ -630,7 +630,7 @@ bool TrashImpl::readInfoFile( const TQString& infoPath, TrashedFileInfo& info, i } TQString line = cfg.readEntry( "DeletionDate" ); if ( !line.isEmpty() ) { - info.deletionDate = TQDateTime::fromString( line, Qt::ISODate ); + info.deletionDate = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( line, Qt::ISODate )); } return true; } @@ -898,7 +898,7 @@ TQString TrashImpl::trashDirectoryPath( int trashId ) const // and reusing a directory listing from the earlier instance.) if ( !m_trashDirectoriesScanned ) scanTrashDirectories(); - Q_ASSERT( m_trashDirectories.contains( trashId ) ); + Q_ASSERT( m_trashDirectories.tqcontains( trashId ) ); return m_trashDirectories[trashId]; } @@ -907,7 +907,7 @@ TQString TrashImpl::topDirectoryPath( int trashId ) const if ( !m_trashDirectoriesScanned ) scanTrashDirectories(); assert( trashId != 0 ); - Q_ASSERT( m_topDirectories.contains( trashId ) ); + Q_ASSERT( m_topDirectories.tqcontains( trashId ) ); return m_topDirectories[trashId]; } @@ -939,7 +939,7 @@ bool TrashImpl::parseURL( const KURL& url, int& trashId, TQString& fileId, TQStr int start = 0; if ( path[0] == '/' ) // always true I hope start = 1; - int slashPos = path.find( '-', 0 ); // don't match leading slash + int slashPos = path.tqfind( '-', 0 ); // don't match leading slash if ( slashPos <= 0 ) return false; bool ok = false; @@ -948,7 +948,7 @@ bool TrashImpl::parseURL( const KURL& url, int& trashId, TQString& fileId, TQStr if ( !ok ) return false; start = slashPos + 1; - slashPos = path.find( '/', start ); + slashPos = path.tqfind( '/', start ); if ( slashPos <= 0 ) { fileId = path.mid( start ); relativePath = TQString::null; diff --git a/kioslave/trash/trashimpl.h b/kioslave/trash/trashimpl.h index 027864456..fb34e5be0 100644 --- a/kioslave/trash/trashimpl.h +++ b/kioslave/trash/trashimpl.h @@ -34,7 +34,7 @@ * Implementation of all low-level operations done by kio_trash * The structure of the trash directory follows the freedesktop.org standard */ -class TrashImpl : public QObject +class TrashImpl : public TQObject { Q_OBJECT public: diff --git a/klipper/applet.cpp b/klipper/applet.cpp index 97eee6eec..24b5b6a34 100644 --- a/klipper/applet.cpp +++ b/klipper/applet.cpp @@ -91,7 +91,7 @@ void KlipperApplet::preferences() void KlipperApplet::help() { - kapp->invokeHelp(TQString::null, TQString::fromLatin1("klipper")); + kapp->invokeHelp(TQString::null, TQString::tqfromLatin1("klipper")); } void KlipperApplet::about() diff --git a/klipper/clipboardpoll.h b/klipper/clipboardpoll.h index 462ad8097..f0579a4cb 100644 --- a/klipper/clipboardpoll.h +++ b/klipper/clipboardpoll.h @@ -26,7 +26,7 @@ #include class ClipboardPoll - : public QWidget + : public TQWidget { Q_OBJECT public: diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index 3f325d40e..73df8dd26 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -66,7 +66,7 @@ void ConfigDialog::show() { if ( !isVisible() ) { KWinModule module(0, KWinModule::INFO_DESKTOP); - TQSize s1 = sizeHint(); + TQSize s1 = tqsizeHint(); TQSize s2 = module.workArea().size(); int w = s1.width(); int h = s1.height(); @@ -203,8 +203,8 @@ void ListView::rename( TQListViewItem* item, int c ) if ( gui ) { if ( ! _regExpEditor ) - _regExpEditor = KParts::ComponentFactory::createInstanceFromQuery( "KRegExpEditor/KRegExpEditor", TQString::null, this ); - KRegExpEditorInterface *iface = static_cast( _regExpEditor->qt_cast( "KRegExpEditorInterface" ) ); + _regExpEditor = KParts::ComponentFactory::createInstanceFromQuery( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); + KRegExpEditorInterface *iface = static_cast( _regExpEditor->tqqt_cast( "KRegExpEditorInterface" ) ); assert( iface ); iface->setRegExp( item->text( 0 ) ); @@ -299,13 +299,13 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget, connect( delActionButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDeleteAction() )); TQLabel *label = new TQLabel(i18n("Click on a highlighted item's column to change it. \"%s\" in a command will be replaced with the clipboard contents."), box); - label->setAlignment( WordBreak | AlignLeft | AlignVCenter ); + label->tqsetAlignment( WordBreak | AlignLeft | AlignVCenter ); box->setStretchFactor( label, 5 ); box = new TQHBox( this ); TQPushButton *advanced = new TQPushButton( i18n("Advanced..."), box ); - advanced->setFixedSize( advanced->sizeHint() ); + advanced->setFixedSize( advanced->tqsizeHint() ); connect( advanced, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdvanced() )); (void) new TQWidget( box ); // spacer @@ -331,14 +331,14 @@ void ActionWidget::slotContextMenu( KListView *, TQListViewItem *item, KPopupMenu *menu = new KPopupMenu; addCmd = menu->insertItem( i18n("Add Command") ); rmCmd = menu->insertItem( i18n("Remove Command") ); - if ( !item->parent() ) {// no "command" item + if ( !item->tqparent() ) {// no "command" item menu->setItemEnabled( rmCmd, false ); item->setOpen( true ); } int id = menu->exec( pos ); if ( id == addCmd ) { - TQListViewItem *p = item->parent() ? item->parent() : item; + TQListViewItem *p = item->tqparent() ? item->tqparent() : item; TQListViewItem *cmdItem = new TQListViewItem( p, item, i18n("Click here to set the command to be executed"), i18n("") ); @@ -352,7 +352,7 @@ void ActionWidget::slotContextMenu( KListView *, TQListViewItem *item, void ActionWidget::slotItemChanged( TQListViewItem *item, const TQPoint&, int col ) { - if ( !item->parent() || col != 0 ) + if ( !item->tqparent() || col != 0 ) return; ClipCommand command( item->text(0), item->text(1) ); item->setPixmap( 0, SmallIcon( command.pixmap.isEmpty() ? @@ -371,8 +371,8 @@ void ActionWidget::slotAddAction() void ActionWidget::slotDeleteAction() { TQListViewItem *item = listView->currentItem(); - if ( item && item->parent() ) - item = item->parent(); + if ( item && item->tqparent() ) + item = item->tqparent(); delete item; } @@ -410,8 +410,8 @@ void ActionWidget::slotAdvanced() AdvancedWidget *widget = new AdvancedWidget( box ); widget->setWMClasses( m_wmClasses ); - dlg.resize( dlg.sizeHint().width(), - dlg.sizeHint().height() +40); // or we get an ugly scrollbar :( + dlg.resize( dlg.tqsizeHint().width(), + dlg.tqsizeHint().height() +40); // or we get an ugly scrollbar :( if ( dlg.exec() == TQDialog::Accepted ) { m_wmClasses = widget->wmClasses(); diff --git a/klipper/configdialog.h b/klipper/configdialog.h index b7aa26659..219f5f6cf 100644 --- a/klipper/configdialog.h +++ b/klipper/configdialog.h @@ -42,7 +42,7 @@ class TQPushButton; class TQDialog; class ConfigDialog; -class GeneralWidget : public QVBox +class GeneralWidget : public TQVBox { Q_OBJECT @@ -66,7 +66,7 @@ private: // only for use inside ActionWidget -class AdvancedWidget : public QVBox +class AdvancedWidget : public TQVBox { Q_OBJECT @@ -81,7 +81,7 @@ private: KEditListBox *editListBox; }; -class ActionWidget : public QVBox +class ActionWidget : public TQVBox { Q_OBJECT @@ -237,11 +237,11 @@ public: ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name ) : KListView( parent, name ), _configWidget( configWidget ), _regExpEditor(0L) {} - // TQListView has a weird idea of a sizeHint... - virtual TQSize sizeHint () const { - int w = minimumSizeHint().width(); + // TQListView has a weird idea of a tqsizeHint... + virtual TQSize tqsizeHint () const { + int w = tqminimumSizeHint().width(); int h = header()->height(); - h += viewport()->sizeHint().height(); + h += viewport()->tqsizeHint().height(); h += horizontalScrollBar()->height(); TQListViewItem *item = firstChild(); diff --git a/klipper/history.h b/klipper/history.h index befdd164e..405041e0e 100644 --- a/klipper/history.h +++ b/klipper/history.h @@ -30,7 +30,7 @@ class TQPopupMenu; class TQWidget; class QptrListIterator; -class History : public QObject +class History : public TQObject { Q_OBJECT public: diff --git a/klipper/historyitem.cpp b/klipper/historyitem.cpp index 481339b30..b217bdb31 100644 --- a/klipper/historyitem.cpp +++ b/klipper/historyitem.cpp @@ -52,7 +52,7 @@ HistoryItem* HistoryItem::create( const TQMimeSource& aSource ) TQMap metaData; if( KURLDrag::decode( &aSource, urls, metaData )) { // this is from KonqDrag (libkonq) - TQByteArray a = aSource.encodedData( "application/x-kde-cutselection" ); + TQByteArray a = aSource.tqencodedData( "application/x-kde-cutselection" ); bool cut = !a.isEmpty() && (a.at(0) == '1'); // true if 1 return new HistoryURLItem( urls, metaData, cut ); } diff --git a/klipper/historyurlitem.cpp b/klipper/historyurlitem.cpp index 863a93fb8..18fd72536 100644 --- a/klipper/historyurlitem.cpp +++ b/klipper/historyurlitem.cpp @@ -56,7 +56,7 @@ bool HistoryURLItem::operator==( const HistoryItem& rhs) const if ( const HistoryURLItem* casted_rhs = dynamic_cast( &rhs ) ) { return casted_rhs->urls == urls && casted_rhs->metaData.count() == metaData.count() - && qEqual( casted_rhs->metaData.begin(), casted_rhs->metaData.end(), metaData.begin()) + && tqEqual( casted_rhs->metaData.begin(), casted_rhs->metaData.end(), metaData.begin()) && casted_rhs->cut == cut; } return false; diff --git a/klipper/klipperbindings.cpp b/klipper/klipperbindings.cpp index 31bb25049..7029d4411 100644 --- a/klipper/klipperbindings.cpp +++ b/klipper/klipperbindings.cpp @@ -19,10 +19,10 @@ */ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString(), key3, key4 ) #endif #define WIN KKey::QtWIN diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp index 954768fc5..a064fe87f 100644 --- a/klipper/klipperpopup.cpp +++ b/klipper/klipperpopup.cpp @@ -146,7 +146,7 @@ void KlipperPopup::buildFromScratch() { m_filterWidget = new KLineEditBlackKey( this, "Klipper filter widget" ); insertTitle( SmallIcon( "klipper" ), i18n("Klipper - Clipboard Tool")); m_filterWidgetId = insertItem( m_filterWidget, m_filterWidgetId, 1 ); - m_filterWidget->setFocusPolicy( TQWidget::NoFocus ); + m_filterWidget->setFocusPolicy( TQ_NoFocus ); setItemVisible( m_filterWidgetId, false ); m_filterWidget->hide(); TQString lastGroup; @@ -225,11 +225,11 @@ void KlipperPopup::keyPressEvent( TQKeyEvent* e ) { // If alt-something is pressed, select a shortcut // from the menu. Do this by sending a keyPress // without the alt-modifier to the superobject. - if ( e->state() & Qt::AltButton ) { + if ( e->state() & AltButton ) { TQKeyEvent ke( TQEvent::KeyPress, e->key(), e->ascii(), - e->state() ^ Qt::AltButton, + e->state() ^ AltButton, e->text(), e->isAutoRepeat(), e->count() ); diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp index 196a4259c..38e6a1e16 100644 --- a/klipper/popupproxy.cpp +++ b/klipper/popupproxy.cpp @@ -94,12 +94,12 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item, // Squeeze text strings so that do not take up the entire screen (or more) TQString text( KStringHandler::cPixelSqueeze(item->text().simplifyWhiteSpace(), proxy_for_menu->fontMetrics(), - m_menu_width).replace( "&", "&&" ) ); + m_menu_width).tqreplace( "&", "&&" ) ); id = proxy_for_menu->insertItem( text, -1, index ); } else { const TQSize max_size( m_menu_width,m_menu_height/4 ); if ( image.height() > max_size.height() || image.width() > max_size.width() ) { - image.convertFromImage( image.convertToImage().smoothScale( max_size, TQImage::ScaleMin ) ); + image.convertFromImage( TQImage(image.convertToImage()).smoothScale( max_size, TQ_ScaleMin ) ); } id = proxy_for_menu->insertItem( image, -1, index ); } @@ -107,9 +107,9 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item, // Determine height of a menu item. Q_ASSERT( id != -1 ); // Be sure that the item was inserted. - TQMenuItem* mi = proxy_for_menu->findItem( id ); + TQMenuItem* mi = proxy_for_menu->tqfindItem( id ); int fontheight = TQFontMetrics( proxy_for_menu->fontMetrics() ).height(); - int itemheight = proxy_for_menu->style().sizeFromContents(TQStyle::CT_PopupMenuItem, + int itemheight = proxy_for_menu->tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, proxy_for_menu, TQSize( 0, fontheight ), TQStyleOption(mi,10,0) ).height(); @@ -133,7 +133,7 @@ int PopupProxy::insertFromSpill( int index ) { // discarding any that doesn't match the current filter. // stop when the total number of items equal m_itemsPerMenu; int count = 0; - int remainingHeight = m_menu_height - proxy_for_menu->sizeHint().height(); + int remainingHeight = m_menu_height - proxy_for_menu->tqsizeHint().height(); // Force at least one item to be inserted. remainingHeight = QMAX( remainingHeight, 0 ); for ( const HistoryItem* item = spillPointer.current(); diff --git a/klipper/popupproxy.h b/klipper/popupproxy.h index 88436cc93..78dbbdc09 100644 --- a/klipper/popupproxy.h +++ b/klipper/popupproxy.h @@ -35,7 +35,7 @@ class KlipperPopup; * Proxy helper for the "more" menu item * */ -class PopupProxy : public QObject +class PopupProxy : public TQObject { Q_OBJECT diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index 8b2bcb0eb..b91b5deb0 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -142,7 +142,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config ) updateTimestamp(); // read initial X user time setBackgroundMode( X11ParentRelative ); - clip = kapp->clipboard(); + clip = kapp->tqclipboard(); connect( &m_overflowClearTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotClearOverflow())); m_overflowClearTimer.start( 1000 ); @@ -159,7 +159,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config ) clearHistoryAction = new KAction( i18n("C&lear Clipboard History"), "history_clear", 0, - history(), + TQT_TQOBJECT(history()), TQT_SLOT( slotClear() ), collection, "clearHistoryAction" ); @@ -168,7 +168,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config ) configureAction = new KAction( i18n("&Configure Klipper..."), "configure", 0, - this, + TQT_TQOBJECT(this), TQT_SLOT( slotConfigure() ), collection, "configureAction" ); @@ -176,7 +176,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config ) quitAction = new KAction( i18n("&Quit"), "exit", 0, - this, + TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), collection, "quitAction" ); @@ -206,7 +206,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config ) m_iconOrigHeight = height(); adjustSize(); - globalKeys = new KGlobalAccel(this); + globalKeys = new KGlobalAccel(TQT_TQOBJECT(this)); KGlobalAccel* keys = globalKeys; #include "klipperbindings.cpp" // the keys need to be read from kdeglobals, not kickerrc --ellis, 22/9/02 @@ -283,7 +283,7 @@ void KlipperWidget::clearClipboardHistory() void KlipperWidget::mousePressEvent(TQMouseEvent *e) { - if ( e->button() != LeftButton && e->button() != RightButton ) + if ( e->button() != Qt::LeftButton && e->button() != Qt::RightButton ) return; // if we only hid the menu less than a third of a second ago, @@ -327,7 +327,7 @@ void KlipperWidget::showPopupMenu( TQPopupMenu *menu ) { Q_ASSERT( menu != 0L ); - TQSize size = menu->sizeHint(); // geometry is not valid until it's shown + TQSize size = menu->tqsizeHint(); // geometry is not valid until it's shown if (bPopupAtMouse) { TQPoint g = TQCursor::pos(); if ( size.height() < g.y() ) @@ -369,7 +369,7 @@ bool KlipperWidget::loadHistory() { } } if ( !history_file.open( IO_ReadOnly ) ) { - kdWarning() << failed_load_warning << ": " << history_file.errorString() << endl; + kdWarning() << failed_load_warning << ": " << TQString(history_file.errorString()) << endl; return false; } TQDataStream file_stream( &history_file ); @@ -380,10 +380,10 @@ bool KlipperWidget::loadHistory() { TQDataStream* history_stream = &file_stream; TQByteArray data; if( !oldfile ) { - Q_UINT32 crc; + TQ_UINT32 crc; file_stream >> crc >> data; if( crc32( 0, reinterpret_cast( data.data() ), data.size() ) != crc ) { - kdWarning() << failed_load_warning << ": " << history_file.errorString() << endl; + kdWarning() << failed_load_warning << ": " << TQString(history_file.errorString()) << endl; return false; } @@ -444,7 +444,7 @@ void KlipperWidget::saveHistory() { for ( const HistoryItem* item = history()->first(); item; item = history()->next() ) { history_stream << item; } - Q_UINT32 crc = crc32( 0, reinterpret_cast( data.data() ), data.size() ); + TQ_UINT32 crc = crc32( 0, reinterpret_cast( data.data() ), data.size() ); *history_file.dataStream() << crc << data; } @@ -786,8 +786,8 @@ bool KlipperWidget::blockFetchingNewData() // contents, so in practice it's like the user has selected only the part which was // selected when Klipper asked first. ButtonState buttonstate = kapp->keyboardMouseState(); - if( ( buttonstate & ( ShiftButton | LeftButton )) == ShiftButton // #85198 - || ( buttonstate & LeftButton ) == LeftButton ) { // #80302 + if( ( buttonstate & ( ShiftButton | Qt::LeftButton )) == ShiftButton // #85198 + || ( buttonstate & Qt::LeftButton ) == Qt::LeftButton ) { // #80302 m_pendingContentsCheck = true; m_pendingCheckTimer.start( 100, true ); return true; @@ -856,7 +856,7 @@ void KlipperWidget::checkClipData( bool selectionMode ) qDebug( " format: %s", format); } #endif - TQMimeSource* data = clip->data( selectionMode ? QClipboard::Selection : QClipboard::Clipboard ); + TQMimeSource* data = clip->data( selectionMode ? TQClipboard::Selection : TQClipboard::Clipboard ); if ( !data ) { kdWarning("No data in clipboard. This not not supposed to happen." ); return; @@ -1013,13 +1013,13 @@ TQString KlipperWidget::getClipboardHistoryItem(int i) // bool KlipperWidget::ignoreClipboardChanges() const { - TQWidget *focusWidget = qApp->focusWidget(); - if ( focusWidget ) + TQWidget *tqfocusWidget = tqApp->tqfocusWidget(); + if ( tqfocusWidget ) { - if ( focusWidget->inherits( "QSpinBox" ) || - (focusWidget->parentWidget() && - focusWidget->inherits("QLineEdit") && - focusWidget->parentWidget()->inherits("QSpinWidget")) ) + if ( tqfocusWidget->inherits( "QSpinBox" ) || + (tqfocusWidget->tqparentWidget() && + tqfocusWidget->inherits("QLineEdit") && + tqfocusWidget->tqparentWidget()->inherits("QSpinWidget")) ) { return true; } diff --git a/klipper/toplevel.h b/klipper/toplevel.h index 7502e4c46..024fb87f7 100644 --- a/klipper/toplevel.h +++ b/klipper/toplevel.h @@ -29,7 +29,7 @@ #include #include -class QClipboard; +class TQClipboard; class KToggleAction; class KAboutData; class URLGrabber; @@ -158,7 +158,7 @@ private slots: private: - QClipboard *clip; + TQClipboard *clip; TQTime *hideTimer; TQTime *showTimer; diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp index c814508c1..43640d691 100644 --- a/klipper/urlgrabber.cpp +++ b/klipper/urlgrabber.cpp @@ -224,8 +224,8 @@ void URLGrabber::slotItemSelected( int id ) emit sigDisablePopup(); break; default: - ClipCommand *command = myCommandMapper.find( id ); - TQStringList *backrefs = myGroupingMapper.find( id ); + ClipCommand *command = myCommandMapper.tqfind( id ); + TQStringList *backrefs = myGroupingMapper.tqfind( id ); if ( !command || !backrefs ) qWarning("Klipper: can't find associated action"); else @@ -365,7 +365,7 @@ bool URLGrabber::isAvoidedWindow() const &unused, &data_ret ) == Success) { if ( type_ret == XA_STRING && format_ret == 8 && nitems_ret > 0 ) { wmClass = TQString::fromUtf8( (const char *) data_ret ); - ret = (myAvoidWindows.find( wmClass ) != myAvoidWindows.end()); + ret = (myAvoidWindows.tqfind( wmClass ) != myAvoidWindows.end()); } XFree( data_ret ); @@ -379,7 +379,7 @@ void URLGrabber::slotKillPopupMenu() { if ( myMenu && myMenu->isVisible() ) { - if ( myMenu->geometry().contains( TQCursor::pos() ) && + if ( myMenu->tqgeometry().tqcontains( TQCursor::pos() ) && myPopupKillTimeout > 0 ) { myPopupKillTimer->start( 1000 * myPopupKillTimeout, true ); @@ -400,7 +400,7 @@ ClipCommand::ClipCommand(const TQString &_command, const TQString &_description, description(_description), isEnabled(_isEnabled) { - int len = command.find(" "); + int len = command.tqfind(" "); if (len == -1) len = command.length(); diff --git a/klipper/urlgrabber.h b/klipper/urlgrabber.h index e08092483..40d288b9a 100644 --- a/klipper/urlgrabber.h +++ b/klipper/urlgrabber.h @@ -39,7 +39,7 @@ struct ClipCommand; typedef TQPtrList ActionList; typedef TQPtrListIterator ActionListIterator; -class URLGrabber : public QObject +class URLGrabber : public TQObject { Q_OBJECT @@ -132,7 +132,7 @@ public: inline bool matches( const TQString& string ) { int res = myRegExp.search( string ) ; if ( res != -1 ) { - myCapturedTexts = myRegExp.capturedTexts(); + myCapturedTexts = myRegExp.tqcapturedTexts(); return true; } return false; @@ -162,7 +162,7 @@ public: private: TQRegExp myRegExp; - QStringList myCapturedTexts; + TQStringList myCapturedTexts; TQString myDescription; TQPtrList myCommands; diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp index 1ab175c17..57230186b 100644 --- a/kmenuedit/basictab.cpp +++ b/kmenuedit/basictab.cpp @@ -468,8 +468,8 @@ void BasicTab::slotCapturedShortcut(const KShortcut& cut) if (signalsBlocked()) return; - if( KKeyChooser::checkGlobalShortcutsConflict( cut, true, topLevelWidget()) - || KKeyChooser::checkStandardShortcutsConflict( cut, true, topLevelWidget())) + if( KKeyChooser::checkGlobalShortcutsConflict( cut, true, tqtopLevelWidget()) + || KKeyChooser::checkStandardShortcutsConflict( cut, true, tqtopLevelWidget())) return; if ( KHotKeys::present() ) diff --git a/kmenuedit/basictab.h b/kmenuedit/basictab.h index e2c72277f..fb4555c6a 100644 --- a/kmenuedit/basictab.h +++ b/kmenuedit/basictab.h @@ -38,7 +38,7 @@ class KService; class MenuFolderInfo; class MenuEntryInfo; -class BasicTab : public QWidget +class BasicTab : public TQWidget { Q_OBJECT @@ -77,7 +77,7 @@ protected: KIconButton *_iconButton; TQGroupBox *_path_group, *_term_group, *_uid_group, *general_group_keybind; TQLabel *_termOptLabel, *_uidLabel, *_pathLabel, *_nameLabel, *_commentLabel, *_execLabel; - QLabel *_descriptionLabel; + TQLabel *_descriptionLabel; MenuFolderInfo *_menuFolderInfo; MenuEntryInfo *_menuEntryInfo; diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp index 37ab13676..0f518f065 100644 --- a/kmenuedit/kmenuedit.cpp +++ b/kmenuedit/kmenuedit.cpp @@ -67,12 +67,12 @@ void KMenuEdit::setupActions() if (!m_controlCenter) (void)new KAction(i18n("New S&eparator"), "menu_new_sep", 0, actionCollection(), "newsep"); - (void)new KAction(i18n("Save && Quit"), "filesave_and_close", 0, this, TQT_SLOT( slotSave_and_close()), actionCollection(), "file_save_and_quit"); + (void)new KAction(i18n("Save && Quit"), "filesave_and_close", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSave_and_close()), actionCollection(), "file_save_and_quit"); m_actionDelete = 0; - KStdAction::save(this, TQT_SLOT( slotSave() ), actionCollection()); - KStdAction::quit(this, TQT_SLOT( close() ), actionCollection()); + KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT( slotSave() ), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection()); KStdAction::cut(0, 0, actionCollection()); KStdAction::copy(0, 0, actionCollection()); KStdAction::paste(0, 0, actionCollection()); @@ -80,7 +80,7 @@ void KMenuEdit::setupActions() void KMenuEdit::setupView() { - m_splitter = new TQSplitter(Horizontal, this); + m_splitter = new TQSplitter(Qt::Horizontal, this); m_tree = new TreeView(m_controlCenter, actionCollection(), m_splitter); m_basicTab = new BasicTab(m_splitter); diff --git a/kmenuedit/menufile.cpp b/kmenuedit/menufile.cpp index d1582c23b..db4c64cdf 100644 --- a/kmenuedit/menufile.cpp +++ b/kmenuedit/menufile.cpp @@ -123,7 +123,7 @@ TQDomElement MenuFile::findMenu(TQDomElement elem, const TQString &menuName, boo { TQString menuNodeName; TQString subMenuName; - int i = menuName.find('/'); + int i = menuName.tqfind('/'); if (i >= 0) { menuNodeName = menuName.left(i); @@ -200,7 +200,7 @@ static TQString entryToDirId(const TQString &path) if (local.isEmpty() || local.startsWith("/")) { // What now? Use filename only and hope for the best. - local = path.mid(path.findRev('/')+1); + local = path.mid(path.tqfindRev('/')+1); } return local; } @@ -468,7 +468,7 @@ TQString MenuFile::uniqueMenuName(const TQString &menuName, const TQString &newM for(int n = 1; ++n; ) { - if (findMenu(elem, result, false).isNull() && !excludeList.contains(result)) + if (findMenu(elem, result, false).isNull() && !excludeList.tqcontains(result)) return result; result.truncate(trunc); diff --git a/kmenuedit/menuinfo.cpp b/kmenuedit/menuinfo.cpp index affb0bcba..db5df8281 100644 --- a/kmenuedit/menuinfo.cpp +++ b/kmenuedit/menuinfo.cpp @@ -53,13 +53,13 @@ void MenuFolderInfo::add(MenuFolderInfo *info, bool initial) // Remove sub menu (without deleting it) void MenuFolderInfo::take(MenuFolderInfo *info) { - subFolders.take(subFolders.findRef(info)); + subFolders.take(subFolders.tqfindRef(info)); } // Remove sub menu (without deleting it) bool MenuFolderInfo::takeRecursive(MenuFolderInfo *info) { - int i = subFolders.findRef(info); + int i = subFolders.tqfindRef(info); if (i >= 0) { subFolders.take(i); @@ -106,7 +106,7 @@ void MenuFolderInfo::take(MenuEntryInfo *entry) TQString MenuFolderInfo::uniqueMenuCaption(const TQString &caption) { TQRegExp r("(.*)(?=-\\d+)"); - TQString cap = (r.search(caption) > -1) ? r.cap(1) : caption; + TQString cap = (r.search(caption) > -1) ? TQString(r.cap(1)) : caption; TQString result = caption; @@ -134,7 +134,7 @@ TQString MenuFolderInfo::uniqueMenuCaption(const TQString &caption) TQString MenuFolderInfo::uniqueItemCaption(const TQString &caption, const TQString &exclude) { TQRegExp r("(.*)(?=-\\d+)"); - TQString cap = (r.search(caption) > -1) ? r.cap(1) : caption; + TQString cap = (r.search(caption) > -1) ? TQString(r.cap(1)) : caption; TQString result = caption; @@ -489,14 +489,14 @@ bool MenuEntryInfo::isShortcutAvailable(const KShortcut &_shortcut) { s_allShortcuts = new TQStringList(KHotKeys::allShortCuts()); } - available = !s_allShortcuts->contains(shortcutKey); + available = !s_allShortcuts->tqcontains(shortcutKey); if (available && s_newShortcuts) { - available = !s_newShortcuts->contains(shortcutKey); + available = !s_newShortcuts->tqcontains(shortcutKey); } if (!available && s_freeShortcuts) { - available = s_freeShortcuts->contains(shortcutKey); + available = s_freeShortcuts->tqcontains(shortcutKey); } return available; } diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp index 693ba568c..ef2e0508a 100644 --- a/kmenuedit/treeview.cpp +++ b/kmenuedit/treeview.cpp @@ -278,7 +278,7 @@ void TreeView::readMenuFolderInfo(MenuFolderInfo *folderInfo, KServiceGroup::Ptr folderInfo->directoryFile = folder->directoryEntryPath(); folderInfo->icon = folder->icon(); TQString id = folder->relPath(); - int i = id.findRev('/', -2); + int i = id.tqfindRev('/', -2); id = id.mid(i+1); folderInfo->id = id; folderInfo->fullId = prefix + id; @@ -472,7 +472,7 @@ void TreeView::selectMenu(const TQString &menu) TreeItem *item = 0; do { - int i = restMenu.find("/"); + int i = restMenu.tqfind("/"); TQString subMenu = restMenu.left(i+1); restMenu = restMenu.mid(i+1); @@ -592,7 +592,7 @@ TQStringList TreeView::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; @@ -611,7 +611,7 @@ TQStringList TreeView::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 @@ -631,7 +631,7 @@ TQStringList TreeView::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; @@ -649,7 +649,7 @@ TQStringList TreeView::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 @@ -679,8 +679,8 @@ bool TreeView::acceptDrag(TQDropEvent* e) const static TQString createDesktopFile(const TQString &file, TQString *menuId, TQStringList *excludeList) { - TQString base = file.mid(file.findRev('/')+1); - base = base.left(base.findRev('.')); + TQString base = file.mid(file.tqfindRev('/')+1); + base = base.left(base.tqfindRev('.')); TQRegExp r("(.*)(?=-\\d+)"); base = (r.search(base) > -1) ? r.cap(1) : base; @@ -703,8 +703,8 @@ static KDesktopFile *copyDesktopFile(MenuEntryInfo *entryInfo, TQString *menuId, static TQString createDirectoryFile(const TQString &file, TQStringList *excludeList) { - TQString base = file.mid(file.findRev('/')+1); - base = base.left(base.findRev('.')); + TQString base = file.mid(file.tqfindRev('/')+1); + base = base.left(base.tqfindRev('.')); TQString result; int i = 1; @@ -715,7 +715,7 @@ static TQString createDirectoryFile(const TQString &file, TQStringList *excludeL else result = base + TQString("-%1.directory").arg(i); - if (!excludeList->contains(result)) + if (!excludeList->tqcontains(result)) { if (locate("xdgdata-dirs", result).isEmpty()) break; @@ -808,11 +808,11 @@ void TreeView::slotDropped (TQDropEvent * e, TQListViewItem *parent, TQListViewI m_drag = 0; return; } - tmpItem = static_cast(tmpItem->parent() ); + tmpItem = static_cast(tmpItem->tqparent() ); } // Remove MenuFolderInfo - TreeItem *oldParentItem = static_cast(m_dragItem->parent()); + TreeItem *oldParentItem = static_cast(m_dragItem->tqparent()); MenuFolderInfo *oldParentFolderInfo = oldParentItem ? oldParentItem->folderInfo() : m_rootFolder; oldParentFolderInfo->take(folderInfo); @@ -997,7 +997,7 @@ void TreeView::newsubmenu() if (!ok) return; TQString file = caption; - file.replace('/', '-'); + file.tqreplace('/', '-'); file = createDirectoryFile(file, &m_newDirectoryList); // Create @@ -1017,7 +1017,7 @@ void TreeView::newsubmenu() } else { - parentItem = static_cast(item->parent()); + parentItem = static_cast(item->tqparent()); folder = parentItem ? parentItem->directory() : TQString::null; } @@ -1069,7 +1069,7 @@ void TreeView::newitem() TQString menuId; TQString file = caption; - file.replace('/', '-'); + file.tqreplace('/', '-'); file = createDesktopFile(file, &menuId, &m_newMenuIds); // Create @@ -1093,7 +1093,7 @@ void TreeView::newitem() } else { - parentItem = static_cast(item->parent()); + parentItem = static_cast(item->tqparent()); folder = parentItem ? parentItem->directory() : TQString::null; } @@ -1139,7 +1139,7 @@ void TreeView::newsep() } else { - parentItem = static_cast(item->parent()); + parentItem = static_cast(item->tqparent()); } // create the TreeItem @@ -1181,7 +1181,7 @@ void TreeView::copy( bool cutting ) if (item == 0) return; if (cutting) - setLayoutDirty((TreeItem*)item->parent()); + setLayoutDirty((TreeItem*)item->tqparent()); // clean up old stuff cleanupClipboard(); @@ -1256,7 +1256,7 @@ void TreeView::paste() } else { - parentItem = static_cast(item->parent()); + parentItem = static_cast(item->tqparent()); folder = parentItem ? parentItem->directory() : TQString::null; } @@ -1384,7 +1384,7 @@ void TreeView::del() void TreeView::del(TreeItem *item, bool deleteInfo) { - TreeItem *parentItem = static_cast(item->parent()); + TreeItem *parentItem = static_cast(item->tqparent()); // is file a .directory or a .desktop file if(item->isDirectory()) { diff --git a/kmenuedit/treeview.h b/kmenuedit/treeview.h index ebb5c6d14..5811a2159 100644 --- a/kmenuedit/treeview.h +++ b/kmenuedit/treeview.h @@ -36,7 +36,7 @@ class MenuEntryInfo; class MenuSeparatorInfo; class KShortcut; -class TreeItem : public QListViewItem +class TreeItem : public TQListViewItem { public: TreeItem(TQListViewItem *parent, TQListViewItem *after, const TQString &menuIdn, bool __init = false); diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui index b93a7e62f..ebe23bea7 100644 --- a/knetattach/knetattach.ui +++ b/knetattach/knetattach.ui @@ -1,6 +1,6 @@ KNetAttach - + KNetAttach @@ -20,7 +20,7 @@ 16 - + _folderType @@ -31,7 +31,7 @@ unnamed - + buttonGroup1 @@ -51,7 +51,7 @@ 0 - + _recent @@ -59,7 +59,7 @@ &Recent connection: - + _webfolder @@ -70,7 +70,7 @@ true - + _fish @@ -96,14 +96,14 @@ 0 - + 250 0 - + _ftp @@ -111,7 +111,7 @@ FT&P - + _smb @@ -131,21 +131,21 @@ Expanding - + 31 16 - + textLabel1_2 Select the type of network folder you wish to connect to and press the Next button. - + WordBreak|AlignVCenter @@ -159,7 +159,7 @@ Fixed - + 20 21 @@ -168,7 +168,7 @@ - + _folderParameters @@ -179,14 +179,14 @@ unnamed - + _informationText Enter a name for this <i>%1</i> as well as the server address, port and folder path to use and press the Next button. - + WordBreak|AlignVCenter @@ -200,14 +200,14 @@ Fixed - + 20 21 - + textLabel4_2 @@ -223,7 +223,7 @@ _connectionName - + _port @@ -247,7 +247,7 @@ _path - + _userText @@ -258,7 +258,7 @@ _user - + textLabel1 @@ -269,7 +269,7 @@ _host - + _portText @@ -306,7 +306,7 @@ - + textLabel3 @@ -327,14 +327,14 @@ Expanding - + 560 16 - + _createIcon @@ -345,7 +345,7 @@ true - + _useEncryption @@ -418,23 +418,24 @@ kcombobox.h klineedit.h kurl.h + kwizard.h knetattach.ui.h - QString _type; + TQString _type; - + init() - setInformationText( const QString & type ) - showPage( QWidget * page ) + setInformationText( const TQString & type ) + showPage( TQWidget * page ) updateParametersPageStatus() finished() updatePort( bool encryption ) updateFinishButtonText( bool save ) - + doConnectionTest( const KURL & url ) - updateForProtocol( const QString & protocol ) + updateForProtocol( const TQString & protocol ) diff --git a/knetattach/knetattach.ui.h b/knetattach/knetattach.ui.h index f60dab03e..5d3ad0b3f 100644 --- a/knetattach/knetattach.ui.h +++ b/knetattach/knetattach.ui.h @@ -190,7 +190,7 @@ void KNetAttach::finished() recent.setGroup("General"); TQStringList idx = recent.readListEntry("Index"); recent.deleteGroup(name); // erase anything stale - if (idx.contains(name)) { + if (idx.tqcontains(name)) { idx.remove(name); idx.prepend(name); recent.writeEntry("Index", idx); diff --git a/konqueror/KonqMainWindowIface.cc b/konqueror/KonqMainWindowIface.cc index 462c08aed..0b3d05ed6 100644 --- a/konqueror/KonqMainWindowIface.cc +++ b/konqueror/KonqMainWindowIface.cc @@ -153,13 +153,13 @@ TQMap KonqMainWindowIface::actionMap() QCStringList KonqMainWindowIface::functionsDynamic() { - return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( m_pMainWindow ); + return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( TQT_TQOBJECT(m_pMainWindow) ); } bool KonqMainWindowIface::processDynamic( const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData ) { - if ( KDCOPPropertyProxy::isPropertyRequest( fun, m_pMainWindow ) ) - return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, m_pMainWindow ); + if ( KDCOPPropertyProxy::isPropertyRequest( fun, TQT_TQOBJECT(m_pMainWindow) ) ) + return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, TQT_TQOBJECT(m_pMainWindow) ); return DCOPObject::processDynamic( fun, data, replyType, replyData ); } diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cc index ce7850967..a22788858 100644 --- a/konqueror/KonquerorIface.cc +++ b/konqueror/KonquerorIface.cc @@ -252,18 +252,18 @@ bool KonquerorIface::processCanBeReused( int screen ) TQStringList allowed_parts = KonqSettings::safeParts(); bool all_parts_allowed = false; - if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "SAFE" )) + if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::tqfromLatin1( "SAFE" )) { allowed_parts.clear(); // is duplicated in client/kfmclient.cc - allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" ) - << TQString::fromLatin1( "konq_multicolumnview.desktop" ) - << TQString::fromLatin1( "konq_sidebartng.desktop" ) - << TQString::fromLatin1( "konq_infolistview.desktop" ) - << TQString::fromLatin1( "konq_treeview.desktop" ) - << TQString::fromLatin1( "konq_detailedlistview.desktop" ); + allowed_parts << TQString::tqfromLatin1( "konq_iconview.desktop" ) + << TQString::tqfromLatin1( "konq_multicolumnview.desktop" ) + << TQString::tqfromLatin1( "konq_sidebartng.desktop" ) + << TQString::tqfromLatin1( "konq_infolistview.desktop" ) + << TQString::tqfromLatin1( "konq_treeview.desktop" ) + << TQString::tqfromLatin1( "konq_detailedlistview.desktop" ); } - else if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "ALL" )) + else if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::tqfromLatin1( "ALL" )) { allowed_parts.clear(); all_parts_allowed = true; @@ -281,7 +281,7 @@ bool KonquerorIface::processCanBeReused( int screen ) ++it2 ) { kdDebug(1202) << "processCanBeReused: part=" << (*it2)->service()->desktopEntryPath() << ", URL=" << (*it2)->url().prettyURL() << endl; - if( !allowed_parts.contains( (*it2)->service()->desktopEntryPath())) + if( !allowed_parts.tqcontains( (*it2)->service()->desktopEntryPath())) return false; } } diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index c9c83fd4f..6291b72d5 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -50,15 +50,15 @@ KonqAboutPageFactory::~KonqAboutPageFactory() s_plugins_html = 0; } -KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, +KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *, const TQStringList & ) { - //KonqFrame *frame = dynamic_cast( parentWidget ); + //KonqFrame *frame = dynamic_cast( tqparentWidget ); //if ( !frame ) return 0; return new KonqAboutPage( //frame->childView()->mainWindow(), - parentWidget, widgetName, parent, name ); + tqparentWidget, widgetName, parent, name ); } TQString KonqAboutPageFactory::loadFile( const TQString& file ) @@ -77,12 +77,12 @@ TQString KonqAboutPageFactory::loadFile( const TQString& file ) res = t.read(); // otherwise all embedded objects are referenced as about:/... - TQString basehref = TQString::fromLatin1("\n"); + TQString basehref = TQString::tqfromLatin1("\n"); TQRegExp reg(""); reg.setCaseSensitive(FALSE); - res.replace(reg, "\n\t" + basehref); + res.tqreplace(reg, "\n\t" + basehref); return res; } @@ -295,7 +295,7 @@ TQString KonqAboutPageFactory::specs() .arg( i18n("Secure Sockets Layer") ) .arg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") ) .arg( i18n("OpenSSL") ) - .arg( i18n("Bidirectional 16bit unicode support") ) + .arg( i18n("Bidirectional 16bit tqunicode support") ) .arg( i18n("built-in") ) .arg( i18n("AutoCompletion for forms") ) .arg( i18n("built-in") ) @@ -427,9 +427,9 @@ TQString KonqAboutPageFactory::plugins() KonqAboutPage::KonqAboutPage( //KonqMainWindow * - TQWidget *parentWidget, const char *widgetName, + TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name ) - : KHTMLPart( parentWidget, widgetName, parent, name, BrowserViewGUI ) + : KHTMLPart( tqparentWidget, widgetName, parent, name, BrowserViewGUI ) { //m_mainWindow = mainWindow; TQTextCodec* codec = KGlobal::locale()->codecForEncoding(); @@ -507,32 +507,32 @@ void KonqAboutPage::urlSelected( const TQString &url, int button, int state, con return; } - if ( url == TQString::fromLatin1("launch.html") ) + if ( url == TQString::tqfromLatin1("launch.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::launch(), "konqueror" ); return; } - else if ( url == TQString::fromLatin1("intro.html") ) + else if ( url == TQString::tqfromLatin1("intro.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::intro(), "konqueror" ); return; } - else if ( url == TQString::fromLatin1("specs.html") ) + else if ( url == TQString::tqfromLatin1("specs.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::specs(), "konqueror" ); return; } - else if ( url == TQString::fromLatin1("tips.html") ) + else if ( url == TQString::tqfromLatin1("tips.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::tips(), "konqueror" ); return; } - else if ( url == TQString::fromLatin1("config:/disable_overview") ) + else if ( url == TQString::tqfromLatin1("config:/disable_overview") ) { if ( KMessageBox::questionYesNo( widget(), i18n("Do you want to disable showing " diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h index c72a85250..3d53cf02c 100644 --- a/konqueror/about/konq_aboutpage.h +++ b/konqueror/about/konq_aboutpage.h @@ -13,7 +13,7 @@ public: KonqAboutPageFactory( TQObject *parent = 0, const char *name = 0 ); virtual ~KonqAboutPageFactory(); - virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, + virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); @@ -37,7 +37,7 @@ class KonqAboutPage : public KHTMLPart Q_OBJECT public: KonqAboutPage( /*KonqMainWindow *mainWindow,*/ - TQWidget *parentWidget, const char *widgetName, + TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name ); ~KonqAboutPage(); diff --git a/konqueror/about/specs.html b/konqueror/about/specs.html index b04212067..4989754cf 100644 --- a/konqueror/about/specs.html +++ b/konqueror/about/specs.html @@ -121,7 +121,7 @@     - + diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index 60a384102..b318a205b 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -178,33 +178,33 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) */ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& profile ) { - KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); + KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true ); cfg.setGroup( "Reusing" ); TQStringList allowed_parts; // is duplicated in ../KonquerorIface.cc - allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" ) - << TQString::fromLatin1( "konq_multicolumnview.desktop" ) - << TQString::fromLatin1( "konq_sidebartng.desktop" ) - << TQString::fromLatin1( "konq_infolistview.desktop" ) - << TQString::fromLatin1( "konq_treeview.desktop" ) - << TQString::fromLatin1( "konq_detailedlistview.desktop" ); + allowed_parts << TQString::tqfromLatin1( "konq_iconview.desktop" ) + << TQString::tqfromLatin1( "konq_multicolumnview.desktop" ) + << TQString::tqfromLatin1( "konq_sidebartng.desktop" ) + << TQString::tqfromLatin1( "konq_infolistview.desktop" ) + << TQString::tqfromLatin1( "konq_treeview.desktop" ) + << TQString::tqfromLatin1( "konq_detailedlistview.desktop" ); if( cfg.hasKey( "SafeParts" ) - && cfg.readEntry( "SafeParts" ) != TQString::fromLatin1( "SAFE" )) + && cfg.readEntry( "SafeParts" ) != TQString::tqfromLatin1( "SAFE" )) allowed_parts = cfg.readListEntry( "SafeParts" ); - if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "ALL" )) + if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::tqfromLatin1( "ALL" )) return false; // all parts allowed if( url.isEmpty()) { if( profile.isEmpty()) return true; - TQString profilepath = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profile ); + TQString profilepath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profile ); if( profilepath.isEmpty()) return true; KConfig cfg( profilepath, true ); cfg.setDollarExpansion( true ); cfg.setGroup( "Profile" ); - TQMap< TQString, TQString > entries = cfg.entryMap( TQString::fromLatin1( "Profile" )); - TQRegExp urlregexp( TQString::fromLatin1( "^View[0-9]*_URL$" )); + TQMap< TQString, TQString > entries = cfg.entryMap( TQString::tqfromLatin1( "Profile" )); + TQRegExp urlregexp( TQString::tqfromLatin1( "^View[0-9]*_URL$" )); TQStringList urls; for( TQMap< TQString, TQString >::ConstIterator it = entries.begin(); it != entries.end(); @@ -218,16 +218,16 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& if( urls.count() != 1 ) return true; url = urls.first(); - mimetype = TQString::fromLatin1( "" ); + mimetype = TQString::tqfromLatin1( "" ); } if( mimetype.isEmpty()) mimetype = KMimeType::findByURL( KURL( url ) )->name(); - KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::fromLatin1( "KParts/ReadOnlyPart" ), + KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::tqfromLatin1( "KParts/ReadOnlyPart" ), TQString::null, TQString::null ); KService::Ptr serv; if( offers.count() > 0 ) serv = offers.first(); - return serv == NULL || !allowed_parts.contains( serv->desktopEntryName() + TQString::fromLatin1(".desktop") ); + return serv == NULL || !allowed_parts.tqcontains( serv->desktopEntryName() + TQString::tqfromLatin1(".desktop") ); } static int currentScreen() @@ -248,7 +248,7 @@ static int currentScreen() // when reusing a preloaded konqy, make sure your always use a DCOP call which opens a profile ! static TQCString getPreloadedKonqy() { - KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); + KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true ); cfg.setGroup( "Reusing" ); if( cfg.readNumEntry( "MaxPreloadCount", 1 ) == 0 ) return ""; @@ -301,8 +301,8 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co // check if user wants to use external browser // ###### this option seems to have no GUI and to be redundant with BrowserApplication now. // ###### KDE4: remove - KConfig config( TQString::fromLatin1("kfmclientrc")); - config.setGroup( TQString::fromLatin1("Settings")); + KConfig config( TQString::tqfromLatin1("kfmclientrc")); + config.setGroup( TQString::tqfromLatin1("Settings")); TQString strBrowser = config.readPathEntry("ExternalBrowser"); if (!strBrowser.isEmpty()) { @@ -314,7 +314,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co return true; } - if (url.protocol().startsWith(TQString::fromLatin1("http"))) + if (url.protocol().startsWith(TQString::tqfromLatin1("http"))) { config.setGroup("General"); if (!config.readEntry("BrowserApplication").isEmpty()) @@ -330,7 +330,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co } } - KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); + KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true ); cfg.setGroup( "FMSettings" ); if ( newTab || cfg.readBoolEntry( "KonquerorTabforExternalURL", false ) ) { @@ -361,7 +361,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co { TQString error; /* Well, we can't pass a mimetype through startServiceByDesktopPath ! - if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"), + if ( KApplication::startServiceByDesktopPath( TQString::tqfromLatin1("konqueror.desktop"), url.url(), &error ) > 0 ) { kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl; @@ -391,8 +391,8 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url, if( appId.isEmpty()) { TQString error; - if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"), - TQString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 ) + if ( KApplication::startServiceByDesktopPath( TQString::tqfromLatin1("konqueror.desktop"), + TQString::tqfromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 ) { kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl; return false; @@ -401,10 +401,10 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url, // so when we arrive here, konq is up and running already, and appId contains the identification } - TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName ); + TQString profile = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profileName ); if ( profile.isEmpty() ) { - fprintf( stderr, "%s", i18n("Profile %1 not found\n").arg(profileName).local8Bit().data() ); + fprintf( stderr, "%s", i18n("Profile %1 not found\n").tqarg(profileName).local8Bit().data() ); ::exit( 0 ); } KonquerorIface_stub konqy( appId, "KonquerorIface" ); @@ -479,7 +479,7 @@ bool clientApp::doIt() } if ( argc == 3 ) { - return createNewWindow( args->url(1), command == "newTab", tempFile, TQString::fromLatin1(args->arg(2)) ); + return createNewWindow( args->url(1), command == "newTab", tempFile, TQString::tqfromLatin1(args->arg(2)) ); } } else if ( command == "openProfile" ) @@ -529,7 +529,7 @@ bool clientApp::doIt() { KURL::List urls; urls.append( args->url(1) ); - const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null ); + const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::tqfromLatin1( "Application" ), TQString::null, TQString::null ); if (offers.isEmpty()) return 1; KService::Ptr serv = offers.first(); return KRun::run( *serv, urls ); @@ -630,7 +630,7 @@ bool clientApp::doIt() } else { - fprintf( stderr, "%s", i18n("Syntax Error: Unknown command '%1'\n").arg(TQString::fromLocal8Bit(command)).local8Bit().data() ); + fprintf( stderr, "%s", i18n("Syntax Error: Unknown command '%1'\n").tqarg(TQString::fromLocal8Bit(command)).local8Bit().data() ); return false; } return true; diff --git a/konqueror/delayedinitializer.h b/konqueror/delayedinitializer.h index 1f9f66470..a9119ba58 100644 --- a/konqueror/delayedinitializer.h +++ b/konqueror/delayedinitializer.h @@ -22,7 +22,7 @@ #include -class DelayedInitializer : public QObject +class DelayedInitializer : public TQObject { Q_OBJECT public: diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index cf567c33f..f9129ce71 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -72,13 +72,13 @@ public: s_defaultViewProps = 0; } - virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *, + virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ) { if( args.count() < 1 ) kdWarning() << "KonqKfmIconView: Missing Parameter" << endl; - KonqKfmIconView *obj = new KonqKfmIconView( parentWidget, parent, name,args.first() ); + KonqKfmIconView *obj = new KonqKfmIconView( tqparentWidget, parent, name,args.first() ); return obj; } @@ -164,7 +164,7 @@ void IconViewBrowserExtension::setNameFilter( const TQString &nameFilter ) m_iconView->m_nameFilter = nameFilter; } -KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ) +KonqKfmIconView::KonqKfmIconView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode ) : KonqDirPart( parent, name ) , m_bNeedSetCurrentItem( false ) , m_pEnsureVisible( 0 ) @@ -179,7 +179,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons // Create a properties instance for this view m_pProps = new KonqPropsView( KonqIconViewFactory::instance(), KonqIconViewFactory::defaultViewProps() ); - m_pIconView = new KonqIconViewWidget( parentWidget, "qiconview" ); + m_pIconView = new KonqIconViewWidget( tqparentWidget, "qiconview" ); m_pIconView->initConfig( true ); connect( m_pIconView, TQT_SIGNAL(imagePreviewFinished()), @@ -206,7 +206,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons setXMLFile( "konq_iconview.rc" ); - // Don't repaint on configuration changes during construction + // Don't tqrepaint on configuration changes during construction m_bInit = true; m_paDotFiles = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), @@ -359,7 +359,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons // Create the directory lister m_dirLister = new KDirLister( true ); setDirLister( m_dirLister ); - m_dirLister->setMainWindow(m_pIconView->topLevelWidget()); + m_dirLister->setMainWindow(m_pIconView->tqtopLevelWidget()); connect( m_dirLister, TQT_SIGNAL( started( const KURL & ) ), this, TQT_SLOT( slotStarted() ) ); @@ -429,7 +429,7 @@ const KFileItem * KonqKfmIconView::currentItem() void KonqKfmIconView::slotPreview( bool toggle ) { - TQCString name = sender()->name(); // e.g. clipartthumbnail (or audio/, special case) + TQCString name = TQT_TQOBJECT_CONST(sender())->name(); // e.g. clipartthumbnail (or audio/, special case) if (name == "iconview_preview_all") { m_pProps->setShowingPreview( toggle ); @@ -686,7 +686,7 @@ void KonqKfmIconView::newIconSize( int size ) // Stop a preview job that might be running m_pIconView->stopImagePreview(); - // Set icons size, arrage items in grid and repaint the whole view + // Set icons size, arrage items in grid and tqrepaint the whole view m_pIconView->setIcons( size ); // If previews are enabled start a new job @@ -794,7 +794,7 @@ void KonqKfmIconView::slotContextMenuRequested(TQIconViewItem* _item, const TQPo void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item, const TQPoint&) { - if ( _button == RightButton && !_item ) + if ( _button == Qt::RightButton && !_item ) { // Right click on viewport KFileItem * item = m_dirLister->rootItem(); @@ -831,7 +831,7 @@ void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item, void KonqKfmIconView::slotMouseButtonClicked(int _button, TQIconViewItem* _item, const TQPoint& ) { - if( _button == MidButton ) + if( _button == Qt::MidButton ) mmbClicked( _item ? static_cast(_item)->item() : 0L ); } @@ -873,7 +873,7 @@ void KonqKfmIconView::slotCanceled( const KURL& url ) if ( !m_pIconView->viewport()->isUpdatesEnabled() ) { m_pIconView->viewport()->setUpdatesEnabled( true ); - m_pIconView->viewport()->repaint(); + m_pIconView->viewport()->tqrepaint(); } if ( m_pEnsureVisible ){ m_pIconView->ensureItemVisible( m_pEnsureVisible ); @@ -889,11 +889,11 @@ void KonqKfmIconView::slotCompleted() m_pTimeoutRefreshTimer->stop(); // If updates to the viewport are still blocked (so slotNewItems() has - // not been called), a viewport repaint is forced. + // not been called), a viewport tqrepaint is forced. if ( !m_pIconView->viewport()->isUpdatesEnabled() ) { m_pIconView->viewport()->setUpdatesEnabled( true ); - m_pIconView->viewport()->repaint(); + m_pIconView->viewport()->tqrepaint(); } // Root item ? Store root item in konqiconviewwidget (whether 0L or not) @@ -962,7 +962,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries ) KFileItem* fileItem = item->item(); if ( !m_itemsToSelect.isEmpty() ) { - TQStringList::Iterator tsit = m_itemsToSelect.find( fileItem->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.tqfind( fileItem->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); m_pIconView->setSelected( item, true, true ); @@ -1136,7 +1136,7 @@ void KonqKfmIconView::slotRefreshItems( const KFileItemList& entries ) } else { - // In case we replace a big icon with a small one, need to repaint. + // In case we replace a big icon with a small one, need to tqrepaint. if ( bNeedRepaint ) m_pIconView->updateContents(); } @@ -1248,7 +1248,7 @@ void KonqKfmIconView::slotRefreshViewport() TQWidget * vp = m_pIconView->viewport(); bool prevState = vp->isUpdatesEnabled(); vp->setUpdatesEnabled( true ); - vp->repaint(); + vp->tqrepaint(); vp->setUpdatesEnabled( prevState ); } diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h index 517734182..b1ac6df9d 100644 --- a/konqueror/iconview/konq_iconview.h +++ b/konqueror/iconview/konq_iconview.h @@ -51,7 +51,7 @@ public: enum SortCriterion { NameCaseSensitive, NameCaseInsensitive, Size, Type, Date }; - KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ); + KonqKfmIconView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode ); virtual ~KonqKfmIconView(); virtual const KFileItem * currentItem(); diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index 2aafe885c..bbfb548ad 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -80,136 +80,136 @@ void KEBApp::createActions() { // save and quit should probably not be in the toplevel??? (void) KStdAction::quit( - this, TQT_SLOT( close() ), actionCollection()); + TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection()); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); (void) KStdAction::configureToolbars( - this, TQT_SLOT( slotConfigureToolbars() ), actionCollection()); + TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection()); if (m_browser) { (void) KStdAction::open( - actn, TQT_SLOT( slotLoad() ), actionCollection()); + TQT_TQOBJECT(actn), TQT_SLOT( slotLoad() ), actionCollection()); (void) KStdAction::saveAs( - actn, TQT_SLOT( slotSaveAs() ), actionCollection()); + TQT_TQOBJECT(actn), TQT_SLOT( slotSaveAs() ), actionCollection()); } - (void) KStdAction::cut(actn, TQT_SLOT( slotCut() ), actionCollection()); - (void) KStdAction::copy(actn, TQT_SLOT( slotCopy() ), actionCollection()); - (void) KStdAction::paste(actn, TQT_SLOT( slotPaste() ), actionCollection()); - (void) KStdAction::print(actn, TQT_SLOT( slotPrint() ), actionCollection()); + (void) KStdAction::cut(TQT_TQOBJECT(actn), TQT_SLOT( slotCut() ), actionCollection()); + (void) KStdAction::copy(TQT_TQOBJECT(actn), TQT_SLOT( slotCopy() ), actionCollection()); + (void) KStdAction::paste(TQT_TQOBJECT(actn), TQT_SLOT( slotPaste() ), actionCollection()); + (void) KStdAction::print(TQT_TQOBJECT(actn), TQT_SLOT( slotPrint() ), actionCollection()); // settings menu (void) new KToggleAction( i18n("&Show Netscape Bookmarks in Konqueror"), 0, - actn, TQT_SLOT( slotShowNS() ), actionCollection(), + TQT_TQOBJECT(actn), TQT_SLOT( slotShowNS() ), actionCollection(), "settings_showNS"); // actions (void) new KAction( i18n("&Delete"), "editdelete", Key_Delete, - actn, TQT_SLOT( slotDelete() ), actionCollection(), "delete"); + TQT_TQOBJECT(actn), TQT_SLOT( slotDelete() ), actionCollection(), "delete"); (void) new KAction( i18n("Rename"), "text", Key_F2, - actn, TQT_SLOT( slotRename() ), actionCollection(), "rename"); + TQT_TQOBJECT(actn), TQT_SLOT( slotRename() ), actionCollection(), "rename"); (void) new KAction( i18n("C&hange URL"), "text", Key_F3, - actn, TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); + TQT_TQOBJECT(actn), TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); (void) new KAction( i18n("C&hange Comment"), "text", Key_F4, - actn, TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); + TQT_TQOBJECT(actn), TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); (void) new KAction( i18n("Chan&ge Icon..."), "icons", 0, - actn, TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); + TQT_TQOBJECT(actn), TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); (void) new KAction( i18n("Update Favicon"), 0, - actn, TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); + TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); (void) new KAction( i18n("Recursive Sort"), 0, - actn, TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); + TQT_TQOBJECT(actn), TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); (void) new KAction( i18n("&New Folder..."), "folder_new", CTRL+Key_N, - actn, TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); + TQT_TQOBJECT(actn), TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); (void) new KAction( i18n("&New Bookmark"), "www", 0, - actn, TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); + TQT_TQOBJECT(actn), TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); (void) new KAction( i18n("&Insert Separator"), CTRL+Key_I, - actn, TQT_SLOT( slotInsertSeparator() ), actionCollection(), + TQT_TQOBJECT(actn), TQT_SLOT( slotInsertSeparator() ), actionCollection(), "insertseparator"); (void) new KAction( i18n("&Sort Alphabetically"), 0, - actn, TQT_SLOT( slotSort() ), actionCollection(), "sort"); + TQT_TQOBJECT(actn), TQT_SLOT( slotSort() ), actionCollection(), "sort"); (void) new KAction( i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0, - actn, TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); + TQT_TQOBJECT(actn), TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); (void) new KAction( i18n("Show in T&oolbar"), "bookmark_toolbar", 0, - actn, TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); + TQT_TQOBJECT(actn), TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); (void) new KAction( i18n("Hide in T&oolbar"), "bookmark_toolbar", 0, - actn, TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); + TQT_TQOBJECT(actn), TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); (void) new KAction( i18n("&Expand All Folders"), 0, - actn, TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall"); + TQT_TQOBJECT(actn), TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall"); (void) new KAction( i18n("Collapse &All Folders"), 0, - actn, TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); + TQT_TQOBJECT(actn), TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); (void) new KAction( i18n("&Open in Konqueror"), "fileopen", 0, - actn, TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); + TQT_TQOBJECT(actn), TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); (void) new KAction( i18n("Check &Status"), "bookmark", 0, - actn, TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); + TQT_TQOBJECT(actn), TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); (void) new KAction( i18n("Check Status: &All"), 0, - actn, TQT_SLOT( slotTestAll() ), actionCollection(), "testall" ); + TQT_TQOBJECT(actn), TQT_SLOT( slotTestAll() ), actionCollection(), "testall" ); (void) new KAction( i18n("Update All &Favicons"), 0, - actn, TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(), + TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(), "updateallfavicons" ); (void) new KAction( i18n("Cancel &Checks"), 0, - actn, TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); + TQT_TQOBJECT(actn), TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); (void) new KAction( i18n("Cancel &Favicon Updates"), 0, - actn, TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(), + TQT_TQOBJECT(actn), TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(), "cancelfaviconupdates" ); (void) new KAction( i18n("Import &Netscape Bookmarks..."), "netscape", 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importNS"); + TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importNS"); (void) new KAction( i18n("Import &Opera Bookmarks..."), "opera", 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importOpera"); + TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importOpera"); (void) new KAction( i18n("Import All &Crash Sessions as Bookmarks..."), 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importCrashes"); + TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importCrashes"); (void) new KAction( i18n("Import &Galeon Bookmarks..."), 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importGaleon"); + TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon"); (void) new KAction( i18n("Import &KDE2/KDE3 Bookmarks..."), 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importKDE2"); + TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2"); (void) new KAction( i18n("Import &IE Bookmarks..."), 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importIE"); + TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importIE"); (void) new KAction( i18n("Import &Mozilla Bookmarks..."), "mozilla", 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importMoz"); + TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importMoz"); (void) new KAction( i18n("Export to &Netscape Bookmarks"), "netscape", 0, - actn, TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS"); + TQT_TQOBJECT(actn), TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS"); (void) new KAction( i18n("Export to &Opera Bookmarks..."), "opera", 0, - actn, TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); + TQT_TQOBJECT(actn), TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); (void) new KAction( i18n("Export to &HTML Bookmarks..."), "html", 0, - actn, TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); + TQT_TQOBJECT(actn), TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); (void) new KAction( i18n("Export to &IE Bookmarks..."), 0, - actn, TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE"); + TQT_TQOBJECT(actn), TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE"); (void) new KAction( i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0, - actn, TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); + TQT_TQOBJECT(actn), TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); } void ActionsImpl::slotLoad() { @@ -345,7 +345,7 @@ void ActionsImpl::slotCopy() { TQValueList bookmarks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap()); KBookmarkDrag* data = KBookmarkDrag::newDrag(bookmarks, 0 /* not this ! */); - kapp->clipboard()->setData(data, QClipboard::Clipboard); + kapp->tqclipboard()->setData(data, QClipboard::Clipboard); } void ActionsImpl::slotPaste() { @@ -353,7 +353,7 @@ void ActionsImpl::slotPaste() { KEBMacroCommand *mcmd = CmdGen::insertMimeSource( i18n("Paste"), - kapp->clipboard()->data(QClipboard::Clipboard), + kapp->tqclipboard()->data(QClipboard::Clipboard), ListView::self()->userAddress()); CmdHistory::self()->didCommand(mcmd); } @@ -394,7 +394,7 @@ void ActionsImpl::slotImport() { // kdDebug() << "ActionsImpl::slotImport() where sender()->name() == " // << sender()->name() << endl; ImportCommand* import - = ImportCommand::performImport(sender()->name()+6, KEBApp::self()); + = ImportCommand::performImport(TQT_TQOBJECT_CONST(sender())->name()+6, KEBApp::self()); if (!import) return; CmdHistory::self()->addCommand(import); diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp index 2ad58a682..c7c5f83a6 100644 --- a/konqueror/keditbookmarks/commands.cpp +++ b/konqueror/keditbookmarks/commands.cpp @@ -218,7 +218,7 @@ void CreateCommand::unexecute() { KBookmark bk = CurrentMgr::bookmarkAt(m_to); Q_ASSERT(!bk.isNull() && !bk.parentGroup().isNull()); - ListView::self()->invalidate(bk.address()); + ListView::self()->tqinvalidate(bk.address()); bk.parentGroup().deleteBookmark(bk); } @@ -643,13 +643,13 @@ KEBMacroCommand* CmdGen::insertMimeSource( bool modified = false; const char *format = 0; for (int i = 0; format = data->format(i), format; i++) { - // qt docs don't say if encodedData(blah) where + // qt docs don't say if tqencodedData(blah) where // blah is not a stored mimetype should return null // or not. so, we search. sucky... if (strcmp(format, "GALEON_BOOKMARK") == 0) { modified = true; TQStoredDrag *mydrag = new TQStoredDrag("application/x-xbel"); - mydrag->setEncodedData(data->encodedData("GALEON_BOOKMARK")); + mydrag->setEncodedData(data->tqencodedData("GALEON_BOOKMARK")); data = mydrag; break; } else if( strcmp(format, "application/x-xbel" )==0) { diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp index b9b9b4ea9..3ee09fb35 100644 --- a/konqueror/keditbookmarks/favicons.cpp +++ b/konqueror/keditbookmarks/favicons.cpp @@ -85,7 +85,7 @@ void FavIconsItr::doAction() { // kdDebug() << "FavIconsItr::doAction()" << endl; curItem()->setTmpStatus(i18n("Updating favicon...")); if (!m_updater) { - m_updater = new FavIconUpdater(kapp, "FavIconUpdater"); + m_updater = new FavIconUpdater(TQT_TQOBJECT(kapp), "FavIconUpdater"); connect(m_updater, TQT_SIGNAL( done(bool) ), this, TQT_SLOT( slotDone(bool) ) ); } diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp index 4df0d237d..3a9a613c1 100644 --- a/konqueror/keditbookmarks/importers.cpp +++ b/konqueror/keditbookmarks/importers.cpp @@ -45,7 +45,7 @@ TQString ImportCommand::name() const { } TQString ImportCommand::folder() const { - return m_folder ? i18n("%1 Bookmarks").arg(visibleName()) : TQString::null; + return m_folder ? i18n("%1 Bookmarks").arg(visibleName()) : TQString(); } ImportCommand* ImportCommand::importerFactory(const TQCString &type) { diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp index d34794fdc..222b0c89b 100644 --- a/konqueror/keditbookmarks/kbookmarkmerger.cpp +++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp @@ -108,7 +108,7 @@ int main( int argc, char**argv ) for ( unsigned int i = 0; i < extraBookmarksDir.count(); ++i ) { const TQString fileName = extraBookmarksDir[ i ]; - if ( mergedFiles.find( fileName ) != mergedFiles.end() ) { + if ( mergedFiles.tqfind( fileName ) != mergedFiles.end() ) { continue; } diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 1fa31e967..64ec1d337 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -118,8 +118,8 @@ bool lessAddress(TQString a, TQString b) if(bLast +1 == bEnd) return false; - uint aNext = a.find("/", aLast + 1); - uint bNext = b.find("/", bLast + 1); + uint aNext = a.tqfind("/", aLast + 1); + uint bNext = b.tqfind("/", bLast + 1); bool okay; uint aNum = a.mid(aLast + 1, aNext - aLast - 1).toUInt(&okay); @@ -158,12 +158,12 @@ TQValueList ListView::itemsToBookmarks(const TQValueVectorisSelected()) { @@ -181,7 +181,7 @@ void ListView::invalidate(TQListViewItem * item) TQListViewItem * child = item->firstChild(); while(child) { - //invalidate(child); + //tqinvalidate(child); child = child->nextSibling(); } } @@ -218,7 +218,7 @@ void ListView::selected(KEBListViewItem * item, bool s) if(s) mSelectedItems[item] = item; else - if((it = mSelectedItems.find(item)) != mSelectedItems.end()) + if((it = mSelectedItems.tqfind(item)) != mSelectedItems.end()) mSelectedItems.remove(it); KEBApp::self()->updateActions(); @@ -277,7 +277,7 @@ void ListView::deselectAllChildren(KEBListViewItem *item) else deselectAllChildren(child); } - child->repaint(); + child->tqrepaint(); child = static_cast(child->nextSibling()); } } @@ -376,7 +376,7 @@ KEBListViewItem* ListView::getItemAtAddress(const TQString &address) const { void ListView::setOpen(bool open) { for (TQListViewItemIterator it(m_listView); it.current() != 0; ++it) - if (it.current()->parent()) + if (it.current()->tqparent()) it.current()->setOpen(open); } @@ -456,7 +456,7 @@ void ListView::updateListView() { KEBListViewItem * item = static_cast(m_listView->currentItem()); if(item->isEmptyFolderPadder()) - s_current_address = static_cast(item->parent())->bookmark().address(); + s_current_address = static_cast(item->tqparent())->bookmark().address(); else s_current_address = item->bookmark().address(); } @@ -483,7 +483,7 @@ void ListView::fillWithGroup(KEBListView *lv, KBookmarkGroup group, KEBListViewI KEBListViewItem *tree = new KEBListViewItem(lv, group); fillWithGroup(lv, group, tree); tree->TQListViewItem::setOpen(true); - if (s_selected_addresses.contains(tree->bookmark().address())) + if (s_selected_addresses.tqcontains(tree->bookmark().address())) lv->setSelected(tree, true); if(!s_current_address.isNull() && s_current_address == tree->bookmark().address()) lv->setCurrentItem(tree); @@ -515,7 +515,7 @@ void ListView::fillWithGroup(KEBListView *lv, KBookmarkGroup group, KEBListViewI : new KEBListViewItem(lv, bk)); lastItem = item; } - if (s_selected_addresses.contains(bk.address())) + if (s_selected_addresses.tqcontains(bk.address())) lv->setSelected(item, true); if(!s_current_address.isNull() && s_current_address == bk.address()) lv->setCurrentItem(item); @@ -804,7 +804,7 @@ TQDragObject *KEBListView::dragObject() { bool KEBListViewItem::parentSelected(TQListViewItem * item) { TQListViewItem *root = item->listView()->firstChild(); - for( TQListViewItem *parent = item->parent(); parent ; parent = parent->parent()) + for( TQListViewItem *parent = item->tqparent(); parent ; parent = parent->tqparent()) if (parent->isSelected() && parent != root) return true; return false; @@ -814,7 +814,7 @@ void KEBListViewItem::setSelected(bool s) { if( isEmptyFolderPadder()) { - parent()->setSelected(true); + tqparent()->setSelected(true); return; } @@ -829,7 +829,7 @@ void KEBListViewItem::setSelected(bool s) { ListView::self()->selected(this, false); TQListViewItem::setSelected( false ); - ListView::deselectAllChildren( this ); //repaints + ListView::deselectAllChildren( this ); //tqrepaints } else if(parentSelected(this)) return; @@ -904,7 +904,7 @@ KEBListViewItem::KEBListViewItem(TQListView *parent, TQListViewItem *after, cons // DESIGN - move this into kbookmark or into a helper void KEBListViewItem::setOpen(bool open) { - if (!parent()) + if (!tqparent()) return; m_bookmark.internalElement().setAttribute("folded", open ? "no" : "yes"); TQListViewItem::setOpen(open); diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h index 0ca0edf38..c05226ff6 100644 --- a/konqueror/keditbookmarks/listview.h +++ b/konqueror/keditbookmarks/listview.h @@ -36,7 +36,7 @@ class TQSplitter; class KListViewSearchLine; -class KEBListViewItem : public QListViewItem +class KEBListViewItem : public TQListViewItem { public: KEBListViewItem(TQListView *, const KBookmarkGroup &); @@ -56,7 +56,7 @@ public: void setTmpStatus(const TQString &); void restoreStatus(); - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); void setSelected ( bool s ); virtual void setOpen(bool); @@ -127,7 +127,7 @@ private: }; // DESIGN - make some stuff private if possible -class ListView : public QObject +class ListView : public TQObject { Q_OBJECT public: @@ -140,8 +140,8 @@ public: // selected item stuff void selected(KEBListViewItem * item, bool s); - void invalidate(const TQString & address); - void invalidate(TQListViewItem * item); + void tqinvalidate(const TQString & address); + void tqinvalidate(TQListViewItem * item); void fixUpCurrent(const TQString & address); KEBListViewItem * firstSelected() const; diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 3416e7e0d..9b19ee449 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -67,7 +67,7 @@ static void continueInWindow(TQString _wname) { for (QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it) { TQCString &clientId = *it; - if (qstrncmp(clientId, wname, wname.length()) != 0) + if (tqstrncmp(clientId, wname, wname.length()) != 0) continue; DCOPRef client(clientId.data(), wname + "-mainwindow#1"); @@ -139,8 +139,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { bool gotArg = (args->count() == 1); TQString filename = gotArg - ? TQString::fromLatin1(args->arg(0)) - : locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); + ? TQString::tqfromLatin1(args->arg(0)) + : locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml")); if (!isGui) { CurrentMgr::self()->createManager(filename); @@ -182,7 +182,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { TQString caption = args->isSet("customcaption") ? TQString::fromLocal8Bit(args->getOption("customcaption")) - : TQString::null; + : TQString(); args->clear(); diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp index 0d7d0ddf8..dd2429ab1 100644 --- a/konqueror/keditbookmarks/testlink.cpp +++ b/konqueror/keditbookmarks/testlink.cpp @@ -107,10 +107,10 @@ void TestLinkItr::slotJobData(KIO::Job *job, const TQByteArray &data) { if (transfer->isErrorPage()) { TQStringList lines = TQStringList::split('\n', data); for (TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) { - int open_pos = (*it).find("", 0, false); + int open_pos = (*it).tqfind("<title>", 0, false); if (open_pos >= 0) { TQString leftover = (*it).mid(open_pos + 7); - int close_pos = leftover.findRev("", -1, false); + int close_pos = leftover.tqfindRev("", -1, false); if (close_pos >= 0) { // if no end tag found then just // print the first line of the @@ -144,7 +144,7 @@ void TestLinkItr::slotJobResult(KIO::Job *job) { // can we assume that errorString will contain no entities? TQString jerr = job->errorString(); if (!jerr.isEmpty()) { - jerr.replace("\n", " "); + jerr.tqreplace("\n", " "); curItem()->nsPut(jerr); chkErr = false; } @@ -166,13 +166,13 @@ void TestLinkItr::slotJobResult(KIO::Job *job) { /* -------------------------- */ const TQString TestLinkItrHolder::getMod(const TQString &url) const { - return m_modify.contains(url) + return m_modify.tqcontains(url) ? m_modify[url] : TQString::null; } const TQString TestLinkItrHolder::getOldVisit(const TQString &url) const { - return self()->m_oldModify.contains(url) + return self()->m_oldModify.tqcontains(url) ? self()->m_oldModify[url] : TQString::null; } diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index 4a505d495..ce2d9db58 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -82,7 +82,7 @@ void CmdHistory::slotCommandExecuted(KCommand *k) { CurrentMgr::self()->notifyManagers(bk.toGroup()); // sets currentItem to something sensible - // if the currentItem was invalidated by executing + // if the currentItem was tqinvalidated by executing // CreateCommand or DeleteManyCommand // otherwise does nothing // sensible is either a already selected item or cmd->currentAddress() @@ -184,8 +184,8 @@ TQString CurrentMgr::makeTimeStr(int b) { TQDateTime dt; dt.setTime_t(b); - return (dt.daysTo(TQDateTime::currentDateTime()) > 31) - ? KGlobal::locale()->formatDate(dt.date(), false) + return (dt.daysTo(TQDateTime::tqcurrentDateTime()) > 31) + ? KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false) : KGlobal::locale()->formatDateTime(dt, false); } @@ -231,13 +231,13 @@ KEBApp::KEBApp( m_bkinfo = new BookmarkInfoWidget(vsplitter); - vsplitter->setOrientation(TQSplitter::Vertical); + vsplitter->setOrientation(Qt::Vertical); vsplitter->setSizes(TQValueList<int>() << h << 380 - << m_bkinfo->sizeHint().height() ); + << m_bkinfo->tqsizeHint().height() ); setCentralWidget(vsplitter); - resize(ListView::self()->widget()->sizeHint().width(), - vsplitter->sizeHint().height()); + resize(ListView::self()->widget()->tqsizeHint().width(), + vsplitter->tqsizeHint().height()); createActions(); if (m_browser) @@ -319,7 +319,7 @@ void KEBApp::slotClipboardDataChanged() { // kdDebug() << "KEBApp::slotClipboardDataChanged" << endl; if (!m_readOnly) { m_canPaste = KBookmarkDrag::canDecode( - kapp->clipboard()->data(QClipboard::Clipboard)); + kapp->tqclipboard()->data(QClipboard::Clipboard)); updateActions(); } } diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc index 7cb8a6148..35c5fec83 100644 --- a/konqueror/konq_actions.cc +++ b/konqueror/konq_actions.cc @@ -63,7 +63,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const TQPtrList<HistoryEntry> &his { TQString text = it.current()->title; text = KStringHandler::cEmSqueeze(text, popup->fontMetrics(), 30); //CT: squeeze - text.replace( "&", "&&" ); + text.tqreplace( "&", "&&" ); if ( checkCurrentItem && it.current() == current ) { int id = popup->insertItem( text ); // no pixmap if checked diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index 0a73e6c83..9bd39a86e 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -48,10 +48,10 @@ static TQString titleOfURL( const TQString& urlStr ) url.setPath( url.path()+'/' ); historyentry = historylist.findEntry( url ); } - return ( historyentry ? historyentry->title : TQString::null ); + return ( historyentry ? historyentry->title : TQString() ); } -class Q_EXPORT KonqComboListBoxPixmap : public QListBoxItem +class TQ_EXPORT KonqComboListBoxPixmap : public TQListBoxItem { public: KonqComboListBoxPixmap( const TQString& text ); @@ -95,11 +95,11 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name ) : KHistoryCombo( parent, name ), m_returnPressed( false ), m_permanent( false ), - m_modifier( NoButton ), + m_modifier( Qt::NoButton ), m_pageSecurity( KonqMainWindow::NotCrypted ) { setInsertionPolicy( NoInsertion ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); Q_ASSERT( s_config ); @@ -307,7 +307,7 @@ void KonqCombo::updatePixmaps() updateItem( prov->pixmapFor( text( i ) ), text( i ), i, titleOfURL( text( i ) ) ); } setUpdatesEnabled( true ); - repaint(); + tqrepaint(); restoreState(); } @@ -396,10 +396,10 @@ bool KonqCombo::eventFilter( TQObject *o, TQEvent *ev ) // Handle Ctrl+Del/Backspace etc better than the Qt widget, which always // jumps to the next whitespace. TQLineEdit *edit = lineEdit(); - if ( o == edit ) { + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(edit) ) { int type = ev->type(); if ( type == TQEvent::KeyPress ) { - TQKeyEvent *e = static_cast<TQKeyEvent *>( ev ); + TQKeyEvent *e = TQT_TQKEYEVENT( ev ); if ( e->key() == Key_Return || e->key() == Key_Enter ) { m_modifier = e->state(); @@ -459,7 +459,7 @@ void KonqCombo::selectWord(TQKeyEvent *e) count++; if( allow_space_break && text[pos].isSpace() && count > 1 ) break; - } while( pos >= 0 && (chars.findIndex(text[pos]) == -1 || count <= 1) ); + } while( pos >= 0 && (chars.tqfindIndex(text[pos]) == -1 || count <= 1) ); if( e->state() & ShiftButton ) { edit->cursorForward(true, 1-count); @@ -482,7 +482,7 @@ void KonqCombo::selectWord(TQKeyEvent *e) count++; if( allow_space_break && text[pos].isSpace() ) break; - } while( pos < (int) text.length() && chars.findIndex(text[pos]) == -1 ); + } while( pos < (int) text.length() && chars.tqfindIndex(text[pos]) == -1 ); if( e->state() & ShiftButton ) { edit->cursorForward(true, count+1); @@ -537,10 +537,10 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e ) { m_dragStart = TQPoint(); // null QPoint - if ( e->button() == LeftButton && pixmap( currentItem()) ) { + if ( e->button() == Qt::LeftButton && pixmap( currentItem()) ) { // check if the pixmap was clicked int x = e->pos().x(); - int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); + int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); if ( x > x0 + 2 && x < lineEdit()->x() ) { m_dragStart = e->pos(); @@ -548,10 +548,10 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e ) } } - if ( e->button() == LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) { + if ( e->button() == Qt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) { // check if the lock icon was clicked int x = e->pos().x(); - int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x(); + int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x(); if ( x < x0 ) emit showPageSecurity(); @@ -566,7 +566,7 @@ void KonqCombo::mouseMoveEvent( TQMouseEvent *e ) if ( m_dragStart.isNull() || currentText().isEmpty() ) return; - if ( e->state() & LeftButton && + if ( e->state() & Qt::LeftButton && (e->pos() - m_dragStart).manhattanLength() > KGlobalSettings::dndEventDelay() ) { @@ -591,7 +591,7 @@ void KonqCombo::slotActivated( const TQString& text ) applyPermanent(); m_returnPressed = true; emit activated( text, m_modifier ); - m_modifier = NoButton; + m_modifier = Qt::NoButton; } void KonqCombo::setConfig( KConfig *kc ) @@ -604,8 +604,8 @@ void KonqCombo::paintEvent( TQPaintEvent *pe ) TQComboBox::paintEvent( pe ); TQLineEdit *edit = lineEdit(); - TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); - re = TQStyle::visualRect(re, this); + TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); + re = TQStyle::tqvisualRect(re, this); if ( m_pageSecurity!=KonqMainWindow::NotCrypted ) { TQColor color(245, 246, 190); @@ -646,7 +646,7 @@ void KonqCombo::paintEvent( TQPaintEvent *pe ) void KonqCombo::setPageSecurity( int pageSecurity ) { m_pageSecurity = pageSecurity; - repaint(); + tqrepaint(); } bool KonqCombo::hasSufficientContrast(const TQColor &c1, const TQColor &c2) @@ -701,7 +701,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter ) title = titleOfURL( text() ); if ( !title.isEmpty() ) pm = KonqPixmapProvider::self()->pixmapFor( text(), KIcon::SizeSmall ); - else if ( text().find( "://" ) == -1 ) { + else if ( text().tqfind( "://" ) == -1 ) { title = titleOfURL( "http://"+text() ); if ( !title.isEmpty() ) pm = KonqPixmapProvider::self()->pixmapFor( "http://"+text(), KIcon::SizeSmall ); @@ -723,8 +723,8 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter ) pmWidth = pm->width() + 5; } - int entryWidth = listBox()->width() - listBox()->style().pixelMetric( TQStyle::PM_ScrollBarExtent ) - - 2 * listBox()->style().pixelMetric( TQStyle::PM_DefaultFrameWidth ); + int entryWidth = listBox()->width() - listBox()->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) - + 2 * listBox()->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); int titleWidth = ( entryWidth / 3 ) - 1; int urlWidth = entryWidth - titleWidth - pmWidth - 2; @@ -803,7 +803,7 @@ void KonqComboLineEdit::setCompletedItems( const TQStringList& items ) bool wasSelected = completionbox->isSelected( completionbox->currentItem() ); const TQString currentSelection = completionbox->currentText(); completionbox->setItems( items ); - TQListBoxItem* item = completionbox->findItem( currentSelection, Qt::ExactMatch ); + TQListBoxItem* item = completionbox->tqfindItem( currentSelection, TQt::ExactMatch ); if( !item || !wasSelected ) { wasSelected = false; @@ -824,7 +824,7 @@ void KonqComboLineEdit::setCompletedItems( const TQStringList& items ) } if ( autoSuggest() ) { - int index = items.first().find( txt ); + int index = items.first().tqfind( txt ); TQString newText = items.first().mid( index ); setUserSelection( false ); setCompletedText( newText, true ); @@ -850,7 +850,7 @@ void KonqComboCompletionBox::setItems( const TQStringList& items ) insertStringList( items ); else { //Keep track of whether we need to change anything, - //so we can avoid a repaint for identical updates, + //so we can avoid a tqrepaint for identical updates, //to reduce flicker bool dirty = false; @@ -884,7 +884,7 @@ void KonqComboCompletionBox::setItems( const TQStringList& items ) triggerUpdate( false ); } - if ( isVisible() && size().height() != sizeHint().height() ) + if ( isVisible() && size().height() != tqsizeHint().height() ) sizeAndPosition(); blockSignals( block ); diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc index d6d9f71a0..93bccfc01 100644 --- a/konqueror/konq_extensionmanager.cc +++ b/konqueror/konq_extensionmanager.cc @@ -100,8 +100,8 @@ void KonqExtensionManager::apply() setChanged(false); if( d->mainWindow ) { - KParts::Plugin::loadPlugins(d->mainWindow, d->mainWindow, KGlobal::instance()); - TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(d->mainWindow); + KParts::Plugin::loadPlugins(TQT_TQOBJECT(d->mainWindow), d->mainWindow, KGlobal::instance()); + TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(TQT_TQOBJECT(d->mainWindow)); TQPtrListIterator<KParts::Plugin> it(plugins); KParts::Plugin *plugin; while((plugin = it.current()) != 0) diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc index 8dfee7f85..e53b3a32c 100644 --- a/konqueror/konq_factory.cc +++ b/konqueror/konq_factory.cc @@ -42,10 +42,10 @@ KonqViewFactory::KonqViewFactory( KLibFactory *factory, const TQStringList &args : m_factory( factory ), m_args( args ), m_createBrowser( createBrowser ) { if ( m_createBrowser ) - m_args << TQString::fromLatin1( "Browser/View" ); + m_args << TQString::tqfromLatin1( "Browser/View" ); } -KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const char *widgetName, +KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *tqparentWidget, const char *widgetName, TQObject * parent, const char *name ) { if ( !m_factory ) @@ -56,25 +56,25 @@ KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const cha if ( m_factory->inherits( "KParts::Factory" ) ) { if ( m_createBrowser ) - obj = static_cast<KParts::Factory *>(m_factory)->createPart( parentWidget, widgetName, parent, name, "Browser/View", m_args ); + obj = static_cast<KParts::Factory *>(m_factory)->createPart( tqparentWidget, widgetName, parent, name, "Browser/View", m_args ); if ( !obj ) - obj = static_cast<KParts::Factory *>(m_factory)->createPart( parentWidget, widgetName, parent, name, "KParts::ReadOnlyPart", m_args ); + obj = static_cast<KParts::Factory *>(m_factory)->createPart( tqparentWidget, widgetName, parent, name, "KParts::ReadOnlyPart", m_args ); } else { if ( m_createBrowser ) - obj = m_factory->create( parentWidget, name, "Browser/View", m_args ); + obj = m_factory->create( TQT_TQOBJECT(tqparentWidget), name, "Browser/View", m_args ); if ( !obj ) - obj = m_factory->create( parentWidget, name, "KParts::ReadOnlyPart", m_args ); + obj = m_factory->create( TQT_TQOBJECT(tqparentWidget), name, "KParts::ReadOnlyPart", m_args ); } if ( !obj->inherits( "KParts::ReadOnlyPart" ) ) kdError(1202) << "Part " << obj << " (" << obj->className() << ") doesn't inherit KParts::ReadOnlyPart !" << endl; KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>( obj ); - TQFrame* frame = ::qt_cast<TQFrame*>( part->widget() ); + TQFrame* frame = ::tqqt_cast<TQFrame*>( part->widget() ); if (frame) { frame->setFrameStyle( TQFrame::NoFrame ); @@ -189,7 +189,7 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType, args = TQStringList::split( " ", argStr ); } - return KonqViewFactory( factory, args, service->serviceTypes().contains( "Browser/View" ) ); + return KonqViewFactory( factory, args, service->serviceTypes().tqcontains( "Browser/View" ) ); } void KonqFactory::getOffers( const TQString & serviceType, diff --git a/konqueror/konq_factory.h b/konqueror/konq_factory.h index ac24061e6..1f7834d64 100644 --- a/konqueror/konq_factory.h +++ b/konqueror/konq_factory.h @@ -52,7 +52,7 @@ public: return *this; } - KParts::ReadOnlyPart *create( TQWidget *parentWidget, const char *widgetName, + KParts::ReadOnlyPart *create( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name ); bool isNull() const { return m_factory ? false : true; } diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index ef474a4cb..cda99b291 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cc @@ -68,20 +68,20 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name ) setSizeGripEnabled( false ); m_led = new TQLabel( this ); - m_led->setAlignment( Qt::AlignCenter ); - m_led->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + m_led->tqsetAlignment( Qt::AlignCenter ); + m_led->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); addWidget( m_led, 0, false ); // led (active view indicator) m_led->hide(); m_pStatusLabel = new KSqueezedTextLabel( this ); m_pStatusLabel->setMinimumSize( 0, 0 ); - m_pStatusLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); + m_pStatusLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); m_pStatusLabel->installEventFilter(this); addWidget( m_pStatusLabel, 1 /*stretch*/, false ); // status label m_pLinkedViewCheckBox = new KonqCheckBox( this, "m_pLinkedViewCheckBox" ); - m_pLinkedViewCheckBox->setFocusPolicy(NoFocus); - m_pLinkedViewCheckBox->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + m_pLinkedViewCheckBox->setFocusPolicy(TQ_NoFocus); + m_pLinkedViewCheckBox->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); TQWhatsThis::add( m_pLinkedViewCheckBox, i18n("Checking this box on at least two views sets those views as 'linked'. " "Then, when you change directories in one view, the other views " @@ -151,7 +151,7 @@ void KonqFrameStatusBar::splitFrameMenu() // We have to ship the remove view action ourselves, // since this may not be the active view (passive view) - KAction actRemoveView(i18n("Close View"), "view_remove", 0, m_pParentKonqFrame, TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview"); + KAction actRemoveView(i18n("Close View"), "view_remove", 0, TQT_TQOBJECT(m_pParentKonqFrame), TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview"); //KonqView * nextView = mw->viewManager()->chooseNextView( m_pParentKonqFrame->childView() ); actRemoveView.setEnabled( mw->mainViewsCount() > 1 || m_pParentKonqFrame->childView()->isToggleView() || m_pParentKonqFrame->childView()->isPassiveMode() ); @@ -173,15 +173,15 @@ void KonqFrameStatusBar::splitFrameMenu() bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e) { - if (o == m_pStatusLabel && e->type()==TQEvent::MouseButtonPress) + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pStatusLabel) && e->type()==TQEvent::MouseButtonPress) { emit clicked(); update(); - if ( static_cast<TQMouseEvent *>(e)->button() == RightButton) + if ( TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton) splitFrameMenu(); return true; } - else if ( o == this && e->type() == TQEvent::ApplicationPaletteChange ) + else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::ApplicationPaletteChange ) { unsetPalette(); updateActiveStatus(); @@ -274,7 +274,7 @@ void KonqFrameStatusBar::updateActiveStatus() bool hasFocus = m_pParentKonqFrame->isActivePart(); - const TQColorGroup& activeCg = kapp->palette().active(); + const TQColorGroup& activeCg = kapp->tqpalette().active(); setPaletteBackgroundColor( hasFocus ? activeCg.midlight() : activeCg.mid() ); static TQPixmap indicator_viewactive( UserIcon( "indicator_viewactive" ) ); @@ -301,7 +301,7 @@ KonqFrame::KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer, // the frame statusbar m_pStatusBar = new KonqFrameStatusBar( this, "KonquerorFrameStatusBar"); - m_pStatusBar->setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + m_pStatusBar->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); connect(m_pStatusBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStatusBarClicked())); connect( m_pStatusBar, TQT_SIGNAL( linkedViewClicked( bool ) ), this, TQT_SLOT( slotLinkedViewClicked( bool ) ) ); m_separator = 0; @@ -327,16 +327,16 @@ void KonqFrame::listViews( ChildViewList *viewList ) void KonqFrame::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ ) { if (saveURLs) - config->writePathEntry( TQString::fromLatin1( "URL" ).prepend( prefix ), + config->writePathEntry( TQString::tqfromLatin1( "URL" ).prepend( prefix ), childView()->url().url() ); - config->writeEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() ); - config->writeEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() ); - config->writeEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() ); - config->writeEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() ); - config->writeEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() ); - config->writeEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() ); - //config->writeEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() ); - if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true ); + config->writeEntry( TQString::tqfromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() ); + config->writeEntry( TQString::tqfromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() ); + config->writeEntry( TQString::tqfromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() ); + config->writeEntry( TQString::tqfromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() ); + config->writeEntry( TQString::tqfromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() ); + config->writeEntry( TQString::tqfromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() ); + //config->writeEntry( TQString::tqfromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() ); + if (this == docContainer) config->writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true ); KonqConfigEvent ev( config, prefix+"_", true/*save*/); TQApplication::sendEvent( childView()->part(), &ev ); @@ -352,8 +352,8 @@ void KonqFrame::printFrameInfo( const TQString& spaces ) { TQString className = "NoPart"; if (part()) className = part()->widget()->className(); - kdDebug(1202) << spaces << "KonqFrame " << this << " visible=" << TQString("%1").arg(isVisible()) << " containing view " - << childView() << " visible=" << TQString("%1").arg(isVisible()) + kdDebug(1202) << spaces << "KonqFrame " << this << " visible=" << TQString("%1").tqarg(isVisible()) << " containing view " + << childView() << " visible=" << TQString("%1").tqarg(isVisible()) << " and part " << part() << " whose widget is a " << className << endl; } @@ -397,7 +397,7 @@ bool KonqFrame::eventFilter(TQObject* /*obj*/, TQEvent *ev) { if (ev->type()==TQEvent::KeyPress) { - TQKeyEvent * keyEv = static_cast<TQKeyEvent*>(ev); + TQKeyEvent * keyEv = TQT_TQKEYEVENT(ev); if ((keyEv->key()==Key_Tab) && (keyEv->state()==ControlButton)) { emit ((KonqFrameContainer*)parent())->ctrlTabPressed(); @@ -460,7 +460,7 @@ void KonqFrame::slotLinkedViewClicked( bool mode ) void KonqFrame::paintEvent( TQPaintEvent* ) { - m_pStatusBar->repaint(); + m_pStatusBar->tqrepaint(); } void KonqFrame::slotRemoveView() @@ -517,40 +517,40 @@ void KonqFrameContainer::saveConfig( KConfig* config, const TQString &prefix, bo int idSecond = id + (int)pow( 2.0, depth ); //write children sizes - config->writeEntry( TQString::fromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() ); + config->writeEntry( TQString::tqfromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() ); //write children TQStringList strlst; if( firstChild() ) - strlst.append( TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1) ); + strlst.append( TQString::tqfromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1) ); if( secondChild() ) - strlst.append( TQString::fromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ) ); + strlst.append( TQString::tqfromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ) ); - config->writeEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), strlst ); + config->writeEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), strlst ); //write orientation TQString o; if( orientation() == Qt::Horizontal ) - o = TQString::fromLatin1("Horizontal"); + o = TQString::tqfromLatin1("Horizontal"); else if( orientation() == Qt::Vertical ) - o = TQString::fromLatin1("Vertical"); - config->writeEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ), o ); + o = TQString::tqfromLatin1("Vertical"); + config->writeEntry( TQString::tqfromLatin1( "Orientation" ).prepend( prefix ), o ); //write docContainer - if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true ); + if (this == docContainer) config->writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true ); - if (m_pSecondChild == m_pActiveChild) config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 1 ); - else config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 0 ); + if (m_pSecondChild == m_pActiveChild) config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ), 1 ); + else config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ), 0 ); //write child configs if( firstChild() ) { - TQString newPrefix = TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1); + TQString newPrefix = TQString::tqfromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1); newPrefix.append( '_' ); firstChild()->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + 1 ); } if( secondChild() ) { - TQString newPrefix = TQString::fromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ); + TQString newPrefix = TQString::tqfromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ); newPrefix.append( '_' ); secondChild()->saveConfig( config, newPrefix, saveURLs, docContainer, idSecond, depth + 1 ); } @@ -576,7 +576,7 @@ KonqFrameBase* KonqFrameContainer::otherChild( KonqFrameBase* child ) void KonqFrameContainer::printFrameInfo( const TQString& spaces ) { - kdDebug(1202) << spaces << "KonqFrameContainer " << this << " visible=" << TQString("%1").arg(isVisible()) + kdDebug(1202) << spaces << "KonqFrameContainer " << this << " visible=" << TQString("%1").tqarg(isVisible()) << " activeChild=" << m_pActiveChild << endl; if (!m_pActiveChild) kdDebug(1202) << "WARNING: " << this << " has a null active child!" << endl; diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h index c695515e8..7f3226faf 100644 --- a/konqueror/konq_frame.h +++ b/konqueror/konq_frame.h @@ -62,7 +62,7 @@ namespace KParts * unchecked radiobutton in b2k style if unchecked and contains a little * anchor if checked. */ -class KonqCheckBox : public QCheckBox +class KonqCheckBox : public TQCheckBox { Q_OBJECT // for classname public: diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc index 316c88254..d3d3e1bcc 100644 --- a/konqueror/konq_guiclients.cc +++ b/konqueror/konq_guiclients.cc @@ -152,7 +152,7 @@ void PopupMenuGUIClient::addEmbeddingService( TQDomElement &menu, int idx, const action.setAttribute( "group", "preview" ); (void)new KAction( name, service->pixmap( KIcon::Small ), 0, - m_mainWindow, TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName ); + TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName ); } ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) @@ -191,7 +191,7 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) TQString name = (*cIt)->desktopEntryName(); //kdDebug(1202) << "ToggleViewGUIClient: name=" << name << endl; KToggleAction *action = new KToggleAction( description, 0, mainWindow->actionCollection(), name.latin1() ); - action->setCheckedState( i18n( "Hide %1" ).arg( (*cIt)->name() ) ); + action->setCheckedState( i18n( "Hide %1" ).tqarg( (*cIt)->name() ) ); // HACK if ( (*cIt)->icon() != "unknown" ) @@ -230,7 +230,7 @@ TQPtrList<KAction> ToggleViewGUIClient::actions() const void ToggleViewGUIClient::slotToggleView( bool toggle ) { - TQString serviceName = TQString::fromLatin1( sender()->name() ); + TQString serviceName = TQString::tqfromLatin1( TQT_TQOBJECT_CONST(sender())->name() ); bool horizontal = m_mapOrientation[ serviceName ]; @@ -240,7 +240,7 @@ void ToggleViewGUIClient::slotToggleView( bool toggle ) { KonqView *childView = viewManager->splitWindow( horizontal ? Qt::Vertical : Qt::Horizontal, - TQString::fromLatin1( "Browser/View" ), + TQString::tqfromLatin1( "Browser/View" ), serviceName, !horizontal /* vertical = make it first */); @@ -305,7 +305,7 @@ void ToggleViewGUIClient::saveConfig( bool add, const TQString &serviceName ) TQStringList toggableViewsShown = KonqSettings::toggableViewsShown(); if (add) { - if ( !toggableViewsShown.contains( serviceName ) ) + if ( !toggableViewsShown.tqcontains( serviceName ) ) toggableViewsShown.append(serviceName); } else diff --git a/konqueror/konq_guiclients.h b/konqueror/konq_guiclients.h index 6dc31b7e9..10e1d495c 100644 --- a/konqueror/konq_guiclients.h +++ b/konqueror/konq_guiclients.h @@ -69,7 +69,7 @@ private: TQDomDocument m_doc; }; -class ToggleViewGUIClient : public QObject +class ToggleViewGUIClient : public TQObject { Q_OBJECT public: diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index 3f3e47bc3..67e815522 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cc @@ -76,7 +76,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) while ( KonqMainWindow::canBeRestored( n ) ) { TQString className = KMainWindow::classNameOfToplevel( n ); - if( className == TQString::fromLatin1( "KonqMainWindow" )) + if( className == TQString::tqfromLatin1( "KonqMainWindow" )) (new KonqMainWindow( KURL(), false ) )->restore( n ); else kdWarning() << "Unknown class " << className << " in session saved data!" << endl; @@ -93,7 +93,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) it != profiles.end(); ++it) { TQString file = *it; - file = file.mid(file.findRev('/')+1); + file = file.mid(file.tqfindRev('/')+1); printf("%s\n", TQFile::encodeName(file).data()); } @@ -104,7 +104,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) TQString profile = TQString::fromLocal8Bit(args->getOption("profile")); TQString profilePath = profile; if (profile[0] != '/') - profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ); + profilePath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ); TQString url; TQStringList filesToSelect; if (args->count() == 1) @@ -150,7 +150,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) { // By default try to open in webbrowser mode. People can use "konqueror ." to get a filemanager. TQString profile = "webbrowsing"; - TQString profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ); + TQString profilePath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ); if ( !profilePath.isEmpty() ) { KonqMisc::createBrowserWindowFromProfile( profilePath, profile ); } else { diff --git a/konqueror/konq_main.h b/konqueror/konq_main.h index ff72a5181..92dbdd3b2 100644 --- a/konqueror/konq_main.h +++ b/konqueror/konq_main.h @@ -13,7 +13,7 @@ public: closed_by_sm( false ) {} bool closedByUser() const { return !closed_by_sm; } - void commitData(QSessionManager& sm) { + void commitData(TQSessionManager& sm) { closed_by_sm = true; KApplication::commitData( sm ); closed_by_sm = false; diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index ada6c2ef3..ed06539e5 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -143,7 +143,7 @@ KonqExtendedBookmarkOwner::KonqExtendedBookmarkOwner(KonqMainWindow *w) } KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, const char *name, const TQString& xmluiFile) - : KParts::MainWindow( NoDCOPObject, 0L, name, WDestructiveClose | WStyle_ContextHelp | Qt::WGroupLeader ) + : KParts::MainWindow( NoDCOPObject, 0L, name, (WFlags)(WDestructiveClose | WStyle_ContextHelp | TQt::WGroupLeader) ) { setPreloadedFlag( false ); @@ -195,7 +195,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con // init history-manager, load history, get completion object if ( !s_pCompletion ) { - KonqHistoryManager *mgr = new KonqHistoryManager( kapp, "history mgr" ); + KonqHistoryManager *mgr = new KonqHistoryManager( TQT_TQOBJECT(kapp), "history mgr" ); s_pCompletion = mgr->completionObject(); @@ -235,7 +235,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con connect(toolBarMenuAction(),TQT_SIGNAL(activated()),this,TQT_SLOT(slotForceSaveMainWindowSettings()) ); if ( !m_toggleViewGUIClient->empty() ) - plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); + plugActionList( TQString::tqfromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); else { delete m_toggleViewGUIClient; @@ -342,8 +342,8 @@ KonqMainWindow::~KonqMainWindow() TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ) { - static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" ); - static TQString tagToolBar = TQString::fromLatin1( "ToolBar" ); + static TQString nameBookmarkBar = TQString::tqfromLatin1( "bookmarkToolBar" ); + static TQString tagToolBar = TQString::tqfromLatin1( "ToolBar" ); TQWidget *res = KParts::MainWindow::createContainer( parent, index, element, id ); @@ -363,7 +363,7 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T m_bookmarkBarActionCollection = new KActionCollection( this ); m_bookmarkBarActionCollection->setHighlightingEnabled( true ); connectActionCollection( m_bookmarkBarActionCollection ); - DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, res ); + DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, TQT_TQOBJECT(res) ); connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT(initBookmarkBar()) ); } } @@ -373,18 +373,18 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T void KonqMainWindow::initBookmarkBar() { - KToolBar * bar = static_cast<KToolBar *>( child( "bookmarkToolBar", "KToolBar" ) ); + KToolBar * bar = static_cast<KToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "KToolBar" )) ); if (!bar) return; delete m_paBookmarkBar; - m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, this ); + m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, TQT_TQOBJECT(this) ); connect( m_paBookmarkBar, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); connect( m_paBookmarkBar, - TQT_SIGNAL( openBookmark(const TQString &, Qt::ButtonState) ), - this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, Qt::ButtonState) )); + TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), + this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); // hide if empty if (bar->count() == 0 ) @@ -393,8 +393,8 @@ void KonqMainWindow::initBookmarkBar() void KonqMainWindow::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id ) { - static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" ); - static TQString tagToolBar = TQString::fromLatin1( "ToolBar" ); + static TQString nameBookmarkBar = TQString::tqfromLatin1( "bookmarkToolBar" ); + static TQString tagToolBar = TQString::tqfromLatin1( "ToolBar" ); if ( element.tagName() == tagToolBar && element.attribute( "name" ) == nameBookmarkBar ) { @@ -418,7 +418,7 @@ static TQString detectNameFilter( KURL & url ) // Look for wildcard selection TQString nameFilter; TQString path = url.path(); - int lastSlash = path.findRev( '/' ); + int lastSlash = path.tqfindRev( '/' ); if ( lastSlash > -1 ) { if ( !url.query().isEmpty() && lastSlash == (int)path.length()-1 ) { // In /tmp/?foo, foo isn't a query @@ -426,7 +426,7 @@ static TQString detectNameFilter( KURL & url ) url.setQuery( TQString::null ); } const TQString fileName = path.mid( lastSlash + 1 ); - if ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 ) + if ( fileName.tqfind( '*' ) != -1 || fileName.tqfind( '[' ) != -1 || fileName.tqfind( '?' ) != -1 ) { // Check that a file or dir with all the special chars in the filename doesn't exist if ( url.isLocalFile() ? !TQFile::exists( path ) : !KIO::NetAccess::exists( url, false, 0 ) ) @@ -489,7 +489,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, if (url.url().startsWith("$(")) { // check for environment variables and make necessary translations TQString aValue = url.url(); - int nDollarPos = aValue.find( '$' ); + int nDollarPos = aValue.tqfind( '$' ); while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(aValue.length())) { // there is at least one $ @@ -511,7 +511,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, } pclose(fs); } - aValue.replace( nDollarPos, nEndPos-nDollarPos, result ); + aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, result ); } else if( (aValue)[nDollarPos+1] != '$' ) { uint nEndPos = nDollarPos+1; // the next character is no $ @@ -537,7 +537,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, // !!! Sergey A. Sukiyazov <corwin@micom.don.ru> !!! // A environment variables may contain values in 8bit // locale cpecified encoding or in UTF8 encoding. - aValue.replace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) ); + aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) ); } else aValue.remove( nDollarPos, nEndPos-nDollarPos ); } else { @@ -545,7 +545,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, aValue.remove( nDollarPos, 1 ); nDollarPos++; } - nDollarPos = aValue.find( '$', nDollarPos ); + nDollarPos = aValue.tqfind( '$', nDollarPos ); } url = KURL(aValue); } @@ -961,15 +961,15 @@ void KonqMainWindow::slotOpenURLRequest( const KURL &url, const KParts::URLArgs { kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl; - KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); + KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( TQT_TQOBJECT_CONST(sender())->parent() ); TQString frameName = args.frameName; if ( !frameName.isEmpty() ) { - static TQString _top = TQString::fromLatin1( "_top" ); - static TQString _self = TQString::fromLatin1( "_self" ); - static TQString _parent = TQString::fromLatin1( "_parent" ); - static TQString _blank = TQString::fromLatin1( "_blank" ); + static TQString _top = TQString::tqfromLatin1( "_top" ); + static TQString _self = TQString::tqfromLatin1( "_self" ); + static TQString _parent = TQString::tqfromLatin1( "_parent" ); + static TQString _blank = TQString::tqfromLatin1( "_blank" ); if ( frameName.lower() == _blank ) { @@ -1042,11 +1042,11 @@ void KonqMainWindow::openURL( KonqView *childView, const KURL &url, const KParts TQObject *KonqMainWindow::lastFrame( KonqView *view ) { TQObject *nextFrame, *viewFrame; - nextFrame = view->frame(); + nextFrame = TQT_TQOBJECT(view->frame()); viewFrame = 0; while ( nextFrame != 0 && ! nextFrame->inherits( "QWidgetStack" ) ) { viewFrame = nextFrame; - nextFrame = nextFrame->parent(); + nextFrame = nextFrame->tqparent(); } return nextFrame ? viewFrame : 0L; } @@ -1145,7 +1145,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs req.newTabInFront = KonqSettings::newTabsInFront(); req.openAfterCurrentPage = KonqSettings::openAfterCurrentPage(); - if (KApplication::keyboardMouseState() & Qt::ShiftButton) + if (KApplication::keyboardMouseState() & TQt::ShiftButton) req.newTabInFront = !req.newTabInFront; req.args = args; openURL( 0L, url, TQString::null, req ); @@ -1171,9 +1171,9 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs { KParts::BrowserHostExtension *hostExtension = 0; KParts::ReadOnlyPart *ro_part = 0L; - KParts::BrowserExtension *be = ::qt_cast<KParts::BrowserExtension *>(sender()); + KParts::BrowserExtension *be = ::tqqt_cast<KParts::BrowserExtension *>(sender()); if (be) - ro_part = ::qt_cast<KParts::ReadOnlyPart *>(be->parent()); + ro_part = ::tqqt_cast<KParts::ReadOnlyPart *>(be->parent()); if ( findChildView( ro_part, args.frameName, &mainWindow, &hostExtension, &part ) ) { // Found a view. If url isn't empty, we should open it - but this never happens currently @@ -1234,7 +1234,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs mainWindow->viewManager()->setActivePart( part, true ); } - TQString profileName = TQString::fromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" ); + TQString profileName = TQString::tqfromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" ); KSimpleConfig cfg( locate( "data", profileName ), true ); cfg.setGroup( "Profile" ); @@ -1284,7 +1284,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs if ( !windowArgs.resizable ) // ### this doesn't seem to work :-( - mainWindow->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mainWindow->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); // Trying to show the window initially behind the current window is a bit tricky, // as this involves the window manager, which may see things differently. @@ -1337,12 +1337,12 @@ void KonqMainWindow::slotNewWindow() if ( profile.isEmpty() ) { if ( m_currentView && m_currentView->url().protocol().startsWith( "http" ) ) - profile = TQString::fromLatin1("webbrowsing"); + profile = TQString::tqfromLatin1("webbrowsing"); else - profile = TQString::fromLatin1("filemanagement"); + profile = TQString::tqfromLatin1("filemanagement"); } KonqMisc::createBrowserWindowFromProfile( - locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ), + locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ), profile ); } @@ -1491,7 +1491,7 @@ void KonqMainWindow::slotOpenLocation() void KonqMainWindow::slotToolFind() { - kdDebug(1202) << "KonqMainWindow::slotToolFind sender:" << sender()->className() << endl; + kdDebug(1202) << "KonqMainWindow::slotToolFind sender:" << TQT_TQOBJECT_CONST(sender())->className() << endl; if ( m_currentView && m_currentView->part()->inherits("KonqDirPart") ) { @@ -1521,7 +1521,7 @@ void KonqMainWindow::slotToolFind() connect( dirPart, TQT_SIGNAL( findClosed(KonqDirPart *) ), this, TQT_SLOT( slotFindClosed(KonqDirPart *) ) ); } - else if ( sender()->inherits( "KAction" ) ) // don't go there if called by the singleShot below + else if ( TQT_TQOBJECT_CONST(sender())->inherits( "KAction" ) ) // don't go there if called by the singleShot below { KURL url; if ( m_currentView && m_currentView->url().isLocalFile() ) @@ -1529,7 +1529,7 @@ void KonqMainWindow::slotToolFind() else url.setPath( TQDir::homeDirPath() ); KonqMainWindow * mw = KonqMisc::createBrowserWindowFromProfile( - locate( "data", TQString::fromLatin1("konqueror/profiles/filemanagement") ), + locate( "data", TQString::tqfromLatin1("konqueror/profiles/filemanagement") ), "filemanagement", url, KParts::URLArgs(), true /* forbid "use html"*/ ); mw->m_paFindFiles->setChecked(true); // Delay it after the openURL call (hacky!) @@ -1549,7 +1549,7 @@ void KonqMainWindow::slotFindOpen( KonqDirPart * dirPart ) void KonqMainWindow::slotFindClosed( KonqDirPart * dirPart ) { kdDebug(1202) << "KonqMainWindow::slotFindClosed " << dirPart << endl; - KonqView * dirView = m_mapViews.find( dirPart ).data(); + KonqView * dirView = m_mapViews.tqfind( dirPart ).data(); Q_ASSERT(dirView); kdDebug(1202) << "dirView=" << dirView << endl; if ( dirView && dirView == m_currentView ) @@ -1570,7 +1570,7 @@ void KonqMainWindow::slotOpenWith() KURL::List lst; lst.append( m_currentView->url() ); - TQString serviceName = sender()->name(); + TQString serviceName = TQT_TQOBJECT_CONST(sender())->name(); KTrader::OfferList offers = m_currentView->appServiceOffers(); KTrader::OfferList::ConstIterator it = offers.begin(); @@ -1588,7 +1588,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle ) if ( !toggle ) return; - TQString modeName = sender()->name(); + TQString modeName = TQT_TQOBJECT_CONST(sender())->name(); if ( m_currentView->service()->desktopEntryName() == modeName ) return; @@ -1653,7 +1653,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle ) // current viewmode TQPtrListIterator<KAction> it( m_toolBarViewModeActions ); for (; it.current(); ++it ) - if ( TQString::fromLatin1( it.current()->name() ) == oldService->desktopEntryName() ) + if ( TQString::tqfromLatin1( it.current()->name() ) == oldService->desktopEntryName() ) { assert( it.current()->inherits( "KonqViewModeAction" ) ); @@ -1816,7 +1816,7 @@ void KonqMainWindow::slotReload( KonqView* reloadView ) if ( !reloadView || reloadView->url().isEmpty() ) return; - if ( reloadView->part() && (reloadView->part()->metaObject()->findProperty("modified") != -1) ) { + if ( reloadView->part() && (reloadView->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { TQVariant prop = reloadView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -1870,7 +1870,7 @@ void KonqMainWindow::slotReloadPopup() slotReload( m_pWorkingTab->activeChildView() ); } -void KonqMainWindow::slotHome(KAction::ActivationReason, Qt::ButtonState state) +void KonqMainWindow::slotHome(KAction::ActivationReason, TQt::ButtonState state) { TQString homeURL = m_pViewManager->profileHomeURL(); @@ -1881,10 +1881,10 @@ void KonqMainWindow::slotHome(KAction::ActivationReason, Qt::ButtonState state) req.newTab = true; req.newTabInFront = KonqSettings::newTabsInFront(); - if (state & Qt::ShiftButton) + if (state & TQt::ShiftButton) req.newTabInFront = !req.newTabInFront; - if( state & Qt::ControlButton ) // Ctrl Left/MMB + if( state & TQt::ControlButton ) // Ctrl Left/MMB openFilteredURL( homeURL, req); else if( state & Qt::MidButton ) { @@ -2033,7 +2033,7 @@ void KonqMainWindow::slotConfigureToolbars() void KonqMainWindow::slotNewToolbarConfig() // This is called when OK or Apply is clicked { if ( m_toggleViewGUIClient ) - plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); + plugActionList( TQString::tqfromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); if ( m_currentView && m_currentView->appServiceOffers().count() > 0 ) plugActionList( "openwith", m_openWithActions ); @@ -2049,7 +2049,7 @@ void KonqMainWindow::slotUndoAvailable( bool avail ) if ( avail && m_currentView && m_currentView->part() ) { // Avoid qWarning from TQObject::property if it doesn't exist - if ( m_currentView->part()->metaObject()->findProperty( "supportsUndo" ) != -1 ) + if ( m_currentView->part()->tqmetaObject()->tqfindProperty( "supportsUndo" ) != -1 ) { TQVariant prop = m_currentView->part()->property( "supportsUndo" ); if ( prop.isValid() && prop.toBool() ) @@ -2184,7 +2184,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part ) if ( part ) { - newView = m_mapViews.find( static_cast<KParts::ReadOnlyPart *>( part ) ).data(); + newView = m_mapViews.tqfind( static_cast<KParts::ReadOnlyPart *>( part ) ).data(); if ( newView->isPassiveMode() ) { @@ -2243,7 +2243,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part ) for ( ; it != itEnd ; ++it ) { - KAction * act = actionCollection()->action( it.key() ); + KAction * act = actionCollection()->action( static_cast<const char *>(it.key()) ); Q_ASSERT(act); if (act) act->setEnabled( false ); @@ -2415,7 +2415,7 @@ void KonqMainWindow::viewsChanged() KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *view ) { - MapViews::ConstIterator it = m_mapViews.find( view ); + MapViews::ConstIterator it = m_mapViews.tqfind( view ); if ( it != m_mapViews.end() ) return it.data(); else @@ -2666,7 +2666,7 @@ void KonqMainWindow::slotDuplicateTabPopup() void KonqMainWindow::slotBreakOffTab() { if (m_currentView && m_currentView->part() && - (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { + (m_currentView->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -2683,7 +2683,7 @@ void KonqMainWindow::slotBreakOffTabPopup() { KonqView* originalView = m_currentView; KonqView *view = m_pWorkingTab->activeChildView(); - if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -2732,7 +2732,7 @@ void KonqMainWindow::slotPopupNewTab() bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage(); bool newTabsInFront = KonqSettings::newTabsInFront(); - if (KApplication::keyboardMouseState() & Qt::ShiftButton) + if (KApplication::keyboardMouseState() & TQt::ShiftButton) newTabsInFront = !newTabsInFront; popupNewTab(newTabsInFront, openAfterCurrentPage); @@ -2788,7 +2788,7 @@ void KonqMainWindow::openMultiURL( KURL::List url ) void KonqMainWindow::slotRemoveView() { if (m_currentView && m_currentView->part() && - (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { + (m_currentView->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -2804,7 +2804,7 @@ void KonqMainWindow::slotRemoveView() void KonqMainWindow::slotRemoveTab() { if (m_currentView && m_currentView->part() && - (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { + (m_currentView->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -2820,7 +2820,7 @@ void KonqMainWindow::slotRemoveTabPopup() { KonqView *originalView = m_currentView; KonqView *view = m_pWorkingTab->activeChildView(); - if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -2857,7 +2857,7 @@ void KonqMainWindow::slotRemoveOtherTabsPopup() MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) { KonqView *view = it.data(); - if ( view != originalView && view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { + if ( view != originalView && view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -2890,7 +2890,7 @@ void KonqMainWindow::slotReloadAllTabs() MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) { KonqView *view = it.data(); - if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -2923,7 +2923,7 @@ void KonqMainWindow::slotActivatePrevTab() void KonqMainWindow::slotActivateTab() { - m_pViewManager->activateTab( TQString( sender()->name() ).right( 2 ).toInt() -1 ); + m_pViewManager->activateTab( TQString( TQT_TQOBJECT_CONST(sender())->name() ).right( 2 ).toInt() -1 ); } void KonqMainWindow::slotDumpDebugInfo() @@ -3103,7 +3103,7 @@ void KonqMainWindow::slotUpAboutToShow() } } -void KonqMainWindow::slotUp(KAction::ActivationReason, Qt::ButtonState state) +void KonqMainWindow::slotUp(KAction::ActivationReason, TQt::ButtonState state) { m_goState = state; TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) ); @@ -3123,11 +3123,11 @@ void KonqMainWindow::slotUpDelayed() req.openAfterCurrentPage = KonqSettings::openAfterCurrentPage(); req.newTabInFront = KonqSettings::newTabsInFront(); - if (m_goState & Qt::ShiftButton) + if (m_goState & TQt::ShiftButton) req.newTabInFront = !req.newTabInFront; const TQString& url = m_currentView->upURL().url(); - if(m_goState & Qt::ControlButton) + if(m_goState & TQt::ControlButton) openFilteredURL(url, req ); else if(m_goState & Qt::MidButton) { @@ -3162,7 +3162,7 @@ void KonqMainWindow::slotGoHistoryActivated( int steps ) slotGoHistoryActivated( steps, Qt::LeftButton ); } -void KonqMainWindow::slotGoHistoryActivated( int steps, Qt::ButtonState state ) +void KonqMainWindow::slotGoHistoryActivated( int steps, TQt::ButtonState state ) { kdDebug() <<"slotGoHistoryActivated( "<<steps<<", "<<state<<" )"<<endl; if (!m_goBuffer) @@ -3181,10 +3181,10 @@ void KonqMainWindow::slotGoHistoryDelayed() bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage(); bool mmbOpensTab = KonqSettings::mmbOpensTab(); bool inFront = KonqSettings::newTabsInFront(); - if(m_goState & Qt::ShiftButton) + if(m_goState & TQt::ShiftButton) inFront = !inFront; - if(m_goState & Qt::ControlButton) + if(m_goState & TQt::ControlButton) { KonqView * newView = m_pViewManager->addTabFromHistory( m_goBuffer, openAfterCurrentPage ); if (newView && inFront) @@ -3224,7 +3224,7 @@ void KonqMainWindow::slotBack() slotGoHistoryActivated(-1); } -void KonqMainWindow::slotBack(KAction::ActivationReason, Qt::ButtonState state) +void KonqMainWindow::slotBack(KAction::ActivationReason, TQt::ButtonState state) { slotGoHistoryActivated( -1, state ); } @@ -3246,7 +3246,7 @@ void KonqMainWindow::slotForward() slotGoHistoryActivated( 1 ); } -void KonqMainWindow::slotForward(KAction::ActivationReason, Qt::ButtonState state) +void KonqMainWindow::slotForward(KAction::ActivationReason, TQt::ButtonState state) { slotGoHistoryActivated( 1, state ); } @@ -3293,7 +3293,7 @@ void KonqMainWindow::initCombo() if ( !bookmarkCompletionInitialized ) { bookmarkCompletionInitialized = true; - DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, m_combo->lineEdit() ); + DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, TQT_TQOBJECT(m_combo->lineEdit()) ); connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT( bookmarksIntoCompletion() ) ); } } @@ -3440,11 +3440,11 @@ void KonqMainWindow::slotClearComboHistory() bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) { if ( ( ev->type()==TQEvent::FocusIn || ev->type()==TQEvent::FocusOut ) && - m_combo && m_combo->lineEdit() == obj ) + m_combo && TQT_BASE_OBJECT(m_combo->lineEdit()) == TQT_BASE_OBJECT(obj) ) { //kdDebug(1202) << "KonqMainWindow::eventFilter " << obj << " " << obj->className() << " " << obj->name() << endl; - TQFocusEvent * focusEv = static_cast<TQFocusEvent*>(ev); + TQFocusEvent * focusEv = TQT_TQFOCUSEVENT(ev); if (focusEv->reason() == TQFocusEvent::Popup) { return KParts::MainWindow::eventFilter( obj, ev ); @@ -3455,7 +3455,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) ext = m_currentView->browserExtension(); TQStrList slotNames; if (ext) - slotNames = ext->metaObject()->slotNames(); + slotNames = ext->tqmetaObject()->slotNames(); //for ( char * s = slotNames.first() ; s ; s = slotNames.next() ) //{ @@ -3481,16 +3481,16 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) ) duplicate->setEnabled( false ); - if (slotNames.contains("cut()")) + if (slotNames.tqcontains("cut()")) disconnect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) ); - if (slotNames.contains("copy()")) + if (slotNames.tqcontains("copy()")) disconnect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) ); - if (slotNames.contains("paste()")) + if (slotNames.tqcontains("paste()")) disconnect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); - if (slotNames.contains("del()")) + if (slotNames.tqcontains("del()")) disconnect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); - disconnect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) ); + disconnect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), + this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) ); connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); @@ -3522,16 +3522,16 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) ) duplicate->setEnabled( actionCollection()->action("new_window")->isEnabled() ); - if (slotNames.contains("cut()")) + if (slotNames.tqcontains("cut()")) connect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) ); - if (slotNames.contains("copy()")) + if (slotNames.tqcontains("copy()")) connect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) ); - if (slotNames.contains("paste()")) + if (slotNames.tqcontains("paste()")) connect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); - if (slotNames.contains("del()")) + if (slotNames.tqcontains("del()")) connect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); - connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) ); + connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), + this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) ); disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); @@ -3564,7 +3564,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) void KonqMainWindow::slotClipboardDataChanged() { //kdDebug(1202) << "KonqMainWindow::slotClipboardDataChanged()" << endl; - TQMimeSource *data = TQApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::tqclipboard()->data(); m_paPaste->setEnabled( data->provides( "text/plain" ) ); slotCheckComboSelection(); } @@ -3577,7 +3577,7 @@ void KonqMainWindow::slotCheckComboSelection() m_paCut->setEnabled( hasSelection ); } -void KonqMainWindow::slotClearLocationBar( KAction::ActivationReason, Qt::ButtonState state ) +void KonqMainWindow::slotClearLocationBar( KAction::ActivationReason, TQt::ButtonState state ) { kdDebug(1202) << "slotClearLocationBar" << endl; slotStop(); @@ -3798,72 +3798,72 @@ void KonqMainWindow::initActions() (void) new KAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" ); (void) new KAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" ); - (void) new KAction( i18n( "New &Window" ), "window_new", KStdAccel::shortcut(KStdAccel::New), this, TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); - (void) new KAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); - (void) new KAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" ); - (void) new KAction( i18n( "S&end File..." ), "mail_generic", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" ); + (void) new KAction( i18n( "New &Window" ), "window_new", KStdAccel::shortcut(KStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); + (void) new KAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); + (void) new KAction( i18n( "Send &Link Address..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" ); + (void) new KAction( i18n( "S&end File..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" ); if (kapp->authorize("shell_access")) { - (void) new KAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); + (void) new KAction( i18n( "Open &Terminal" ), "openterm", Key_F4, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); } - (void) new KAction( i18n( "&Open Location..." ), "fileopen", KStdAccel::shortcut(KStdAccel::Open), this, TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); + (void) new KAction( i18n( "&Open Location..." ), "fileopen", KStdAccel::shortcut(KStdAccel::Open), TQT_TQOBJECT(this), TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); - m_paFindFiles = new KToggleAction( i18n( "&Find File..." ), "filefind", KStdAccel::shortcut(KStdAccel::Find), this, TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" ); + m_paFindFiles = new KToggleAction( i18n( "&Find File..." ), "filefind", KStdAccel::shortcut(KStdAccel::Find), TQT_TQOBJECT(this), TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" ); m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" ); - (void) KStdAction::quit( this, TQT_SLOT( close() ), actionCollection(), "quit" ); + (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit" ); - m_ptaUseHTML = new KToggleAction( i18n( "&Use index.html" ), 0, this, TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" ); - m_paLockView = new KToggleAction( i18n( "Lock to Current Location"), 0, this, TQT_SLOT( slotLockView() ), actionCollection(), "lock" ); - m_paLinkView = new KToggleAction( i18n( "Lin&k View"), 0, this, TQT_SLOT( slotLinkView() ), actionCollection(), "link" ); + m_ptaUseHTML = new KToggleAction( i18n( "&Use index.html" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" ); + m_paLockView = new KToggleAction( i18n( "Lock to Current Location"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLockView() ), actionCollection(), "lock" ); + m_paLinkView = new KToggleAction( i18n( "Lin&k View"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLinkView() ), actionCollection(), "link" ); // Go menu m_paUp = new KToolBarPopupAction( i18n( "&Up" ), "up", KStdAccel::shortcut(KStdAccel::Up), actionCollection(), "up" ); - connect( m_paUp, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this, - TQT_SLOT( slotUp(KAction::ActivationReason, Qt::ButtonState) ) ); - connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUpAboutToShow() ) ); - connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUpActivated( int ) ) ); + connect( m_paUp, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), + TQT_SLOT( slotUp(KAction::ActivationReason, TQt::ButtonState) ) ); + connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpAboutToShow() ) ); + connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotUpActivated( int ) ) ); - QPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); + TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); m_paBack = new KToolBarPopupAction( backForward.first, KStdAccel::shortcut(KStdAccel::Back), 0, "", actionCollection(), "back" ); - connect( m_paBack, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this, - TQT_SLOT( slotBack(KAction::ActivationReason, Qt::ButtonState) ) ); - connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotBackAboutToShow() ) ); - connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotBackActivated( int ) ) ); + connect( m_paBack, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), + TQT_SLOT( slotBack(KAction::ActivationReason, TQt::ButtonState) ) ); + connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotBackAboutToShow() ) ); + connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotBackActivated( int ) ) ); m_paForward = new KToolBarPopupAction( backForward.second, KStdAccel::shortcut(KStdAccel::Forward), 0, "", actionCollection(), "forward" ); - connect( m_paForward, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this, - TQT_SLOT( slotForward(KAction::ActivationReason, Qt::ButtonState) ) ); - connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotForwardAboutToShow() ) ); - connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotForwardActivated( int ) ) ); + connect( m_paForward, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), + TQT_SLOT( slotForward(KAction::ActivationReason, TQt::ButtonState) ) ); + connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardAboutToShow() ) ); + connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardActivated( int ) ) ); m_paHistory = new KonqBidiHistoryAction( i18n("History"), actionCollection(), "history" ); - connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), this, TQT_SLOT( slotGoMenuAboutToShow() ) ); - connect( m_paHistory, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotGoHistoryActivated( int ) ) ); + connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotGoMenuAboutToShow() ) ); + connect( m_paHistory, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotGoHistoryActivated( int ) ) ); m_paHome = new KAction( i18n( "Home" ), "gohome", KStdAccel::shortcut(KStdAccel::Home), actionCollection(), "home" ); - connect( m_paHome, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this, - TQT_SLOT( slotHome(KAction::ActivationReason, Qt::ButtonState) ) ); - - (void) new KAction( i18n( "S&ystem" ), "system", 0, this, TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" ); - (void) new KAction( i18n( "App&lications" ), "kmenu", 0, this, TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" ); - (void) new KAction( i18n( "&Storage Media" ), "system", 0, this, TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" ); - (void) new KAction( i18n( "&Network Folders" ), "network", 0, this, TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" ); - (void) new KAction( i18n( "Sett&ings" ), "kcontrol", 0, this, TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" ); + connect( m_paHome, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), + TQT_SLOT( slotHome(KAction::ActivationReason, TQt::ButtonState) ) ); + + (void) new KAction( i18n( "S&ystem" ), "system", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" ); + (void) new KAction( i18n( "App&lications" ), "kmenu", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" ); + (void) new KAction( i18n( "&Storage Media" ), "system", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" ); + (void) new KAction( i18n( "&Network Folders" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" ); + (void) new KAction( i18n( "Sett&ings" ), "kcontrol", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" ); //(void) new KAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" ); - (void) new KAction( i18n( "Trash" ), "trashcan_full", 0, this, TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" ); - (void) new KAction( i18n( "Autostart" ), 0, this, TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" ); + (void) new KAction( i18n( "Trash" ), "trashcan_full", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" ); + (void) new KAction( i18n( "Autostart" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" ); KonqMostOftenURLSAction *mostOften = new KonqMostOftenURLSAction( i18n("Most Often Visited"), actionCollection(), "go_most_often" ); connect( mostOften, TQT_SIGNAL( activated( const KURL& )), TQT_SLOT( slotOpenURL( const KURL& ))); - (void) new KAction( i18n( "History" ), "history", 0, this, TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" ); + (void) new KAction( i18n( "History" ), "history", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" ); // Settings menu - m_paSaveViewProfile = new KAction( i18n( "&Save View Profile..." ), 0, this, TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" ); - m_paSaveViewPropertiesLocally = new KToggleAction( i18n( "Save View Changes per &Folder" ), 0, this, TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" ); + m_paSaveViewProfile = new KAction( i18n( "&Save View Profile..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" ); + m_paSaveViewPropertiesLocally = new KToggleAction( i18n( "Save View Changes per &Folder" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" ); // "Remove" ? "Reset" ? The former is more correct, the latter is more kcontrol-like... - m_paRemoveLocalProperties = new KAction( i18n( "Remove Folder Properties" ), 0, this, TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); + m_paRemoveLocalProperties = new KAction( i18n( "Remove Folder Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); m_configureModules << "kde-filebehavior.desktop" << "kde-fileappearance.desktop" << @@ -3878,38 +3878,38 @@ void KonqMainWindow::initActions() if (!kapp->authorizeControlModules(configModules()).isEmpty()) - KStdAction::preferences (this, TQT_SLOT (slotConfigure()), actionCollection() ); + KStdAction::preferences (TQT_TQOBJECT(this), TQT_SLOT (slotConfigure()), actionCollection() ); KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); - KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); - m_paConfigureExtensions = new KAction( i18n("Configure Extensions..."), 0, this, TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions"); - m_paConfigureSpellChecking = new KAction( i18n("Configure Spell Checking..."), "spellcheck", 0,this, TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); + m_paConfigureExtensions = new KAction( i18n("Configure Extensions..."), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions"); + m_paConfigureSpellChecking = new KAction( i18n("Configure Spell Checking..."), "spellcheck", 0,TQT_TQOBJECT(this), TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); // Window menu - m_paSplitViewHor = new KAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, this, TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" ); - m_paSplitViewVer = new KAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, this, TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" ); - m_paAddTab = new KAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" ); - m_paDuplicateTab = new KAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, this, TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" ); - m_paBreakOffTab = new KAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, this, TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" ); - m_paRemoveView = new KAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, this, TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" ); - m_paRemoveTab = new KAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, this, TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" ); - m_paRemoveOtherTabs = new KAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, this, TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" ); - - m_paActivateNextTab = new KAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(), this, TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" ); - m_paActivatePrevTab = new KAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(), this, TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" ); + m_paSplitViewHor = new KAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" ); + m_paSplitViewVer = new KAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" ); + m_paAddTab = new KAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" ); + m_paDuplicateTab = new KAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" ); + m_paBreakOffTab = new KAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(this), TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" ); + m_paRemoveView = new KAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" ); + m_paRemoveTab = new KAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" ); + m_paRemoveOtherTabs = new KAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" ); + + m_paActivateNextTab = new KAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(), TQT_TQOBJECT(this), TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" ); + m_paActivatePrevTab = new KAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(), TQT_TQOBJECT(this), TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" ); TQCString actionname; for (int i=1;i<13;i++) { actionname.sprintf("activate_tab_%02d", i); - new KAction(i18n("Activate Tab %1").arg(i), 0, this, TQT_SLOT(slotActivateTab()), actionCollection(), actionname); + new KAction(i18n("Activate Tab %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotActivateTab()), actionCollection(), actionname); } - m_paMoveTabLeft = new KAction( i18n("Move Tab Left"), 0 , CTRL+SHIFT+Key_Left,this, TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); - m_paMoveTabRight = new KAction( i18n("Move Tab Right"), 0 , CTRL+SHIFT+Key_Right,this, TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); + m_paMoveTabLeft = new KAction( i18n("Move Tab Left"), 0 , CTRL+SHIFT+Key_Left,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); + m_paMoveTabRight = new KAction( i18n("Move Tab Right"), 0 , CTRL+SHIFT+Key_Right,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); #ifndef NDEBUG - (void) new KAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, this, TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" ); + (void) new KAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" ); #endif m_paSaveRemoveViewProfile = new KAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQT_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" ); @@ -3921,14 +3921,14 @@ void KonqMainWindow::initActions() KShortcut fullScreenShortcut = m_ptaFullScreen->shortcut(); fullScreenShortcut.append( KKey( Key_F11 ) ); m_ptaFullScreen->setShortcut( fullScreenShortcut ); - connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); + connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen( bool ))); KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload); reloadShortcut.append(KKey(CTRL + Key_R)); - m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReload() ), actionCollection(), "reload" ); - m_paReloadAllTabs = new KAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" ); + m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" ); + m_paReloadAllTabs = new KAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" ); - m_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); + m_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" ); //m_paUndo->setEnabled( KonqUndoManager::self()->undoAvailable() ); @@ -3943,20 +3943,20 @@ void KonqMainWindow::initActions() m_paCopy = KStdAction::copy( 0, 0, actionCollection(), "copy" ); m_paPaste = KStdAction::paste( 0, 0, actionCollection(), "paste" ); - m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" ); + m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotStop() ), actionCollection(), "stop" ); m_paRename = new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, actionCollection(), "rename" ); m_paTrash = new KAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" ); - connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) ); + connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), + TQT_TQOBJECT(this), TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) ); m_paDelete = new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, actionCollection(), "del" ); - m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" ); + m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" ); // Location bar m_locationLabel = new KonqDraggableLabel( this, i18n("L&ocation: ") ); - (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, this, TQT_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" ); + (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, TQT_TQOBJECT(this), TQT_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" ); m_locationLabel->setBuddy( m_combo ); KWidgetAction* comboAction = new KWidgetAction( m_combo, i18n( "Location Bar" ), 0, @@ -3970,8 +3970,8 @@ void KonqMainWindow::initActions() KAction *clearLocation = new KAction( i18n( "Clear Location Bar" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", CTRL+Key_L, actionCollection(), "clear_location" ); - connect( clearLocation, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), - TQT_SLOT( slotClearLocationBar( KAction::ActivationReason, Qt::ButtonState ) ) ); + connect( clearLocation, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), + TQT_SLOT( slotClearLocationBar( KAction::ActivationReason, TQt::ButtonState ) ) ); clearLocation->setWhatsThis( i18n( "Clear Location bar<p>" "Clears the content of the location bar." ) ); @@ -3990,18 +3990,18 @@ void KonqMainWindow::initActions() TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); connect( m_pBookmarkMenu, - TQT_SIGNAL( openBookmark(const TQString &, Qt::ButtonState) ), - this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, Qt::ButtonState) )); + TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), + this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); KAction *addBookmark = actionCollection()->action("add_bookmark"); if (addBookmark) addBookmark->setText(i18n("Bookmark This Location")); - m_paShowMenuBar = KStdAction::showMenubar( this, TQT_SLOT( slotShowMenuBar() ), actionCollection() ); + m_paShowMenuBar = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenuBar() ), actionCollection() ); - (void) new KAction( i18n( "Kon&queror Introduction" ), 0, this, TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" ); + (void) new KAction( i18n( "Kon&queror Introduction" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" ); - KAction *goUrl = new KAction( i18n( "Go" ), "key_enter", 0, this, TQT_SLOT( goURL() ), actionCollection(), "go_url" ); + KAction *goUrl = new KAction( i18n( "Go" ), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT( goURL() ), actionCollection(), "go_url" ); goUrl->setWhatsThis( i18n( "Go<p>" "Goes to the page that has been entered into the location bar." ) ); @@ -4104,7 +4104,7 @@ void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, TQPopupMenu * pm } } -void KonqMainWindow::slotOpenBookmarkURL( const TQString & url, Qt::ButtonState state) +void KonqMainWindow::slotOpenBookmarkURL( const TQString & url, TQt::ButtonState state) { kdDebug(1202) << "KonqMainWindow::slotOpenBookmarkURL(" << url << ", " << state << ")" << endl; @@ -4112,10 +4112,10 @@ void KonqMainWindow::slotOpenBookmarkURL( const TQString & url, Qt::ButtonState req.newTab = true; req.newTabInFront = KonqSettings::newTabsInFront(); - if (state & Qt::ShiftButton) + if (state & TQt::ShiftButton) req.newTabInFront = !req.newTabInFront; - if( state & Qt::ControlButton ) // Ctrl Left/MMB + if( state & TQt::ControlButton ) // Ctrl Left/MMB openFilteredURL( url, req); else if( state & Qt::MidButton ) { @@ -4168,9 +4168,9 @@ void KonqMainWindow::updateToolBarActions( bool pendingAction /*=false*/) if ( m_currentView && m_currentView->url().isLocalFile() && !m_currentView->isLockedViewMode() ) { - if ( m_currentView->serviceTypes().contains( "inode/directory" ) ) + if ( m_currentView->serviceTypes().tqcontains( "inode/directory" ) ) m_ptaUseHTML->setEnabled( true ); - else if ( m_currentView->serviceTypes().contains( "text/html" ) ) { + else if ( m_currentView->serviceTypes().tqcontains( "text/html" ) ) { // Currently viewing an index.html file via this feature (i.e. url points to a dir) TQString locPath = KURL( m_currentView->locationBarURL() ).path(); m_ptaUseHTML->setEnabled( TQFileInfo( locPath ).isDir() ); @@ -4269,12 +4269,12 @@ void KonqMainWindow::updateViewActions() { // F5 is the default key binding for Reload.... a la Windows. // mc users want F5 for Copy and F6 for move, but I can't make that default. - m_paCopyFiles = new KAction( i18n("Copy &Files..."), Key_F7, this, TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); - m_paMoveFiles = new KAction( i18n("M&ove Files..."), Key_F8, this, TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" ); + m_paCopyFiles = new KAction( i18n("Copy &Files..."), Key_F7, TQT_TQOBJECT(this), TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); + m_paMoveFiles = new KAction( i18n("M&ove Files..."), Key_F8, TQT_TQOBJECT(this), TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" ); // This action doesn't appear in the GUI, it's for the shortcut only. // KNewMenu takes care of the GUI stuff. - m_paNewDir = new KAction( i18n("Create Folder..." ), Key_F10, this, TQT_SLOT( slotNewDir() ), + m_paNewDir = new KAction( i18n("Create Folder..." ), Key_F10, TQT_TQOBJECT(this), TQT_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" ); TQPtrList<KAction> lst; @@ -4328,16 +4328,16 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext ) KParts::BrowserExtension::ActionSlotMap::ConstIterator it = actionSlotMap->begin(); KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end(); - TQStrList slotNames = ext->metaObject()->slotNames(); + TQStrList slotNames = ext->tqmetaObject()->slotNames(); for ( ; it != itEnd ; ++it ) { - KAction * act = actionCollection()->action( it.key() ); + KAction * act = actionCollection()->action( static_cast<const char *>(it.key()) ); //kdDebug(1202) << it.key() << endl; if ( act ) { // Does the extension have a slot with the name of this action ? - if ( slotNames.contains( it.key()+"()" ) ) + if ( slotNames.tqcontains( it.key()+"()" ) ) { if ( it.key() != "trash" ) connect( act, TQT_SIGNAL( activated() ), ext, it.data() /* TQT_SLOT(slot name) */ ); @@ -4362,13 +4362,13 @@ void KonqMainWindow::disconnectExtension( KParts::BrowserExtension *ext ) KParts::BrowserExtension::ActionSlotMap::ConstIterator it = actionSlotMap->begin(); KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end(); - TQStrList slotNames = ext->metaObject()->slotNames(); + TQStrList slotNames = ext->tqmetaObject()->slotNames(); for ( ; it != itEnd ; ++it ) { - KAction * act = actionCollection()->action( it.key() ); + KAction * act = actionCollection()->action( static_cast<const char *>(it.key()) ); //kdDebug(1202) << it.key() << endl; - if ( act && slotNames.contains( it.key()+"()" ) ) + if ( act && slotNames.tqcontains( it.key()+"()" ) ) { //kdDebug(1202) << "disconnectExtension: " << act << " " << act->name() << endl; act->disconnect( ext ); @@ -4376,11 +4376,11 @@ void KonqMainWindow::disconnectExtension( KParts::BrowserExtension *ext ) } } -void KonqMainWindow::slotTrashActivated( KAction::ActivationReason reason, Qt::ButtonState state ) +void KonqMainWindow::slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state ) { if ( !m_currentView ) return; - if ( reason == KAction::PopupMenuActivation && ( state & Qt::ShiftButton ) ) + if ( reason == KAction::PopupMenuActivation && ( state & TQt::ShiftButton ) ) m_currentView->callExtensionMethod( "del()" ); else m_currentView->callExtensionMethod( "trash()" ); @@ -4444,7 +4444,7 @@ void KonqMainWindow::enableAllActions( bool enable ) { KAction *act = *it; if ( !TQString(act->name()).startsWith("options_configure") /* do not touch the configureblah actions */ - && ( !enable || !actionSlotMap->contains( act->name() ) ) ) /* don't enable BE actions */ + && ( !enable || !actionSlotMap->tqcontains( act->name() ) ) ) /* don't enable BE actions */ act->setEnabled( enable ); } // This method is called with enable=false on startup, and @@ -4655,7 +4655,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa { KonqView * m_oldView = m_currentView; - KonqView * currentView = childView( static_cast<KParts::ReadOnlyPart *>( sender()->parent() ) ); + KonqView * currentView = childView( static_cast<KParts::ReadOnlyPart *>( TQT_TQOBJECT_CONST(sender())->parent() ) ); //kdDebug() << "KonqMainWindow::slotPopupMenu m_oldView=" << m_oldView << " new currentView=" << currentView << " passive:" << currentView->isPassiveMode() << endl; @@ -4696,7 +4696,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa popupMenuCollection.insert( m_paDelete ); // The pasteto action is used when clicking on a dir, to paste into it. - KAction *actPaste = KStdAction::paste( this, TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); + KAction *actPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); actPaste->setEnabled( m_paPaste->isEnabled() ); popupMenuCollection.insert( actPaste ); @@ -4749,7 +4749,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa //firstURL.cleanPath(); openedForViewURL = firstURL.equals( viewURL, true ); } - devicesFile = firstURL.protocol().find("device", 0, false) == 0; + devicesFile = firstURL.protocol().tqfind("device", 0, false) == 0; //dirsSelected = S_ISDIR( _items.getFirst()->mode() ); } //check if current url is trash @@ -4769,10 +4769,10 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa if( doTabHandling ) { if (_args.forcesNewWindow()) { - actNewWindow = new KAction( i18n( "Open in T&his Window" ), 0, this, TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); + actNewWindow = new KAction( i18n( "Open in T&his Window" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); actNewWindow->setToolTip( i18n( "Open the document in current window" ) ); } - actNewWindow = new KAction( i18n( "Open in New &Window" ), "window_new", 0, this, TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); + actNewWindow = new KAction( i18n( "Open in New &Window" ), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); actNewWindow->setToolTip( i18n( "Open the document in a new window" ) ); //Set tab_new_x to point to the correct icon based on NewTabsInFront @@ -4783,7 +4783,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa else tab_new_x = "tab_new_bg" ; - actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); + actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); actNewTab->setToolTip( i18n( "Open the document in a new tab" ) ); doTabHandling = true; } @@ -4823,7 +4823,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa if ( client ) pPopupMenu->factory()->addClient( client ); - KParts::BrowserExtension *be = ::qt_cast<KParts::BrowserExtension *>(sender()); + KParts::BrowserExtension *be = ::tqqt_cast<KParts::BrowserExtension *>(sender()); if ( be ) { @@ -4835,7 +4835,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa TQObject::disconnect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotFileNewAboutToShow()) ); - TQGuardedPtr<TQObject> guard(this); // #149736 + TQGuardedPtr<TQObject> guard(TQT_TQOBJECT(this)); // #149736 pPopupMenu->exec( _global ); delete pPopupMenu; @@ -4889,8 +4889,8 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa m_currentView = m_oldView; } // Special case: RMB + renaming in sidebar; setFocus would abort editing. - TQWidget* fw = focusWidget(); - if ( !fw || !::qt_cast<TQLineEdit*>( fw ) ) + TQWidget* fw = tqfocusWidget(); + if ( !fw || !::tqqt_cast<TQLineEdit*>( fw ) ) m_oldView->part()->widget()->setFocus(); } } @@ -4901,7 +4901,7 @@ void KonqMainWindow::slotItemsRemoved( const KFileItemList &items ) TQPtrListIterator<KFileItem> it( items ); for ( ; it.current(); ++it ) { - if ( popupItems.contains( it.current() ) ) + if ( popupItems.tqcontains( it.current() ) ) { emit popupItemsDisturbed(); return; @@ -4911,7 +4911,7 @@ void KonqMainWindow::slotItemsRemoved( const KFileItemList &items ) void KonqMainWindow::slotOpenEmbedded() { - TQCString name = sender()->name(); + TQCString name = TQT_TQOBJECT_CONST(sender())->name(); m_popupService = m_popupEmbeddingServices[ name.toInt() ]->desktopEntryName(); @@ -5068,7 +5068,7 @@ void KonqMainWindow::updateViewModeActions() // make sure to also clear our [libiconview,liblistview]->service-for-viewmode // map if ( m_viewModeToolBarServices.count() > 0 && - !m_viewModeToolBarServices.begin().data()->serviceTypes().contains( m_currentView->serviceType() ) ) + !m_viewModeToolBarServices.begin().data()->serviceTypes().tqcontains( m_currentView->serviceType() ) ) { // Save the current map to the config file, for later reuse saveToolBarServicesMap(); @@ -5081,7 +5081,7 @@ void KonqMainWindow::updateViewModeActions() if ( services.count() <= 1 ) return; - m_viewModeMenu = new KActionMenu( i18n( "&View Mode" ), this ); + m_viewModeMenu = new KActionMenu( i18n( "&View Mode" ), TQT_TQOBJECT(this) ); // a temporary map, just like the m_viewModeToolBarServices map, but // mapping to a KonqViewModeAction object. It's just temporary as we @@ -5112,11 +5112,11 @@ void KonqMainWindow::updateViewModeActions() itname = (*it)->name(); TQString icon = (*it)->icon(); - if ( icon != TQString::fromLatin1( "unknown" ) ) + if ( icon != TQString::tqfromLatin1( "unknown" ) ) // we *have* to specify a parent qobject, otherwise the exclusive group stuff doesn't work!(Simon) - action = new KRadioAction( itname, icon, 0, this, (*it)->desktopEntryName().ascii() ); + action = new KRadioAction( itname, icon, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); else - action = new KRadioAction( itname, 0, this, (*it)->desktopEntryName().ascii() ); + action = new KRadioAction( itname, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); action->setExclusiveGroup( "KonqMainWindow_ViewModes" ); @@ -5130,7 +5130,7 @@ void KonqMainWindow::updateViewModeActions() // look if we already have a KonqViewModeAction (in the toolbar) // for this component - TQMap<TQString,KonqViewModeAction*>::Iterator mapIt = groupedServiceMap.find( library ); + TQMap<TQString,KonqViewModeAction*>::Iterator mapIt = groupedServiceMap.tqfind( library ); // if we don't have -> create one if ( mapIt == groupedServiceMap.end() ) @@ -5144,7 +5144,7 @@ void KonqMainWindow::updateViewModeActions() // if we previously changed the viewmode (see slotViewModeToggle!) // then we will want to use the previously used settings (previous as // in before the actions got deleted) - TQMap<TQString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.find( library ); + TQMap<TQString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.tqfind( library ); if ( serviceIt != m_viewModeToolBarServices.end() ) { kdDebug(1202) << " Setting action for " << library << " to " << (*serviceIt)->name() << endl; @@ -5168,7 +5168,7 @@ void KonqMainWindow::updateViewModeActions() KonqViewModeAction *tbAction = new KonqViewModeAction( text, icon, - this, + TQT_TQOBJECT(this), name ); tbAction->setExclusiveGroup( "KonqMainWindow_ToolBarViewModes" ); @@ -5193,7 +5193,7 @@ void KonqMainWindow::updateViewModeActions() // Set the contents of the button from the current service, either if it's the current view // or if it's our preferred service for this button (library) if ( bIsCurrentView - || ( preferredServiceMap.contains( library ) && (*it)->desktopEntryName() == preferredServiceMap[ library ] ) ) + || ( preferredServiceMap.tqcontains( library ) && (*it)->desktopEntryName() == preferredServiceMap[ library ] ) ) { //kdDebug(1202) << " Changing action for " << library << " into service " << (*it)->name() << endl; @@ -5260,7 +5260,7 @@ KonqMainWindowIface* KonqMainWindow::dcopObject() void KonqMainWindow::updateBookmarkBar() { - KToolBar * bar = static_cast<KToolBar *>( child( "bookmarkToolBar", "KToolBar" ) ); + KToolBar * bar = static_cast<KToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "KToolBar" )) ); if (!bar) return; @@ -5283,7 +5283,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e ) if ( tabContainer->count() > 1 ) { KConfig *config = KGlobal::config(); - KConfigGroupSaver cs( config, TQString::fromLatin1("Notification Messages") ); + KConfigGroupSaver cs( config, TQString::tqfromLatin1("Notification Messages") ); if ( !config->hasKey( "MultipleTabConfirm" ) ) { @@ -5321,7 +5321,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e ) MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) { KonqView *view = it.data(); - if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -5339,7 +5339,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e ) // m_pViewManager->showTab( originalView ); } else if ( m_currentView && m_currentView->part() && - (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) + (m_currentView->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) @@ -5356,7 +5356,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e ) saveWindowSize(); hide(); - qApp->flushX(); + tqApp->flushX(); } // We're going to close - tell the parts MapViews::ConstIterator it = m_mapViews.begin(); @@ -5571,7 +5571,7 @@ static void hp_removeDuplicates( KCompletionMatches& l ) ++it ) { TQString str = (*it).value(); if( str.startsWith( http )) { - if( str.find( '/', 7 ) < 0 ) { // http://something<noslash> + if( str.tqfind( '/', 7 ) < 0 ) { // http://something<noslash> hp_removeDupe( l, str + '/', it ); hp_removeDupe( l, str.mid( 7 ) + '/', it ); } else if( str[ str.length() - 1 ] == '/' ) { @@ -5684,7 +5684,7 @@ TQStringList KonqMainWindow::historyPopupCompletionItems( const TQString& s) hp_removeDuplicates( matches ); TQStringList items = matches.list(); if( items.count() == 0 - && !s.contains( ':' ) && s[ 0 ] != '/' ) + && !s.tqcontains( ':' ) && s[ 0 ] != '/' ) { TQString pre = hp_tryPrepend( s ); if( !pre.isNull()) @@ -5794,7 +5794,7 @@ void KonqMainWindow::setPreloadedWindow( KonqMainWindow* window ) if( window == NULL ) return; window->viewManager()->clear(); - KIO::Scheduler::unregisterWindow( window ); + KIO::Scheduler::unregisterWindow( TQT_TQOBJECT(window) ); } // used by preloading - this KonqMainWindow will be reused, reset everything diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h index 9ee5b7e19..f5068d98f 100644 --- a/konqueror/konq_mainwindow.h +++ b/konqueror/konq_mainwindow.h @@ -335,7 +335,7 @@ public slots: // for KBookmarkMenu and KBookmarkBar void slotFillContextMenu( const KBookmark &, TQPopupMenu * ); - void slotOpenBookmarkURL( const TQString & url, Qt::ButtonState state ); + void slotOpenBookmarkURL( const TQString & url, TQt::ButtonState state ); void slotPopupMenu( const TQPoint &_global, const KURL &_url, const TQString &_mimeType, mode_t mode ); void slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KURL &_url, const TQString &_mimeType, mode_t mode ); @@ -381,14 +381,14 @@ public slots: // Go menu void slotUp(); - void slotUp(KAction::ActivationReason, Qt::ButtonState state); + void slotUp(KAction::ActivationReason, TQt::ButtonState state); void slotUpDelayed(); void slotBack(); - void slotBack(KAction::ActivationReason, Qt::ButtonState state); + void slotBack(KAction::ActivationReason, TQt::ButtonState state); void slotForward(); - void slotForward(KAction::ActivationReason, Qt::ButtonState state); + void slotForward(KAction::ActivationReason, TQt::ButtonState state); void slotHome(); - void slotHome(KAction::ActivationReason, Qt::ButtonState state); + void slotHome(KAction::ActivationReason, TQt::ButtonState state); void slotGoSystem(); void slotGoApplications(); void slotGoMedia(); @@ -410,7 +410,7 @@ public slots: void slotPartChanged( KonqView *childView, KParts::ReadOnlyPart *oldPart, KParts::ReadOnlyPart *newPart ); void slotRunFinished(); - void slotClearLocationBar( KAction::ActivationReason reason, Qt::ButtonState state ); + void slotClearLocationBar( KAction::ActivationReason reason, TQt::ButtonState state ); // reimplement from KParts::MainWindow virtual void slotSetStatusBarText( const TQString &text ); @@ -420,7 +420,7 @@ public slots: virtual void setIcon( const TQPixmap& ); void slotGoHistoryActivated( int steps ); - void slotGoHistoryActivated( int steps, Qt::ButtonState state ); + void slotGoHistoryActivated( int steps, TQt::ButtonState state ); void slotAddTab(); void slotSplitViewHorizontal(); @@ -556,7 +556,7 @@ private slots: void bookmarksIntoCompletion(); void initBookmarkBar(); - void slotTrashActivated( KAction::ActivationReason reason, Qt::ButtonState state ); + void slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state ); void showPageSecurity(); @@ -689,7 +689,7 @@ private: uint m_bViewModeToggled:1; int m_goBuffer; - Qt::ButtonState m_goState; + TQt::ButtonState m_goState; MapViews m_mapViews; diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc index 66aeaba41..d0bf5e788 100644 --- a/konqueror/konq_misc.cc +++ b/konqueror/konq_misc.cc @@ -106,7 +106,7 @@ KonqMainWindow * KonqMisc::createNewWindow( const KURL &url, const KParts::URLAr KMimeType::findByURL(url)->name() == "text/html") ? "webbrowsing" : "filemanagement"; - TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName ); + TQString profile = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profileName ); return createBrowserWindowFromProfile(profile, profileName, url, args, forbidUseHTML, filesToSelect, tempFile, openURL ); @@ -224,9 +224,9 @@ KonqDraggableLabel::KonqDraggableLabel( KonqMainWindow* mw, const TQString& text : TQLabel( text, 0L, "kde toolbar widget" ) // Use this name for it to be styled! , m_mw(mw) { - setBackgroundMode( Qt::PaletteButton ); - setAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | - Qt::AlignVCenter | Qt::ShowPrefix ); + setBackgroundMode( TQt::PaletteButton ); + tqsetAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | + Qt::AlignVCenter | TQt::ShowPrefix ); setAcceptDrops(true); adjustSize(); validDrag = false; diff --git a/konqueror/konq_misc.h b/konqueror/konq_misc.h index 9696151e6..bab4ca853 100644 --- a/konqueror/konq_misc.h +++ b/konqueror/konq_misc.h @@ -109,7 +109,7 @@ public: #include <tqlabel.h> -class KonqDraggableLabel : public QLabel +class KonqDraggableLabel : public TQLabel { Q_OBJECT public: diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc index 2a3547068..33f36945f 100644 --- a/konqueror/konq_profiledlg.cc +++ b/konqueror/konq_profiledlg.cc @@ -104,7 +104,7 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) ); loadAllProfiles( preselectProfile ); - m_pListView->setMinimumSize( m_pListView->sizeHint() ); + m_pListView->setMinimumSize( m_pListView->tqsizeHint() ); m_cbSaveURLs = new TQCheckBox( i18n("Save &URLs in profile"), box ); m_cbSaveURLs->setChecked( KonqSettings::saveURLInProfile() ); @@ -121,7 +121,7 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese enableButton( BTN_RENAME, m_pListView->selectedItem ()!=0 ); enableButton( BTN_DELETE, m_pListView->selectedItem ()!=0 ); - resize( sizeHint() ); + resize( tqsizeHint() ); } KonqProfileDlg::~KonqProfileDlg() @@ -141,7 +141,7 @@ void KonqProfileDlg::loadAllProfiles(const TQString & preselectProfile) for (; eIt != eEnd; ++eIt ) { TQListViewItem *item = new KonqProfileItem( m_pListView, eIt.key() ); - TQString filename = eIt.data().mid( eIt.data().findRev( '/' ) + 1 ); + TQString filename = eIt.data().mid( eIt.data().tqfindRev( '/' ) + 1 ); kdDebug(1202) << filename << endl; if ( filename == preselectProfile ) { @@ -161,7 +161,7 @@ void KonqProfileDlg::slotUser3() // Save button // Reuse filename of existing item, if any if ( m_pListView->selectedItem() ) { - KonqProfileMap::Iterator it = m_mapEntries.find( m_pListView->selectedItem()->text(0) ); + KonqProfileMap::Iterator it = m_mapEntries.tqfind( m_pListView->selectedItem()->text(0) ); if ( it != m_mapEntries.end() ) { TQFileInfo info( it.data() ); @@ -180,7 +180,7 @@ void KonqProfileDlg::slotUser2() // Delete button { if(!m_pListView->selectedItem()) return; - KonqProfileMap::Iterator it = m_mapEntries.find( m_pListView->selectedItem()->text(0) ); + KonqProfileMap::Iterator it = m_mapEntries.tqfind( m_pListView->selectedItem()->text(0) ); if ( it != m_mapEntries.end() && TQFile::remove( it.data() ) ) loadAllProfiles(); @@ -206,7 +206,7 @@ void KonqProfileDlg::slotItemRenamed( TQListViewItem * item ) if (!newName.isEmpty()) { - KonqProfileMap::ConstIterator it = m_mapEntries.find( oldName ); + KonqProfileMap::ConstIterator it = m_mapEntries.tqfind( oldName ); if ( it != m_mapEntries.end() ) { diff --git a/konqueror/konq_profiledlg.h b/konqueror/konq_profiledlg.h index f06f6a1fe..ffdd3d513 100644 --- a/konqueror/konq_profiledlg.h +++ b/konqueror/konq_profiledlg.h @@ -35,7 +35,7 @@ class KListView; typedef TQMap<TQString, TQString> KonqProfileMap; -class KonqProfileItem : public QListViewItem +class KonqProfileItem : public TQListViewItem { public: KonqProfileItem( KListView *, const TQString & ); diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc index 3cc5cc60d..09d1a0b53 100644 --- a/konqueror/konq_tabs.cc +++ b/konqueror/konq_tabs.cc @@ -196,16 +196,16 @@ void KonqFrameTabs::saveConfig( KConfig* config, const TQString &prefix, bool sa TQString newPrefix; for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next()) { - newPrefix = TQString::fromLatin1( it->frameType() ) + "T" + TQString::number(i); + newPrefix = TQString::tqfromLatin1( it->frameType() ) + "T" + TQString::number(i); strlst.append( newPrefix ); newPrefix.append( '_' ); it->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + i ); i++; } - config->writeEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), strlst ); + config->writeEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), strlst ); - config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), + config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ), currentPageIndex() ); } @@ -225,7 +225,7 @@ void KonqFrameTabs::copyHistory( KonqFrameBase *other ) void KonqFrameTabs::printFrameInfo( const TQString& spaces ) { kdDebug(1202) << spaces << "KonqFrameTabs " << this << " visible=" - << TQString("%1").arg(isVisible()) << " activeChild=" + << TQString("%1").tqarg(isVisible()) << " activeChild=" << m_pActiveChild << endl; if (!m_pActiveChild) @@ -440,7 +440,7 @@ void KonqFrameTabs::slotSubPopupMenuTabActivated( int _id) void KonqFrameTabs::slotMouseMiddleClick() { - TQApplication::clipboard()->setSelectionMode( QClipboard::Selection ); + TQApplication::tqclipboard()->setSelectionMode( QClipboard::Selection ); KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) ); if ( !filteredURL.isEmpty() ) { KonqView* newView = m_pViewManager->addTab(TQString::null, TQString::null, false, false); @@ -461,7 +461,7 @@ void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w ) } } else { - TQApplication::clipboard()->setSelectionMode( QClipboard::Selection ); + TQApplication::tqclipboard()->setSelectionMode( QClipboard::Selection ); KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) ); if ( !filteredURL.isEmpty() ) { KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w); diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index b27779a4e..e7f1bd7bf 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -45,7 +45,7 @@ #include <tqmetaobject.h> #include <tqobjectlist.h> #include <config.h> -#include <private/qucomextra_p.h> +#include <tqucomextra_p.h> #include <kmessagebox.h> #include <klocale.h> @@ -117,7 +117,7 @@ KonqView::~KonqView() if (part_url.isNull()) part_url = ""; TQCString line; - line = ( TQString("close(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8(); + line = ( TQString("close(%1):%2\n").tqarg(m_randID,0,16).tqarg(part_url) ).utf8(); KonqMainWindow::s_crashlog_file->writeBlock(line, line.length()); KonqMainWindow::s_crashlog_file->flush(); } @@ -155,9 +155,9 @@ void KonqView::openURL( const KURL &url, const TQString & locationBarURL, TQCString line; - line = ( TQString("closed(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8(); + line = ( TQString("closed(%1):%2\n").tqarg(m_randID,0,16).tqarg(part_url) ).utf8(); KonqMainWindow::s_crashlog_file->writeBlock(line,line.length()); - line = ( TQString("opened(%3):%4\n").arg(m_randID,0,16).arg(url_url) ).utf8(); + line = ( TQString("opened(%3):%4\n").tqarg(m_randID,0,16).tqarg(url_url) ).utf8(); KonqMainWindow::s_crashlog_file->writeBlock(line,line.length()); KonqMainWindow::s_crashlog_file->flush(); } @@ -528,8 +528,8 @@ void KonqView::slotStarted( KIO::Job * job ) // Manage passwords properly... if (m_pMainWindow) { - kdDebug(7035) << "slotStarted: Window ID = " << m_pMainWindow->topLevelWidget()->winId() << endl; - job->setWindow (m_pMainWindow->topLevelWidget ()); + kdDebug(7035) << "slotStarted: Window ID = " << m_pMainWindow->tqtopLevelWidget()->winId() << endl; + job->setWindow (m_pMainWindow->tqtopLevelWidget ()); } connect( job, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( KIO::Job *, unsigned long ) ) ); @@ -1056,7 +1056,7 @@ KParts::BrowserHostExtension* KonqView::hostExtension( KParts::ReadOnlyPart *par if ( !ext ) return 0; - if ( ext->frameNames().contains( name ) ) + if ( ext->frameNames().tqcontains( name ) ) return ext; const TQPtrList<KParts::ReadOnlyPart> children = ext->frames(); @@ -1077,10 +1077,10 @@ bool KonqView::callExtensionMethod( const char *methodName ) if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->metaObject()->findSlot( methodName ); + int id = obj->tqmetaObject()->tqfindSlot( methodName ); if ( id == -1 ) return false; - QUObject o[ 1 ]; + TQUObject o[ 1 ]; obj->qt_invoke( id, o ); return true; @@ -1092,12 +1092,12 @@ bool KonqView::callExtensionBoolMethod( const char *methodName, bool value ) if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->metaObject()->findSlot( methodName ); + int id = obj->tqmetaObject()->tqfindSlot( methodName ); if ( id == -1 ) return false; - QUObject o[ 2 ]; + TQUObject o[ 2 ]; - static_QUType_bool.set( o + 1, value ); + static_TQUType_bool.set( o + 1, value ); obj->qt_invoke( id, o ); return true; @@ -1109,12 +1109,12 @@ bool KonqView::callExtensionStringMethod( const char *methodName, TQString value if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->metaObject()->findSlot( methodName ); + int id = obj->tqmetaObject()->tqfindSlot( methodName ); if ( id == -1 ) return false; - QUObject o[ 2 ]; + TQUObject o[ 2 ]; - static_QUType_QString.set( o + 1, value ); + static_TQUType_TQString.set( o + 1, value ); obj->qt_invoke( id, o ); return true; @@ -1126,12 +1126,12 @@ bool KonqView::callExtensionURLMethod( const char *methodName, const KURL& value if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->metaObject()->findSlot( methodName ); + int id = obj->tqmetaObject()->tqfindSlot( methodName ); if ( id == -1 ) return false; - QUObject o[ 2 ]; + TQUObject o[ 2 ]; - static_QUType_ptr.set( o + 1, &value ); + static_TQUType_ptr.set( o + 1, &value ); obj->qt_invoke( id, o ); return true; @@ -1146,7 +1146,7 @@ void KonqView::setViewName( const TQString &name ) TQString KonqView::viewName() const { - return m_pPart ? TQString::fromLocal8Bit( m_pPart->name() ) : TQString::null; + return m_pPart ? TQString::fromLocal8Bit( m_pPart->name() ) : TQString(); } void KonqView::enablePopupMenu( bool b ) @@ -1256,7 +1256,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) if ( !m_pPart ) return false; // kdDebug() << "--" << obj->className() << "--" << e->type() << "--" << endl; - if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && obj == m_pPart->widget() ) + if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) ) { TQDragEnterEvent *ev = static_cast<TQDragEnterEvent *>( e ); @@ -1268,16 +1268,16 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) TQObjectList *children = m_pPart->widget()->queryList( "TQWidget" ); if ( ok && - !lstDragURLs.first().url().contains( "javascript:", false ) && // ### this looks like a hack to me + !lstDragURLs.first().url().tqcontains( "javascript:", false ) && // ### this looks like a hack to me ev->source() != m_pPart->widget() && children && - children->findRef( ev->source() ) == -1 ) + children->tqfindRef( TQT_TQOBJECT(ev->source()) ) == -1 ) ev->acceptAction(); delete children; } } - else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && obj == m_pPart->widget() ) + else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) ) { TQDropEvent *ev = static_cast<TQDropEvent *>( e ); @@ -1293,7 +1293,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) { if ( e->type() == TQEvent::ContextMenu ) { - TQContextMenuEvent *ev = static_cast<TQContextMenuEvent *>( e ); + TQContextMenuEvent *ev = TQT_TQCONTEXTMENUEVENT( e ); if ( ev->reason() == TQContextMenuEvent::Mouse ) { return true; @@ -1301,16 +1301,16 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) } else if ( e->type() == TQEvent::MouseButtonPress ) { - TQMouseEvent *ev = static_cast<TQMouseEvent *>( e ); - if ( ev->button() == RightButton ) + TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); + if ( ev->button() == Qt::RightButton ) { return true; } } else if ( e->type() == TQEvent::MouseButtonRelease ) { - TQMouseEvent *ev = static_cast<TQMouseEvent *>( e ); - if ( ev->button() == RightButton ) + TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); + if ( ev->button() == Qt::RightButton ) { emit backRightClick(); return true; @@ -1318,8 +1318,8 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) } else if ( e->type() == TQEvent::MouseMove ) { - TQMouseEvent *ev = static_cast<TQMouseEvent *>( e ); - if ( ev->state() == RightButton ) + TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); + if ( ev->state() == Qt::RightButton ) { obj->removeEventFilter( this ); TQMouseEvent me( TQEvent::MouseButtonPress, ev->pos(), 2, 2 ); diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h index 28f2568d9..1329000f8 100644 --- a/konqueror/konq_view.h +++ b/konqueror/konq_view.h @@ -62,7 +62,7 @@ struct HistoryEntry * handles it. It's more or less the backend structure for the views. * The widget handling stuff is done by the KonqFrame. */ -class KonqView : public QObject +class KonqView : public TQObject { Q_OBJECT public: diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index c4f03da75..86fb3d478 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -423,7 +423,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag KConfig config( tempFile.name() ); config.setGroup( "View Profile" ); - TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0); + TQString prefix = TQString::tqfromLatin1( currentFrame->frameType() ) + TQString::number(0); config.writeEntry( "RootItem", prefix ); prefix.append( '_' ); currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1); @@ -493,10 +493,10 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab ) KConfig config( tempFile.name() ); config.setGroup( "View Profile" ); - TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0); + TQString prefix = TQString::tqfromLatin1( currentFrame->frameType() ) + TQString::number(0); config.writeEntry( "RootItem", prefix ); prefix.append( '_' ); - config.writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true ); + config.writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true ); currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1); KonqMainWindow *mainWindow = new KonqMainWindow( KURL(), false ); @@ -1077,7 +1077,7 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer, void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString & profileName, bool saveURLs, bool saveWindowSize ) { - TQString path = locateLocal( "data", TQString::fromLatin1( "konqueror/profiles/" ) + + TQString path = locateLocal( "data", TQString::tqfromLatin1( "konqueror/profiles/" ) + fileName, KGlobal::instance() ); if ( TQFile::exists( path ) ) @@ -1096,7 +1096,7 @@ void KonqViewManager::saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWi { //kdDebug(1202) << "KonqViewManager::saveViewProfile" << endl; if( m_pMainWindow->childFrame() != 0L ) { - TQString prefix = TQString::fromLatin1( m_pMainWindow->childFrame()->frameType() ) + TQString prefix = TQString::tqfromLatin1( m_pMainWindow->childFrame()->frameType() ) + TQString::number(0); cfg.writeEntry( "RootItem", prefix ); prefix.append( '_' ); @@ -1156,7 +1156,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename, for ( it.toFirst(); it != 0L; ++it ) { KonqView *view = it.current()->activeChildView(); - if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) { + if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1)) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { showTab( view ); @@ -1175,7 +1175,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename, else { KonqView *view = m_pMainWindow->currentView(); - if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) { + if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1)) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( 0, @@ -1413,7 +1413,7 @@ TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget ) TQRect geom = KGlobalSettings::desktopGeometry(widget); - if ( widthStr.contains( '%' ) == 1 ) + if ( widthStr.tqcontains( '%' ) == 1 ) { widthStr.truncate( widthStr.length() - 1 ); int relativeWidth = widthStr.toInt( &ok ); @@ -1428,7 +1428,7 @@ TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget ) width = -1; } - if ( heightStr.contains( '%' ) == 1 ) + if ( heightStr.tqcontains( '%' ) == 1 ) { heightStr.truncate( heightStr.length() - 1 ); int relativeHeight = heightStr.toInt( &ok ); @@ -1465,8 +1465,8 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, serviceType = "text/html"; serviceName = "html"; } else { - serviceType = cfg.readEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory"); - serviceName = cfg.readEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ) ); + serviceType = cfg.readEntry( TQString::tqfromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory"); + serviceName = cfg.readEntry( TQString::tqfromLatin1( "ServiceName" ).prepend( prefix ) ); } //kdDebug(1202) << "KonqViewManager::loadItem: ServiceType " << serviceType << " " << serviceName << endl; @@ -1480,17 +1480,17 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, return; //ugh.. } - bool passiveMode = cfg.readBoolEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), false ); + bool passiveMode = cfg.readBoolEntry( TQString::tqfromLatin1( "PassiveMode" ).prepend( prefix ), false ); //kdDebug(1202) << "KonqViewManager::loadItem: Creating View Stuff" << endl; KonqView *childView = setupView( parent, viewFactory, service, partServiceOffers, appServiceOffers, serviceType, passiveMode, openAfterCurrentPage ); - if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), false ) ); - childView->setToggleView( cfg.readBoolEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), false ) ); - if( !cfg.readBoolEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) ) + if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( TQString::tqfromLatin1( "LinkedView" ).prepend( prefix ), false ) ); + childView->setToggleView( cfg.readBoolEntry( TQString::tqfromLatin1( "ToggleView" ).prepend( prefix ), false ) ); + if( !cfg.readBoolEntry( TQString::tqfromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) ) childView->frame()->statusbar()->hide(); - if (cfg.readBoolEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), false )) + if (cfg.readBoolEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), false )) m_pDocContainer = childView->frame(); if (!m_pDocContainer) @@ -1536,7 +1536,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, childView->frame()->show(); - TQString key = TQString::fromLatin1( "URL" ).prepend( prefix ); + TQString key = TQString::tqfromLatin1( "URL" ).prepend( prefix ); if ( openURL ) { KURL url; @@ -1546,11 +1546,11 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, { TQString u = cfg.readPathEntry( key ); if ( u.isEmpty() ) - u = TQString::fromLatin1("about:blank"); + u = TQString::tqfromLatin1("about:blank"); url = u; } else if(key == "empty_URL") - url = TQString::fromLatin1("about:blank"); + url = TQString::tqfromLatin1("about:blank"); else url = defaultURL; @@ -1567,13 +1567,13 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, //else kdDebug(1202) << "KonqViewManager::loadItem: url is empty" << endl; } // Do this after opening the URL, so that it's actually possible to open it :) - childView->setLockedLocation( cfg.readBoolEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), false ) ); + childView->setLockedLocation( cfg.readBoolEntry( TQString::tqfromLatin1( "LockedLocation" ).prepend( prefix ), false ) ); } else if( name.startsWith("Container") ) { //kdDebug(1202) << "KonqViewManager::loadItem Item is Container" << endl; //load container config - TQString ostr = cfg.readEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ) ); + TQString ostr = cfg.readEntry( TQString::tqfromLatin1( "Orientation" ).prepend( prefix ) ); //kdDebug(1202) << "Orientation: " << ostr << endl; Qt::Orientation o; if( ostr == "Vertical" ) @@ -1586,12 +1586,12 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, } TQValueList<int> sizes = - cfg.readIntListEntry( TQString::fromLatin1( "SplitterSizes" ).prepend( prefix )); + cfg.readIntListEntry( TQString::tqfromLatin1( "SplitterSizes" ).prepend( prefix )); - int index = cfg.readNumEntry( TQString::fromLatin1( "activeChildIndex" ).prepend(prefix), -1 ); + int index = cfg.readNumEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend(prefix), -1 ); TQStrList childList; - if( cfg.readListEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), childList ) < 2 ) + if( cfg.readListEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), childList ) < 2 ) { kdWarning() << "Profile Loading Error: Less than two children in " << name << endl; // fallback to defaults @@ -1608,7 +1608,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, parent->insertChildFrame( newContainer, tabindex ); - if (cfg.readBoolEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), false )) + if (cfg.readBoolEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), false )) m_pDocContainer = newContainer; loadItem( cfg, newContainer, childList.at(0), defaultURL, openURL ); @@ -1634,9 +1634,9 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, parent->insertChildFrame( newContainer ); m_pDocContainer = newContainer; - int index = cfg.readNumEntry( TQString::fromLatin1( "activeChildIndex" ).prepend(prefix), 0 ); + int index = cfg.readNumEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend(prefix), 0 ); - TQStringList childList = cfg.readListEntry( TQString::fromLatin1( "Children" ).prepend( prefix ) ); + TQStringList childList = cfg.readListEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ) ); for ( TQStringList::Iterator it = childList.begin(); it != childList.end(); ++it ) { loadItem( cfg, newContainer, *it, defaultURL, openURL ); diff --git a/konqueror/konqueror.kcfg b/konqueror/konqueror.kcfg index a412347d1..756b80e2d 100644 --- a/konqueror/konqueror.kcfg +++ b/konqueror/konqueror.kcfg @@ -223,7 +223,7 @@ <!-- checked --> </entry> <entry key="DefaultEncoding" type="String"> <!--KHTML--> - <default code="true">QString::null</default> + <default code="true">TQString()</default> <label></label> <whatsthis></whatsthis> <!-- checked --> diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc index 7b06a4996..842f870ec 100644 --- a/konqueror/listview/konq_infolistviewitem.cc +++ b/konqueror/listview/konq_infolistviewitem.cc @@ -206,7 +206,7 @@ void KonqInfoListViewItem::setDisabled( bool disabled ) setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) ); } -void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) +void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) { TQColorGroup cg( _cg ); @@ -218,7 +218,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); KListView *lv = static_cast< KListView* >( listView() ); - const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); + const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap()); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { int newWidth = width( lv->fontMetrics(), lv, _column ); @@ -242,7 +242,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _width = newWidth; } - KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); + KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment ); } void KonqInfoListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) diff --git a/konqueror/listview/konq_infolistviewitem.h b/konqueror/listview/konq_infolistviewitem.h index e81928118..2ba7b8067 100644 --- a/konqueror/listview/konq_infolistviewitem.h +++ b/konqueror/listview/konq_infolistviewitem.h @@ -56,7 +56,7 @@ class KonqInfoListViewItem : public KonqBaseListViewItem virtual ~KonqInfoListViewItem() { } virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg, - int column, int width, int alignment ); + int column, int width, int tqalignment ); virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r ); virtual void updateContents(); virtual void setDisabled( bool disabled ); diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc index 783c6eef3..135e11a09 100644 --- a/konqueror/listview/konq_infolistviewwidget.cc +++ b/konqueror/listview/konq_infolistviewwidget.cc @@ -32,12 +32,12 @@ #include <tqstringlist.h> KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent, - TQWidget* parentWidget) - : KonqBaseListViewWidget(parent, parentWidget) + TQWidget* tqparentWidget) + : KonqBaseListViewWidget(parent, tqparentWidget) { m_metaInfoJob = 0; - m_mtSelector = new KSelectAction(i18n("View &As"), 0, this, + m_mtSelector = new KSelectAction(i18n("View &As"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectMimeType()), parent->actionCollection(), "view_as" ); @@ -201,7 +201,7 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list) } if ( !m_itemsToSelect.isEmpty() ) { - TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( tmp, true ); @@ -375,7 +375,7 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list) if (m_favorite.mimetype) { - m_mtSelector->setCurrentItem(mtlist.findIndex(m_favorite.mimetype->comment())); + m_mtSelector->setCurrentItem(mtlist.tqfindIndex(m_favorite.mimetype->comment())); kdDebug(1203) << "favorite mimetype is " << m_favorite.mimetype->name() << endl; } createFavoriteColumns(); diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h index 5ae497ac2..46bda8b22 100644 --- a/konqueror/listview/konq_infolistviewwidget.h +++ b/konqueror/listview/konq_infolistviewwidget.h @@ -37,7 +37,7 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget // friend class KonqTextViewItem; Q_OBJECT public: - KonqInfoListViewWidget( KonqListView *parent, TQWidget *parentWidget ); + KonqInfoListViewWidget( KonqListView *parent, TQWidget *tqparentWidget ); ~KonqInfoListViewWidget(); const TQStringList columnKeys() {return m_columnKeys;} diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index f256e8e3b..3307073de 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -63,12 +63,12 @@ KonqListViewFactory::~KonqListViewFactory() s_defaultViewProps = 0; } -KParts::Part* KonqListViewFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ) +KParts::Part* KonqListViewFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ) { if( args.count() < 1 ) kdWarning() << "KonqListView: Missing Parameter" << endl; - KParts::Part *obj = new KonqListView( parentWidget, parent, name, args.first() ); + KParts::Part *obj = new KonqListView( tqparentWidget, parent, name, args.first() ); return obj; } @@ -144,7 +144,7 @@ void ListViewBrowserExtension::updateActions() void ListViewBrowserExtension::copySelection( bool move ) { KonqDrag *urlData = new KonqDrag( m_listView->listViewWidget()->selectedUrls(false), m_listView->listViewWidget()->selectedUrls(true), move ); - TQApplication::clipboard()->setData( urlData ); + TQApplication::tqclipboard()->setData( urlData ); } void ListViewBrowserExtension::paste() @@ -169,11 +169,11 @@ void ListViewBrowserExtension::rename() const TQString txt = le->text(); TQString pattern; KMimeType::diagnoseFileName( txt, pattern ); - if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1) + if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.tqfind('*',1)==-1) le->setSelection(0, txt.length()-pattern.stripWhiteSpace().length()+1); else { - int lastDot = txt.findRev('.'); + int lastDot = txt.tqfindRev('.'); if (lastDot > 0) le->setSelection(0, lastDot); } @@ -216,7 +216,7 @@ void ListViewBrowserExtension::editMimeType() KonqOperations::editMimeType( items.first()->mimetype() ); } -KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ) +KonqListView::KonqListView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode ) : KonqDirPart( parent, name ) ,m_headerTimer(0) { @@ -234,25 +234,25 @@ KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char { kdDebug(1202) << "Creating KonqTextViewWidget" << endl; xmlFile = "konq_textview.rc"; - m_pListView=new KonqTextViewWidget(this, parentWidget); + m_pListView=new KonqTextViewWidget(this, tqparentWidget); } else if (mode=="MixedTree") { kdDebug(1202) << "Creating KonqTreeViewWidget" << endl; xmlFile = "konq_treeview.rc"; - m_pListView=new KonqTreeViewWidget(this,parentWidget); + m_pListView=new KonqTreeViewWidget(this,tqparentWidget); } else if (mode=="InfoListView") { kdDebug(1202) << "Creating KonqInfoListViewWidget" << endl; xmlFile = "konq_infolistview.rc"; - m_pListView=new KonqInfoListViewWidget(this,parentWidget); + m_pListView=new KonqInfoListViewWidget(this,tqparentWidget); } else { kdDebug(1202) << "Creating KonqDetailedListViewWidget" << endl; xmlFile = "konq_detailedlistview.rc"; - m_pListView = new KonqBaseListViewWidget( this, parentWidget); + m_pListView = new KonqBaseListViewWidget( this, tqparentWidget); } setWidget( m_pListView ); setDirLister( m_pListView->m_dirLister ); diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index 8665160d3..0fc8f0340 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -44,7 +44,7 @@ public: KonqListViewFactory(); virtual ~KonqListViewFactory(); - virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ); + virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ); static KInstance *instance(); static KonqPropsView *defaultViewProps(); @@ -65,7 +65,7 @@ class KonqListView : public KonqDirPart Q_OBJECT Q_PROPERTY( bool supportsUndo READ supportsUndo ) public: - KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ); + KonqListView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode ); virtual ~KonqListView(); virtual const KFileItem * currentItem(); diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc index 3c70f1fb0..a66dbb06c 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cc @@ -144,7 +144,7 @@ void KonqListViewItem::updateContents() const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra ); if ( tmpColumn->type == TQVariant::DateTime ) { - TQDateTime dt = TQDateTime::fromString( entryStr, Qt::ISODate ); + TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr, Qt::ISODate )); setText(tmpColumn->displayInColumn, KGlobal::locale()->formatDateTime(dt)); } @@ -173,7 +173,7 @@ void KonqListViewItem::setActive( bool active ) if ( m_bActive == active ) return; - //#### Optimize away repaint if possible, like the iconview does? + //#### Optimize away tqrepaint if possible, like the iconview does? KonqBaseListViewItem::setActive( active ); int iconSize = m_pListViewWidget->iconSize(); iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small @@ -203,7 +203,7 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm ) int newWidth = pm.isNull() ? 0 : pm.width(); int newHeight = pm.isNull() ? 0 : pm.height(); - // If the height or width have changed then we're going to have to repaint + // If the height or width have changed then we're going to have to tqrepaint // this whole thing. Fortunately since most of the calls are coming from // setActive() this is the uncommon case. @@ -211,12 +211,12 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm ) { setup(); widthChanged( column ); - invalidateHeight(); + tqinvalidateHeight(); return; } // If we're just replacing the icon with another one its size -- i.e. a - // "highlighted" icon, don't bother repainting the whole widget. + // "highlighted" icon, don't bother tqrepainting the whole widget. TQListView *lv = m_pListViewWidget; @@ -225,7 +225,7 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm ) int y = lv->itemPos( this ); int w = newWidth; int h = height(); - lv->repaintContents( x, y, w, h ); + lv->tqrepaintContents( x, y, w, h ); } const TQPixmap* KonqListViewItem::pixmap( int column ) const @@ -275,9 +275,9 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending { if ( cInfo->type & TQVariant::DateTime ) { const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra ); - TQDateTime dt1 = TQDateTime::fromString( entryStr1, Qt::ISODate ); + TQDateTime dt1 = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr1, Qt::ISODate )); const TQString entryStr2 = retrieveExtraEntry( k->m_fileitem, numExtra ); - TQDateTime dt2 = TQDateTime::fromString( entryStr2, Qt::ISODate ); + TQDateTime dt2 = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr2, Qt::ISODate )); return ( dt1 > dt2 ) ? 1 : ( dt1 < dt2 ) ? -1 : 0; } } @@ -294,7 +294,7 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending } } -void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) +void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) { TQColorGroup cg( _cg ); @@ -306,7 +306,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); KListView *lv = static_cast< KListView* >( listView() ); - const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); + const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap()); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { int newWidth = width( lv->fontMetrics(), lv, _column ); @@ -330,7 +330,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, _width = newWidth; } - KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); + KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment ); } void KonqListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) @@ -421,7 +421,7 @@ KonqBaseListViewItem::~KonqBaseListViewItem() TQRect KonqBaseListViewItem::rect() const { - TQRect r = m_pListViewWidget->itemRect(this); + TQRect r = m_pListViewWidget->tqitemRect(this); return TQRect( m_pListViewWidget->viewportToContents( r.topLeft() ), TQSize( r.width(), r.height() ) ); } diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h index b54f1c2db..8e78b10f0 100644 --- a/konqueror/listview/konq_listviewitems.h +++ b/konqueror/listview/konq_listviewitems.h @@ -107,7 +107,7 @@ class KonqListViewItem : public KonqBaseListViewItem virtual ~KonqListViewItem(); virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg, - int column, int width, int alignment ); + int column, int width, int tqalignment ); virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r ); virtual void updateContents(); virtual void setDisabled( bool disabled ); diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index 8f166af0a..d61518767 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -84,8 +84,8 @@ void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kio } -KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget) - : KListView(parentWidget) +KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *tqparentWidget) + : KListView(tqparentWidget) ,sortedByColumn(0) ,m_pBrowserView(parent) ,m_dirLister(new KDirLister( true /*m_showIcons==false*/)) @@ -107,7 +107,7 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget * { kdDebug(1202) << "+KonqBaseListViewWidget" << endl; - m_dirLister->setMainWindow(topLevelWidget()); + m_dirLister->setMainWindow(tqtopLevelWidget()); m_bTopLevelComplete = true; @@ -169,8 +169,8 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget * connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), TQT_SLOT(slotUpdateBackground()) ); viewport()->setMouseTracking( true ); - viewport()->setFocusPolicy( TQWidget::WheelFocus ); - setFocusPolicy( TQWidget::WheelFocus ); + viewport()->setFocusPolicy( TQ_WheelFocus ); + setFocusPolicy( TQ_WheelFocus ); setAcceptDrops( true ); //looks better with the statusbar @@ -228,7 +228,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) for ( int num = 1; extraFieldsIt != extraFields.end(); ++extraFieldsIt, ++num ) { const TQString column = (*extraFieldsIt).name; - if ( lstColumns.find(column) == lstColumns.end() ) + if ( lstColumns.tqfind(column) == lstColumns.end() ) lstColumns << column; const TQString type = (*extraFieldsIt).type; // ## TODO use when sorting TQVariant::Type t = TQVariant::Invalid; @@ -325,7 +325,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) continue; } - TQStringList::Iterator listIt = listingList.find( confColumns[i].desktopFileName ); + TQStringList::Iterator listIt = listingList.tqfind( confColumns[i].desktopFileName ); if ( listIt == listingList.end() ) // not found -> hide { //move all columns behind one to the front @@ -410,7 +410,7 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) TQRect r( m_rubber->normalize() ); delete m_rubber; m_rubber = 0; - repaintContents( r, FALSE ); + tqrepaintContents( r, FALSE ); } delete m_selected; @@ -424,14 +424,14 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) KListView::contentsMousePressEvent( e ); } else { - if ( e->button() == LeftButton ) + if ( e->button() == Qt::LeftButton ) { m_rubber = new TQRect( e->x(), e->y(), 0, 0 ); clearSelection(); emit selectionChanged(); m_fileTip->setItem( 0 ); } - if ( e->button() != RightButton ) + if ( e->button() != Qt::RightButton ) TQListView::contentsMousePressEvent( e ); } // Store list of selected items at mouse-press time. @@ -448,7 +448,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) TQRect r( m_rubber->normalize() ); delete m_rubber; m_rubber = 0; - repaintContents( r, FALSE ); + tqrepaintContents( r, FALSE ); } if ( m_scrollTimer ) @@ -489,7 +489,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) emit m_pBrowserView->setStatusBarText( item->item()->getStatusBarInfo() ); m_pBrowserView->emitMouseOver( item->item() ); - vp.setY( itemRect( item ).y() ); + vp.setY( tqitemRect( item ).y() ); TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) ); m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) ); m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) ); @@ -551,9 +551,9 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p ) TQPoint pt( m_rubber->x(), m_rubber->y() ); pt = contentsToViewport( pt ); - style().drawPrimitive( TQStyle::PE_RubberBand, p, + tqstyle().tqdrawPrimitive( TQStyle::PE_RubberBand, p, TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ), - colorGroup(), TQStyle::Style_Default, colorGroup().base() ); + tqcolorGroup(), TQStyle::Style_Default, tqcolorGroup().base() ); } @@ -591,9 +591,9 @@ void KonqBaseListViewWidget::slotAutoScroll() { TQRect rect; if ( allColumnsShowFocus() ) - rect = itemRect( cur ); + rect = tqitemRect( cur ); else { - rect = itemRect( cur ); + rect = tqitemRect( cur ); rect.setWidth( executeArea( cur ) ); } @@ -623,7 +623,7 @@ void KonqBaseListViewWidget::slotAutoScroll() { setSelected( cur, true ); changed = TRUE; - rr = rr.unite( itemRect( cur ) ); + rr = rr.unite( tqitemRect( cur ) ); } } else @@ -631,10 +631,10 @@ void KonqBaseListViewWidget::slotAutoScroll() if ( cur->isSelected() ) { changed = TRUE; - rr = rr.unite( itemRect( cur ) ); + rr = rr.unite( tqitemRect( cur ) ); } - if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) + if ( !m_selected || !m_selected->tqcontains( (KonqBaseListViewItem*)cur ) ) { setSelected( cur, false ); } @@ -659,7 +659,7 @@ void KonqBaseListViewWidget::slotAutoScroll() { setSelected( cur, true ); changed = TRUE; - rr = rr.unite( itemRect( cur ) ); + rr = rr.unite( tqitemRect( cur ) ); } } else @@ -667,10 +667,10 @@ void KonqBaseListViewWidget::slotAutoScroll() if ( cur->isSelected() ) { changed = TRUE; - rr = rr.unite( itemRect( cur ) ); + rr = rr.unite( tqitemRect( cur ) ); } - if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) + if ( !m_selected || !m_selected->tqcontains( (KonqBaseListViewItem*)cur ) ) { setSelected( cur, false ); } @@ -718,7 +718,7 @@ void KonqBaseListViewWidget::slotAutoScroll() if ( !TQRect( scroll_margin, scroll_margin, viewport()->width() - 2*scroll_margin, - viewport()->height() - 2*scroll_margin ).contains( pos ) ) + viewport()->height() - 2*scroll_margin ).tqcontains( pos ) ) { if ( !m_scrollTimer ) { @@ -762,7 +762,7 @@ void KonqBaseListViewWidget::viewportDragMoveEvent( TQDragMoveEvent *_ev ) // Unselect previous drag-over-item if ( m_dragOverItem && m_dragOverItem != item ) - if ( !m_selected || !m_selected->contains( m_dragOverItem ) ) + if ( !m_selected || !m_selected->tqcontains( m_dragOverItem ) ) setSelected( m_dragOverItem, false ); if ( !item ) @@ -900,7 +900,7 @@ void KonqBaseListViewWidget::slotSelectionChanged() void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button, TQListViewItem *_item, const TQPoint& pos, int ) { - if ( _button == MidButton ) + if ( _button == Qt::MidButton ) { if ( _item && isExecuteArea( viewport()->mapFromGlobal(pos) ) ) m_pBrowserView->mmbClicked( static_cast<KonqBaseListViewItem *>(_item)->item() ); @@ -985,17 +985,17 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item ) if (_item->pixmap(0) != 0) { // Rect of the QListViewItem's pixmap area. - TQRect rect = _item->listView()->itemRect(_item); + TQRect rect = _item->listView()->tqitemRect(_item); // calculate nesting depth int nestingDepth = 0; - for (TQListViewItem *currentItem = _item->parent(); + for (TQListViewItem *currentItem = _item->tqparent(); currentItem != 0; - currentItem = currentItem->parent()) + currentItem = currentItem->tqparent()) nestingDepth++; // no parent no indent - if (_item->parent() == 0) + if (_item->tqparent() == 0) nestingDepth = 0; // Root decoration means additional indent @@ -1111,7 +1111,7 @@ bool KonqBaseListViewWidget::openURL( const KURL &url ) args.yOffset = contentsY(); m_pBrowserView->extension()->setURLArgs( args ); - if ( currentItem() && itemRect( currentItem() ).isValid() ) + if ( currentItem() && tqitemRect( currentItem() ).isValid() ) m_itemToGoTo = currentItem()->text(0); m_pBrowserView->m_filesToSelect.clear(); @@ -1255,7 +1255,7 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries ) m_itemFound = true; } if ( !m_itemsToSelect.isEmpty() ) { - TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( tmp, true ); @@ -1371,13 +1371,13 @@ KonqBaseListViewWidget::iterator& KonqBaseListViewWidget::iterator::operator++() m_p = i; return *this; } - m_p = (KonqBaseListViewItem *)m_p->parent(); + m_p = (KonqBaseListViewItem *)m_p->tqparent(); while ( m_p ) { if ( m_p->nextSibling() ) break; - m_p = (KonqBaseListViewItem *)m_p->parent(); + m_p = (KonqBaseListViewItem *)m_p->tqparent(); } if ( m_p ) @@ -1402,13 +1402,13 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in m_p = i; return it; } - m_p = (KonqBaseListViewItem *)m_p->parent(); + m_p = (KonqBaseListViewItem *)m_p->tqparent(); while ( m_p ) { if ( m_p->nextSibling() ) break; - m_p = (KonqBaseListViewItem *)m_p->parent(); + m_p = (KonqBaseListViewItem *)m_p->tqparent(); } if ( m_p ) @@ -1418,7 +1418,7 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in void KonqBaseListViewWidget::paintEmptyArea( TQPainter *p, const TQRect &r ) { - const TQPixmap *pm = viewport()->paletteBackgroundPixmap(); + const TQPixmap *pm = TQT_TQPIXMAP_CONST(viewport()->paletteBackgroundPixmap()); if (!pm || pm->isNull()) p->fillRect(r, viewport()->backgroundColor()); diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index d6123c11f..7d57c202f 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -81,7 +81,7 @@ class KonqBaseListViewWidget : public KListView Q_OBJECT public: - KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget ); + KonqBaseListViewWidget( KonqListView *parent, TQWidget *tqparentWidget ); virtual ~KonqBaseListViewWidget(); unsigned int NumberOfAtoms; @@ -176,7 +176,7 @@ protected slots: virtual void slotRedirection( const KURL & ); void slotPopupMenu( TQListViewItem *, const TQPoint&, int ); - // forces a repaint on column size changes / branch expansion + // forces a tqrepaint on column size changes / branch expansion // when there is a background pixmap void slotUpdateBackground(); diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc index 8e03e171e..0d40ecfce 100644 --- a/konqueror/listview/konq_textviewitem.cc +++ b/konqueror/listview/konq_textviewitem.cc @@ -200,7 +200,7 @@ void KonqTextViewItem::updateContents() }; } -void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) +void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) { TQColorGroup cg( _cg ); cg.setColor(TQColorGroup::Text, static_cast<KonqTextViewWidget *>(listView())->colors[type]); @@ -208,7 +208,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, // cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]); // cg.setColor(TQColorGroup::Highlight, Qt::darkGray); - KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); + KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment ); } /*void KonqTextViewItem::paintFocus( TQPainter *_p, const TQColorGroup &_cg, const TQRect &_r ) diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h index f091781e2..02a534688 100644 --- a/konqueror/listview/konq_textviewitem.h +++ b/konqueror/listview/konq_textviewitem.h @@ -57,7 +57,7 @@ class KonqTextViewItem : public KonqBaseListViewItem // virtual TQString key( int _column, bool asc) const; /** Call this before destroying the text view (decreases reference count * on the view)*/ - virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ); + virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ); // virtual void paintFocus( TQPainter *_painter, const TQColorGroup & _cg, const TQRect & r ); virtual void updateContents(); diff --git a/konqueror/listview/konq_textviewwidget.cc b/konqueror/listview/konq_textviewwidget.cc index 32de25351..f3e9140d3 100644 --- a/konqueror/listview/konq_textviewwidget.cc +++ b/konqueror/listview/konq_textviewwidget.cc @@ -29,8 +29,8 @@ #include <assert.h> -KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget ) -:KonqBaseListViewWidget(parent,parentWidget) +KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *tqparentWidget ) +:KonqBaseListViewWidget(parent,tqparentWidget) { kdDebug(1202) << "+KonqTextViewWidget" << endl; m_filenameColumn=1; @@ -88,7 +88,7 @@ void KonqTextViewWidget::slotNewItems( const KFileItemList & entries ) m_itemFound = true; } if ( !m_itemsToSelect.isEmpty() ) { - TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( tmp, true ); diff --git a/konqueror/listview/konq_textviewwidget.h b/konqueror/listview/konq_textviewwidget.h index 06a5cbbb5..5596e4d23 100644 --- a/konqueror/listview/konq_textviewwidget.h +++ b/konqueror/listview/konq_textviewwidget.h @@ -34,7 +34,7 @@ class KonqTextViewWidget : public KonqBaseListViewWidget friend class KonqTextViewItem; Q_OBJECT public: - KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget ); + KonqTextViewWidget( KonqListView *parent, TQWidget *tqparentWidget ); ~KonqTextViewWidget(); virtual bool isExecuteArea( const TQPoint& point ); diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cc index 4d04f2fa4..5fefc8133 100644 --- a/konqueror/listview/konq_treeviewwidget.cc +++ b/konqueror/listview/konq_treeviewwidget.cc @@ -27,8 +27,8 @@ template class TQDict<KonqListViewDir>; -KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget) - : KonqBaseListViewWidget( parent, parentWidget ) +KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *tqparentWidget) + : KonqBaseListViewWidget( parent, tqparentWidget ) { kdDebug(1202) << "+KonqTreeViewWidget" << endl; @@ -246,7 +246,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries ) } if ( !m_itemsToSelect.isEmpty() ) { - TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( fileItem ? fileItem : dirItem, true ); diff --git a/konqueror/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h index 3f08cc3d5..8ced17e6b 100644 --- a/konqueror/listview/konq_treeviewwidget.h +++ b/konqueror/listview/konq_treeviewwidget.h @@ -34,7 +34,7 @@ class KonqTreeViewWidget : public KonqBaseListViewWidget Q_OBJECT public: - KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget ); + KonqTreeViewWidget( KonqListView *parent, TQWidget *tqparentWidget ); virtual ~KonqTreeViewWidget(); virtual bool openURL( const KURL &url ); diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cc index 23c1704d9..020d7dc6b 100644 --- a/konqueror/preloader/preloader.cc +++ b/konqueror/preloader/preloader.cc @@ -109,8 +109,8 @@ void KonqyPreloader::updateCount() { if( !check_always_preloaded_timer.isActive()) { - if( kapp->kdeinitExec( TQString::fromLatin1( "konqueror" ), - TQStringList() << TQString::fromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 ) + if( kapp->kdeinitExec( TQString::tqfromLatin1( "konqueror" ), + TQStringList() << TQString::tqfromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 ) { kdDebug( 1202 ) << "Preloading Konqueror instance" << endl; check_always_preloaded_timer.start( 5000, true ); diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index 7d84071fc..f8ca47992 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -41,7 +41,7 @@ #include "kremoteencodingplugin.h" -#define DATA_KEY TQString::fromLatin1("Charset") +#define DATA_KEY TQString::tqfromLatin1("Charset") KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent, const char *name, @@ -142,7 +142,7 @@ KRemoteEncodingPlugin::updateMenu() int id = 1; TQStringList::Iterator it; for (it = m_encodingDescriptions.begin(); it != m_encodingDescriptions.end(); ++it, ++id) - if ((*it).find(charset) != -1) + if ((*it).tqfind(charset) != -1) break; kdDebug() << k_funcinfo << "URL=" << m_currentURL << " charset=" << charset << endl; diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp index eefa57337..e41d1c99a 100644 --- a/konqueror/shellcmdplugin/kshellcmddialog.cpp +++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp @@ -43,10 +43,10 @@ KShellCommandDialog::KShellCommandDialog(const TQString& title, const TQString& closeButton= new KPushButton(KStdGuiItem::close(), buttonsBox); closeButton->setDefault(true); - label->resize(label->sizeHint()); - m_shell->resize(m_shell->sizeHint()); - closeButton->setFixedSize(closeButton->sizeHint()); - cancelButton->setFixedSize(cancelButton->sizeHint()); + label->resize(label->tqsizeHint()); + m_shell->resize(m_shell->tqsizeHint()); + closeButton->setFixedSize(closeButton->tqsizeHint()); + cancelButton->setFixedSize(cancelButton->tqsizeHint()); box->addWidget(label,0); box->addWidget(m_shell,1); diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp index 167f0f812..121dac7ad 100644 --- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp +++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp @@ -84,11 +84,11 @@ int KShellCommandExecutor::exec() return 0; } - m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, this); - m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, this); + m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, TQT_TQOBJECT(this)); + m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, TQT_TQOBJECT(this)); m_writeNotifier->setEnabled(false); - connect (m_readNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(readDataFromShell())); - connect (m_writeNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(writeDataToShell())); + connect (m_readNotifier, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this),TQT_SLOT(readDataFromShell())); + connect (m_writeNotifier, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this),TQT_SLOT(writeDataToShell())); return 1; } diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.h b/konqueror/shellcmdplugin/kshellcmdexecutor.h index 98b733603..616cdbc13 100644 --- a/konqueror/shellcmdplugin/kshellcmdexecutor.h +++ b/konqueror/shellcmdplugin/kshellcmdexecutor.h @@ -26,7 +26,7 @@ class PtyProcess; class TQSocketNotifier; -class KShellCommandExecutor:public QTextView +class KShellCommandExecutor:public TQTextView { Q_OBJECT public: diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index bdc99a4ca..0e3f3512a 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -22,7 +22,7 @@ #include <tqapplication.h> #include <kaccelmanager.h> -KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName, +KonqSidebar::KonqSidebar( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, bool universalMode ) : KParts::ReadOnlyPart(parent, name),KonqSidebarIface() { @@ -30,15 +30,15 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName, setInstance( KonqSidebarFactory::instance() ); m_extension = 0; // this should be your custom internal widget - m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() ); + m_widget = new Sidebar_Widget( tqparentWidget, this, widgetName ,universalMode, tqparentWidget->tqtopLevelWidget()->property("currentProfile").toString() ); m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" ); connect(m_widget,TQT_SIGNAL(started(KIO::Job *)), this, TQT_SIGNAL(started(KIO::Job*))); connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)), m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&))); - KAcceleratorManager::setNoAccel(m_widget); - setWidget(m_widget); + KAcceleratorManager::setNoAccel(TQT_TQWIDGET(m_widget)); + setWidget(TQT_TQWIDGET(m_widget)); } KInstance *KonqSidebar::getInstance() @@ -97,12 +97,12 @@ KonqSidebarFactory::~KonqSidebarFactory() s_about = 0L; } -KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, +KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char * /*classname*/, const TQStringList &args ) { // Create an instance of our Part - KonqSidebar* obj = new KonqSidebar( parentWidget, widgetName, parent, name, args.contains("universal") ); + KonqSidebar* obj = new KonqSidebar( tqparentWidget, widgetName, parent, name, args.tqcontains("universal") ); // See if we are to be read-write or not // if (TQCString(classname) == "KParts::ReadOnlyPart") diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h index ec63e6d00..2724b2d39 100644 --- a/konqueror/sidebar/konqsidebar.h +++ b/konqueror/sidebar/konqsidebar.h @@ -77,7 +77,7 @@ public: /** * Default constructor */ - KonqSidebar(TQWidget *parentWidget, const char *widgetName, + KonqSidebar(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name,bool universalMode); /** @@ -113,7 +113,7 @@ class KonqSidebarFactory : public KParts::Factory public: KonqSidebarFactory(); virtual ~KonqSidebarFactory(); - virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, + virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/konqueror/sidebar/konqsidebarplugin.cpp b/konqueror/sidebar/konqsidebarplugin.cpp index 75e762d35..1839425dc 100644 --- a/konqueror/sidebar/konqsidebarplugin.cpp +++ b/konqueror/sidebar/konqsidebarplugin.cpp @@ -52,7 +52,7 @@ void KonqSidebarPlugin::handlePreviewOnMouseOver(const KFileItem& /*items*/) {} bool KonqSidebarPlugin::universalMode() { if (!parent()) return false; - KonqSidebarIface *ksi=static_cast<KonqSidebarIface*>(parent()->qt_cast("KonqSidebarIface")); + KonqSidebarIface *ksi=static_cast<KonqSidebarIface*>(tqparent()->tqqt_cast("KonqSidebarIface")); if (!ksi) return false; kdDebug()<<"calling KonqSidebarIface->universalMode()"<<endl; return ksi->universalMode(); diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h index d3ecf7ce4..8f3077b37 100644 --- a/konqueror/sidebar/konqsidebarplugin.h +++ b/konqueror/sidebar/konqsidebarplugin.h @@ -30,7 +30,7 @@ class KonqSidebarPluginPrivate; -class KDE_EXPORT KonqSidebarPlugin : public QObject +class KDE_EXPORT KonqSidebarPlugin : public TQObject { Q_OBJECT public: diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index b4940e8e5..50163c46a 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -25,6 +25,7 @@ #include <tqwhatsthis.h> #include <tqlayout.h> #include <tqstringlist.h> +#include <tqucomextra_p.h> #include <klocale.h> #include <ksimpleconfig.h> @@ -168,7 +169,7 @@ static TQString findFileName(const TQString* tmpl,bool universal, const TQString void addBackEnd::activatedAddMenu(int id) { - kdDebug() << "activatedAddMenu: " << TQString("%1").arg(id) << endl; + kdDebug() << "activatedAddMenu: " << TQString("%1").tqarg(id) << endl; if (((uint)id) == libNames.size()) doRollBack(); if(((uint)id) >= libNames.size()) @@ -251,7 +252,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons m_buttons.setAutoDelete(true); m_hasStoredUrl = false; m_latestViewed = -1; - setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); TQSplitter *splitterWidget = splitter(); if (splitterWidget) { @@ -261,7 +262,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons } m_area = new KDockArea(this); - m_area->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + m_area->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_mainDockWidget = m_area->createDockWidget("free", 0); m_mainDockWidget->setWidget(new TQWidget(m_mainDockWidget)); m_area->setMainDockWidget(m_mainDockWidget); @@ -462,8 +463,8 @@ void Sidebar_Widget::initialCopy() { //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl; if ( *eIt != "." && *eIt != ".." && - !entries.contains( *eIt ) && - !dirEntries.contains( *eIt ) ) + !entries.tqcontains( *eIt ) && + !dirEntries.tqcontains( *eIt ) ) { // we don't have that one yet -> copy it. TQString cp("cp -R -- "); cp += KProcess::quote(dirtree_dir + *eIt); @@ -674,11 +675,11 @@ void Sidebar_Widget::stdAction(const char *handlestd) kdDebug() << "Try calling >active< module's (" << mod->module->className() << ") slot " << handlestd << endl; - int id = mod->module->metaObject()->findSlot( handlestd ); + int id = mod->module->tqmetaObject()->tqfindSlot( handlestd ); if ( id == -1 ) return; kdDebug() << "Action slot was found, it will be called now" << endl; - QUObject o[ 1 ]; + TQUObject o[ 1 ]; mod->module->qt_invoke( id, o ); return; } @@ -742,7 +743,7 @@ void Sidebar_Widget::createButtons() for (uint i = 0; i < m_buttons.count(); i++) { ButtonInfo *button = m_buttons.at(i); - if (m_openViews.contains(button->file)) + if (m_openViews.tqcontains(button->file)) { m_buttonBar->setTab(i,true); m_noUpdate = true; @@ -814,7 +815,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos) { m_buttonBar->appendTab(SmallIcon(icon), lastbtn, name); ButtonInfo *bi = new ButtonInfo(desktoppath, ((KonqSidebar*)m_partParent),0, url, lib, name, - icon, this); + icon, TQT_TQOBJECT(this)); /*int id=*/m_buttons.insert(lastbtn, bi); KMultiTabBarTab *tab = m_buttonBar->tab(lastbtn); tab->installEventFilter(this); @@ -833,7 +834,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos) bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) { - if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQMouseEvent::RightButton) + if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton) { KMultiTabBarTab *bt=dynamic_cast<KMultiTabBarTab*>(obj); if (bt) @@ -881,7 +882,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) void Sidebar_Widget::mousePressEvent(TQMouseEvent *ev) { if (ev->type()==TQEvent::MouseButtonPress && - ((TQMouseEvent *)ev)->button()==TQMouseEvent::RightButton && + ((TQMouseEvent *)ev)->button()==Qt::RightButton && !m_disableConfig) { m_menu->exec(TQCursor::pos()); } } @@ -1042,28 +1043,28 @@ void Sidebar_Widget::showHidePage(int page) void Sidebar_Widget::collapseExpandSidebar() { - if (!parentWidget()) + if (!tqparentWidget()) return; // Can happen during destruction if (m_visibleViews.count()==0) { m_somethingVisible = false; - parentWidget()->setMaximumWidth(minimumSizeHint().width()); + tqparentWidget()->setMaximumWidth(tqminimumSizeHint().width()); updateGeometry(); emit panelHasBeenExpanded(false); } else { m_somethingVisible = true; - parentWidget()->setMaximumWidth(32767); + tqparentWidget()->setMaximumWidth(32767); updateGeometry(); emit panelHasBeenExpanded(true); } } -TQSize Sidebar_Widget::sizeHint() const +TQSize Sidebar_Widget::tqsizeHint() const { if (m_somethingVisible) return TQSize(m_savedWidth,200); - return minimumSizeHint(); + return tqminimumSizeHint(); } void Sidebar_Widget::dockWidgetHasUndocked(KDockWidget* wid) @@ -1122,7 +1123,7 @@ void Sidebar_Widget::createNewWindow( const KURL &url, const KParts::URLArgs &ar void Sidebar_Widget::enableAction( const char * name, bool enabled ) { - if (sender()->parent()->isA("ButtonInfo")) + if (TQT_TQOBJECT_CONST(sender())->tqparent()->isA("ButtonInfo")) { ButtonInfo *btninfo = static_cast<ButtonInfo*>(sender()->parent()); if (btninfo) @@ -1147,7 +1148,7 @@ void Sidebar_Widget::enableAction( const char * name, bool enabled ) bool Sidebar_Widget::doEnableActions() { - if (!(sender()->parent()->isA("ButtonInfo"))) + if (!(TQT_TQOBJECT_CONST(sender())->tqparent()->isA("ButtonInfo"))) { kdDebug()<<"Couldn't set active module, aborting"<<endl; return false; @@ -1194,50 +1195,50 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client, void Sidebar_Widget::connectModule(TQObject *mod) { - if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) { + if (mod->tqmetaObject()->tqfindSignal("started(KIO::Job*)") != -1) { connect(mod,TQT_SIGNAL(started(KIO::Job *)),this, TQT_SIGNAL(started(KIO::Job*))); } - if (mod->metaObject()->findSignal("completed()") != -1) { + if (mod->tqmetaObject()->tqfindSignal("completed()") != -1) { connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); } - if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) { + if (mod->tqmetaObject()->tqfindSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const TQPoint &, const KURL&, const TQString &, mode_t))); } - if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) { + if (mod->tqmetaObject()->tqfindSignal("popupMenu(KXMLGUIClient*,const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t)),this, TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t))); } - if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) { + if (mod->tqmetaObject()->tqfindSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & ))); } - if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) { + if (mod->tqmetaObject()->tqfindSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) { connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } - if (mod->metaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) { + if (mod->tqmetaObject()->tqfindSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) { connect(mod, TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); } - if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) { + if (mod->tqmetaObject()->tqfindSignal("enableAction(const char*,bool)") != -1) { connect(mod,TQT_SIGNAL(enableAction( const char *, bool)), this,TQT_SLOT(enableAction(const char *, bool))); } - if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) { + if (mod->tqmetaObject()->tqfindSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) { connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); } @@ -1298,10 +1299,10 @@ void Sidebar_Widget::resizeEvent(TQResizeEvent* ev) TQSplitter *Sidebar_Widget::splitter() const { if (m_universalMode) return 0; - TQObject *p = parent(); + TQObject *p = tqparent(); if (!p) return 0; - p = p->parent(); - return static_cast<TQSplitter*>(p); + p = p->tqparent(); + return static_cast<TQSplitter*>(TQT_TQWIDGET(p)); } void Sidebar_Widget::userMovedSplitter() diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h index c99ae3883..dd7182a35 100644 --- a/konqueror/sidebar/sidebar_widget.h +++ b/konqueror/sidebar/sidebar_widget.h @@ -70,7 +70,7 @@ public: }; -class addBackEnd: public QObject +class addBackEnd: public TQObject { Q_OBJECT public: @@ -93,7 +93,7 @@ private: TQWidget *m_parent; }; -class KDE_EXPORT Sidebar_Widget: public QWidget +class KDE_EXPORT Sidebar_Widget: public TQWidget { Q_OBJECT public: @@ -107,7 +107,7 @@ public: void stdAction(const char *handlestd); //virtual KParts::ReadOnlyPart *getPart(); KParts::BrowserExtension *getExtension(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; public slots: void addWebSideBar(const KURL& url, const TQString& name); diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index d00605c82..e79ed82df 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -161,10 +161,10 @@ void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQ KBookmarkGroup parentGroup; // try to get the parent group (assume that the TQListViewItem has been reparented by KListView)... // if anything goes wrong, use the root. - if (item->parent()) { + if (item->tqparent()) { bool error = false; - KonqSidebarBookmarkItem *parent = dynamic_cast<KonqSidebarBookmarkItem*>( (item->parent()) ); + KonqSidebarBookmarkItem *parent = dynamic_cast<KonqSidebarBookmarkItem*>( (item->tqparent()) ); if (!parent) { error = true; } else { @@ -387,7 +387,7 @@ void KonqSidebarBookmarkModule::slotOpenTab() else return; - DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), tree()->tqtopLevelWidget()->name()); if (bookmark.isGroup()) { KBookmarkGroup group = bookmark.toGroup(); @@ -412,9 +412,9 @@ void KonqSidebarBookmarkModule::slotCopyLocation() if ( !bookmark.isGroup() ) { - kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), QClipboard::Selection ); - kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), QClipboard::Clipboard ); } } @@ -484,7 +484,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo fillGroup( item, grp ); TQString address(grp.address()); - if (m_folderOpenState.contains(address)) + if (m_folderOpenState.tqcontains(address)) item->setOpen(m_folderOpenState[address]); else item->setOpen(false); diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp index 811867b14..16c1bfb78 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp @@ -108,7 +108,7 @@ bool KonqSidebarDirTreeItem::hasStandardIcon() return m_fileItem->iconName() == "folder"; } -void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) +void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) { if (m_fileItem->isLink()) { @@ -116,7 +116,7 @@ void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup f.setItalic( TRUE ); _painter->setFont( f ); } - TQListViewItem::paintCell( _painter, _cg, _column, _width, _alignment ); + TQListViewItem::paintCell( _painter, _cg, _column, _width, _tqalignment ); } KURL KonqSidebarDirTreeItem::externalURL() const @@ -134,7 +134,7 @@ TQString KonqSidebarDirTreeItem::externalMimeType() const bool KonqSidebarDirTreeItem::acceptsDrops( const TQStrList & formats ) { - if ( formats.contains("text/uri-list") ) + if ( formats.tqcontains("text/uri-list") ) return m_fileItem->acceptsDrops(); return false; } @@ -162,8 +162,8 @@ void KonqSidebarDirTreeItem::itemSelected() if ( m_fileItem->url().directory(false) == KGlobalSettings::trashPath() ) bInTrash = true; - TQMimeSource *data = TQApplication::clipboard()->data(); - bool paste = ( data->encodedData( data->format() ).size() != 0 ); + TQMimeSource *data = TQApplication::tqclipboard()->data(); + bool paste = ( data->tqencodedData( data->format() ).size() != 0 ); tree()->enableActions( true, true, paste, true && !bInTrash, true, true ); } @@ -197,7 +197,7 @@ void KonqSidebarDirTreeItem::paste() { // move or not move ? bool move = false; - TQMimeSource *data = TQApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::tqclipboard()->data(); if ( data->provides( "application/x-kde-cutselection" ) ) { move = KonqDrag::decodeIsCutSelection( data ); kdDebug(1201) << "move (from clipboard data) = " << move << endl; diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h index 050f19424..3a599c7e9 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h @@ -36,7 +36,7 @@ public: virtual void setOpen( bool open ); - virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ); + virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ); virtual bool acceptsDrops( const TQStrList & formats ); virtual void drop( TQDropEvent * ev ); diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index ac26b1285..401c4985a 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -357,7 +357,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item ) if (openItem) { // We have this directory listed already, just copy the entries as we - // can't use the dirlister, it would invalidate the old entries + // can't use the dirlister, it would tqinvalidate the old entries int size = KGlobal::iconLoader()->currentSize( KIcon::Small ); KonqSidebarTreeItem * parentItem = item; KonqSidebarDirTreeItem *oldItem = static_cast<KonqSidebarDirTreeItem *> (openItem->firstChild()); @@ -549,7 +549,7 @@ void KonqSidebarDirTreeModule::slotRedirection( const KURL & oldUrl, const KURL do { - if (item->alias.contains(newUrlStr)) continue; + if (item->alias.tqcontains(newUrlStr)) continue; kdDebug()<<"Redirectiong element"<<endl; // We need to update the URL in m_dictSubDirs m_dictSubDirs.insert( newUrlStr, item ); @@ -574,7 +574,7 @@ void KonqSidebarDirTreeModule::slotListingStopped( const KURL & url ) if ( item->childCount() == 0 ) { item->setExpandable( false ); - item->repaint(); + item->tqrepaint(); } m_pTree->stopAnimation( item ); diff --git a/konqueror/sidebar/trees/history_module/history_dlg.ui b/konqueror/sidebar/trees/history_module/history_dlg.ui index 32fd31296..a90c1c49e 100644 --- a/konqueror/sidebar/trees/history_module/history_dlg.ui +++ b/konqueror/sidebar/trees/history_module/history_dlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KonqSidebarHistoryDlg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KonqHistoryDlg</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbLimits</cstring> </property> @@ -40,14 +40,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>240</width> <height>16</height> </size> </property> </spacer> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>cbExpire</cstring> </property> @@ -60,7 +60,7 @@ <cstring>spinExpire</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lEntries</cstring> </property> @@ -78,7 +78,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbFonts</cstring> </property> @@ -99,12 +99,12 @@ <cstring>spinOlder</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="2"> + <widget class="TQComboBox" row="1" column="2"> <property name="name"> <cstring>comboOlder</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lbNewer</cstring> </property> @@ -112,12 +112,12 @@ <string>URLs newer than</string> </property> </widget> - <widget class="QComboBox" row="0" column="2"> + <widget class="TQComboBox" row="0" column="2"> <property name="name"> <cstring>comboNewer</cstring> </property> </widget> - <widget class="QPushButton" row="1" column="3"> + <widget class="TQPushButton" row="1" column="3"> <property name="name"> <cstring>btnFontOlder</cstring> </property> @@ -125,7 +125,7 @@ <string>Choose Font...</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lbOlder</cstring> </property> @@ -133,7 +133,7 @@ <string>URLs older than</string> </property> </widget> - <widget class="QPushButton" row="0" column="3"> + <widget class="TQPushButton" row="0" column="3"> <property name="name"> <cstring>btnFontNewer</cstring> </property> @@ -143,7 +143,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbDetails</cstring> </property> @@ -154,7 +154,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbDetailedTips</cstring> </property> @@ -167,7 +167,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -175,7 +175,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnClearHistory</cstring> </property> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>418</width> <height>0</height> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>30</height> diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp index 981be03bb..57647c04c 100644 --- a/konqueror/sidebar/trees/history_module/history_item.cpp +++ b/konqueror/sidebar/trees/history_module/history_item.cpp @@ -29,7 +29,7 @@ #include <kiconloader.h> #define MYMODULE static_cast<KonqSidebarHistoryModule*>(module()) -#define MYGROUP static_cast<KonqSidebarHistoryGroupItem*>(parent()) +#define MYGROUP static_cast<KonqSidebarHistoryGroupItem*>(tqparent()) KonqSidebarHistorySettings * KonqSidebarHistoryItem::s_settings = 0L; @@ -126,30 +126,30 @@ TQString KonqSidebarHistoryItem::toolTipText() const } void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg, - int column, int width, int alignment ) + int column, int width, int tqalignment ) { TQDateTime dt; - TQDateTime current = TQDateTime::currentDateTime(); + TQDateTime current = TQDateTime::tqcurrentDateTime(); if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS ) - dt = current.addDays( - s_settings->m_valueYoungerThan ); + dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueYoungerThan )); else - dt = current.addSecs( - (s_settings->m_valueYoungerThan * 60) ); + dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueYoungerThan * 60) )); if ( m_entry->lastVisited > dt ) p->setFont( s_settings->m_fontYoungerThan ); else { if ( s_settings->m_metricOlderThan == KonqSidebarHistorySettings::DAYS ) - dt = current.addDays( - s_settings->m_valueOlderThan ); + dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueOlderThan )); else - dt = current.addSecs( - (s_settings->m_valueOlderThan * 60) ); + dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueOlderThan * 60) )); if ( m_entry->lastVisited < dt ) p->setFont( s_settings->m_fontOlderThan ); } - KonqSidebarTreeItem::paintCell( p, cg, column, width, alignment ); + KonqSidebarTreeItem::paintCell( p, cg, column, width, tqalignment ); } /////////////////////////////////////////////////////////////////// diff --git a/konqueror/sidebar/trees/history_module/history_item.h b/konqueror/sidebar/trees/history_module/history_item.h index 1c6c7c4c4..0ddc7ae4e 100644 --- a/konqueror/sidebar/trees/history_module/history_item.h +++ b/konqueror/sidebar/trees/history_module/history_item.h @@ -60,7 +60,7 @@ public: static void setSettings( KonqSidebarHistorySettings *s ) { s_settings = s; } virtual void paintCell( TQPainter *, const TQColorGroup & cg, int column, - int width, int alignment ); + int width, int tqalignment ); private: const KonqHistoryEntry *m_entry; diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index a3806be94..2c8cd5728 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -54,7 +54,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() )); m_dict.setAutoDelete( true ); - m_currentTime = TQDateTime::currentDateTime(); + m_currentTime = TQDateTime::tqcurrentDateTime(); KConfig *kc = KGlobal::config(); KConfigGroupSaver cs( kc, "HistorySettings" ); @@ -132,7 +132,7 @@ void KonqSidebarHistoryModule::slotCreateItems() KonqHistoryEntry *entry; KonqHistoryList entries( KonqHistoryManager::kself()->entries() ); KonqHistoryIterator it( entries ); - m_currentTime = TQDateTime::currentDateTime(); + m_currentTime = TQDateTime::tqcurrentDateTime(); // the group item and the item of the serverroot '/' get a fav-icon // if available. All others get the protocol icon. @@ -149,7 +149,7 @@ void KonqSidebarHistoryModule::slotCreateItems() TQStringList::Iterator it2 = openGroups.begin(); KonqSidebarHistoryGroupItem *group; while ( it2 != openGroups.end() ) { - group = m_dict.find( *it2 ); + group = m_dict.tqfind( *it2 ); if ( group ) group->setOpen( true ); @@ -171,7 +171,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry ) if ( !m_initialized ) return; - m_currentTime = TQDateTime::currentDateTime(); + m_currentTime = TQDateTime::tqcurrentDateTime(); KonqSidebarHistoryGroupItem *group = getGroupItem( entry->url ); KonqSidebarHistoryItem *item = group->findChild( entry ); if ( !item ) @@ -185,7 +185,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry ) t->lockScrolling( true ); group->sort(); m_topLevelItem->sort(); - qApp->processOneEvent(); + tqApp->processOneEvent(); t->lockScrolling( false ); } @@ -195,7 +195,7 @@ void KonqSidebarHistoryModule::slotEntryRemoved( const KonqHistoryEntry *entry ) return; TQString groupKey = groupForURL( entry->url ); - KonqSidebarHistoryGroupItem *group = m_dict.find( groupKey ); + KonqSidebarHistoryGroupItem *group = m_dict.tqfind( groupKey ); if ( !group ) return; @@ -324,7 +324,7 @@ void KonqSidebarHistoryModule::groupOpened( KonqSidebarHistoryGroupItem *item, b KonqSidebarHistoryGroupItem * KonqSidebarHistoryModule::getGroupItem( const KURL& url ) { const TQString& groupKey = groupForURL( url ); - KonqSidebarHistoryGroupItem *group = m_dict.find( groupKey ); + KonqSidebarHistoryGroupItem *group = m_dict.tqfind( groupKey ); if ( !group ) { group = new KonqSidebarHistoryGroupItem( url, m_topLevelItem ); diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp index 6871415a0..20ca214d4 100644 --- a/konqueror/sidebar/trees/history_module/history_settings.cpp +++ b/konqueror/sidebar/trees/history_module/history_settings.cpp @@ -56,8 +56,8 @@ void KonqSidebarHistorySettings::readSettings(bool global) m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 ); m_valueOlderThan = config->readNumEntry("Value olderThan", 2 ); - TQString minutes = TQString::fromLatin1("minutes"); - TQString days = TQString::fromLatin1("days"); + TQString minutes = TQString::tqfromLatin1("minutes"); + TQString days = TQString::tqfromLatin1("days"); TQString metric = config->readEntry("Metric youngerThan", days ); m_metricYoungerThan = (metric == days) ? DAYS : MINUTES; metric = config->readEntry("Metric olderThan", days ); @@ -83,8 +83,8 @@ void KonqSidebarHistorySettings::applySettings() config->writeEntry("Value youngerThan", m_valueYoungerThan ); config->writeEntry("Value olderThan", m_valueOlderThan ); - TQString minutes = TQString::fromLatin1("minutes"); - TQString days = TQString::fromLatin1("days"); + TQString minutes = TQString::tqfromLatin1("minutes"); + TQString days = TQString::tqfromLatin1("days"); config->writeEntry("Metric youngerThan", m_metricYoungerThan == DAYS ? days : minutes ); config->writeEntry("Metric olderThan", m_metricOlderThan == DAYS ? diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index ccedf65d9..532e3a164 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -144,8 +144,8 @@ void HistorySidebarConfig::load() void HistorySidebarConfig::save() { - Q_UINT32 age = dialog->cbExpire->isChecked() ? dialog->spinExpire->value() : 0; - Q_UINT32 count = dialog->spinEntries->value(); + TQ_UINT32 age = dialog->cbExpire->isChecked() ? dialog->spinExpire->value() : 0; + TQ_UINT32 count = dialog->spinEntries->value(); KConfig config("konquerorrc"); config.setGroup("HistorySettings"); @@ -156,13 +156,13 @@ void HistorySidebarConfig::save() TQDataStream streamAge( dataAge, IO_WriteOnly ); streamAge << age << "foo"; kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", - "notifyMaxAge(Q_UINT32, TQCString)", dataAge ); + "notifyMaxAge(TQ_UINT32, TQCString)", dataAge ); TQByteArray dataCount; TQDataStream streamCount( dataCount, IO_WriteOnly ); streamCount << count << "foo"; kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", - "notifyMaxCount(Q_UINT32, TQCString)", dataCount ); + "notifyMaxCount(TQ_UINT32, TQCString)", dataCount ); m_settings->m_valueYoungerThan = dialog->spinNewer->value(); m_settings->m_valueOlderThan = dialog->spinOlder->value(); diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index c1c98e07a..9b342f20e 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -55,7 +55,7 @@ static const int autoOpenTimeout = 750; getModule KonqSidebarTree::getPluginFactory(TQString name) { - if (!pluginFactories.contains(name)) + if (!pluginFactories.tqcontains(name)) { KLibLoader *loader = KLibLoader::self(); TQString libName = pluginInfo[name]; @@ -114,8 +114,8 @@ public: }; -KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path ) - : KListView( parentWidget ), +KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *tqparentWidget, int virt, const TQString& path ) + : KListView( tqparentWidget ), m_currentTopLevelItem( 0 ), m_toolTip( this ), m_scrollingLocked( false ), @@ -272,7 +272,7 @@ void KonqSidebarTree::contentsDragMoveEvent( TQDragMoveEvent *e ) TQListViewItem *item = itemAt( contentsToViewport( e->pos() ) ); // Accept drops on the background, if URLs - if ( !item && m_lstDropFormats.contains("text/uri-list") ) + if ( !item && m_lstDropFormats.tqcontains("text/uri-list") ) { m_dropItem = 0; e->acceptAction(); @@ -417,7 +417,7 @@ bool KonqSidebarTree::acceptDrag(TQDropEvent* e) const { // for KListViewMode... for( int i = 0; e->format( i ); i++ ) - if ( d->m_dropFormats.contains(e->format( i ) ) ) + if ( d->m_dropFormats.tqcontains(e->format( i ) ) ) return true; return false; } @@ -482,7 +482,7 @@ void KonqSidebarTree::slotExecuted( TQListViewItem *item ) void KonqSidebarTree::slotMouseButtonPressed( int _button, TQListViewItem* _item, const TQPoint&, int col ) { KonqSidebarTreeItem * item = static_cast<KonqSidebarTreeItem*>( _item ); - if (_button == RightButton) + if (_button == Qt::RightButton) { if ( item && col < 2) { @@ -498,10 +498,10 @@ void KonqSidebarTree::slotMouseButtonClicked(int _button, TQListViewItem* _item, if(_item && col < 2) { switch( _button ) { - case LeftButton: + case Qt::LeftButton: slotExecuted( item ); break; - case MidButton: + case Qt::MidButton: item->middleButtonClicked(); break; } @@ -516,7 +516,7 @@ void KonqSidebarTree::slotAutoOpenFolder() return; m_dropItem->setOpen( true ); - m_dropItem->repaint(); + m_dropItem->tqrepaint(); } void KonqSidebarTree::rescanConfiguration() @@ -606,7 +606,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path // Version 5 includes the audiocd browser // Version 6 includes the printmanager and lan browser const int currentVersion = 6; - TQString key = TQString::fromLatin1("X-KDE-DirTreeVersionNumber"); + TQString key = TQString::tqfromLatin1("X-KDE-DirTreeVersionNumber"); KSimpleConfig versionCfg( path + "/.directory" ); int versionNumber = versionCfg.readNumEntry( key, 1 ); kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl; @@ -652,7 +652,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path { //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl; if ( *eIt != "." && *eIt != ".." - && !entries.contains( *eIt ) && !dirEntries.contains( *eIt ) ) + && !entries.tqcontains( *eIt ) && !dirEntries.tqcontains( *eIt ) ) { // we don't have that one yet -> copy it. TQString cp("cp -R -- "); cp += KProcess::quote(dirtree_dir + *eIt); @@ -813,7 +813,7 @@ void KonqSidebarTree::slotAnimation() for (; it != end; ++it ) { uint & iconNumber = it.data().iconNumber; - TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); + TQString icon = TQString::tqfromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); it.key()->setPixmap( 0, SmallIcon( icon)); iconNumber++; @@ -836,7 +836,7 @@ void KonqSidebarTree::startAnimation( KonqSidebarTreeItem * item, const char * i void KonqSidebarTree::stopAnimation( KonqSidebarTreeItem * item ) { - MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.find(item); + MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.tqfind(item); if ( it != m_mapCurrentOpeningFolders.end() ) { item->setPixmap( 0, it.data().originalPixmap ); @@ -882,7 +882,7 @@ void KonqSidebarTree::enableActions( bool copy, bool cut, bool paste, bool KonqSidebarTree::tabSupport() { // see if the newTab() dcop function is available (i.e. the sidebar is embedded into konqueror) - DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name()); DCOPReply reply = ref.call("functions()"); if (reply.isValid()) { QCStringList funcs; @@ -907,21 +907,21 @@ void KonqSidebarTree::showToplevelContextMenu() if (!m_collection) { m_collection = new KActionCollection( this, "bookmark actions" ); - (void) new KAction( i18n("&Create New Folder..."), "folder_new", 0, this, + (void) new KAction( i18n("&Create New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); - (void) new KAction( i18n("Delete Folder"), "editdelete", 0, this, + (void) new KAction( i18n("Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); - (void) new KAction( i18n("Rename"), 0, this, + (void) new KAction( i18n("Rename"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRename() ), m_collection, "rename"); - (void) new KAction( i18n("Delete Link"), "editdelete", 0, this, + (void) new KAction( i18n("Delete Link"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), m_collection, "delete_link"); - (void) new KAction( i18n("Properties"), "edit", 0, this, + (void) new KAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), m_collection, "item_properties"); - (void) new KAction( i18n("Open in New Window"), "window_new", 0, this, + (void) new KAction( i18n("Open in New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); - (void) new KAction( i18n("Open in New Tab"), "tab_new", 0, this, + (void) new KAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); - (void) new KAction( i18n("Copy Link Address"), "editcopy", 0, this, + (void) new KAction( i18n("Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); } @@ -1023,7 +1023,7 @@ void KonqSidebarTree::slotOpenNewWindow() void KonqSidebarTree::slotOpenTab() { if (!m_currentTopLevelItem) return; - DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name()); ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() ); } @@ -1031,8 +1031,8 @@ void KonqSidebarTree::slotCopyLocation() { if (!m_currentTopLevelItem) return; KURL url = m_currentTopLevelItem->externalURL(); - kapp->clipboard()->setData( new KURLDrag(url, 0), QClipboard::Selection ); - kapp->clipboard()->setData( new KURLDrag(url, 0), QClipboard::Clipboard ); + kapp->tqclipboard()->setData( new KURLDrag(url, 0), QClipboard::Selection ); + kapp->tqclipboard()->setData( new KURLDrag(url, 0), QClipboard::Clipboard ); } /////////////////////////////////////////////////////////////////// @@ -1045,7 +1045,7 @@ void KonqSidebarTreeToolTip::maybeTip( const TQPoint &point ) if ( item ) { TQString text = static_cast<KonqSidebarTreeItem*>( item )->toolTipText(); if ( !text.isEmpty() ) - tip ( m_view->itemRect( item ), text ); + tip ( m_view->tqitemRect( item ), text ); } } diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h index 269803a84..8db2a613e 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.h +++ b/konqueror/sidebar/trees/konq_sidebartree.h @@ -50,7 +50,7 @@ typedef struct DirTreeConfigData_ } DirTreeConfigData; -class KonqSidebarTreeToolTip : public QToolTip +class KonqSidebarTreeToolTip : public TQToolTip { public: KonqSidebarTreeToolTip( TQListView *view ) : TQToolTip( view->viewport() ), m_view( view ) {} @@ -77,7 +77,7 @@ class KonqSidebarTree : public KListView, public KDirNotify { Q_OBJECT public: - KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path ); + KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *tqparentWidget, int virt, const TQString& path ); virtual ~KonqSidebarTree(); void followURL( const KURL &url ); diff --git a/konqueror/sidebar/trees/konq_sidebartreeitem.h b/konqueror/sidebar/trees/konq_sidebartreeitem.h index d39743b90..9fc313af2 100644 --- a/konqueror/sidebar/trees/konq_sidebartreeitem.h +++ b/konqueror/sidebar/trees/konq_sidebartreeitem.h @@ -37,7 +37,7 @@ class KonqSidebarTreeTopLevelItem; * Items belonging to a given module are created and managed by the module, * but they should all be KonqSidebarTreeItems, for the event handling in KonqSidebarTree. */ -class KonqSidebarTreeItem : public QListViewItem +class KonqSidebarTreeItem : public TQListViewItem { public: // Create an item under another one diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp index 4ce6fe445..91d4d1eb5 100644 --- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp +++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp @@ -50,14 +50,14 @@ void KonqSidebarTreeTopLevelItem::setOpen( bool open ) void KonqSidebarTreeTopLevelItem::itemSelected() { kdDebug() << "KonqSidebarTreeTopLevelItem::itemSelected" << endl; - TQMimeSource *data = TQApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::tqclipboard()->data(); bool paste = m_bTopLevelGroup && data->provides("text/uri-list"); tree()->enableActions( true, true, paste, true, true, true /*rename*/ ); } bool KonqSidebarTreeTopLevelItem::acceptsDrops( const TQStrList & formats ) { - return formats.contains("text/uri-list") && + return formats.tqcontains("text/uri-list") && ( m_bTopLevelGroup || !externalURL().isEmpty() ); } @@ -157,7 +157,7 @@ void KonqSidebarTreeTopLevelItem::paste() { // move or not move ? bool move = false; - TQMimeSource *data = TQApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::tqclipboard()->data(); if ( data->provides( "application/x-kde-cutselection" ) ) { move = KonqDrag::decodeIsCutSelection( data ); kdDebug(1201) << "move (from clipboard data) = " << move << endl; diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index 219063026..916e152fd 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -75,14 +75,14 @@ void KonqSidebar_Tree::cut() { TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L, true ); if (drag) - TQApplication::clipboard()->setData( drag ); + TQApplication::tqclipboard()->setData( drag ); } void KonqSidebar_Tree::copy() { TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L ); if (drag) - TQApplication::clipboard()->setData( drag ); + TQApplication::tqclipboard()->setData( drag ); } void KonqSidebar_Tree::paste() @@ -147,7 +147,7 @@ extern "C" i18n( "Select type:" ), names ); if (!item.isEmpty()) { - int id=names.findIndex( item ); + int id=names.tqfindIndex( item ); if (id==-1) return false; KSimpleConfig ksc2(*list.at(id)); ksc2.setGroup("Desktop Entry"); diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index eb10414a9..36109ff86 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -82,7 +82,7 @@ class KHTMLSideBar : public KHTMLPart virtual void urlSelected( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args = KParts::URLArgs()) { - if (button == LeftButton ){ + if (button == Qt::LeftButton ){ if (_target.lower() == "_self") { openURL(url); } else if (_target.lower() == "_blank") { @@ -92,7 +92,7 @@ class KHTMLSideBar : public KHTMLPart } return; } - if (button == MidButton) { + if (button == Qt::MidButton) { emit openURLNewWindow(completeURL(url).url(), args); return; diff --git a/konsole/doc/VT100/Table.Codes b/konsole/doc/VT100/Table.Codes index 6ece0f4bf..2f0554a0b 100644 --- a/konsole/doc/VT100/Table.Codes +++ b/konsole/doc/VT100/Table.Codes @@ -1070,7 +1070,7 @@ DECALN.sect Command DECALN.code HSH|8| DECALN.text Causes the VT100 to fill it's screen with - uppercase Es for screen focus and alignment. + uppercase Es for screen focus and tqalignment. DECALN.table.XPS Subcode|Emulation|Scope|Operation|Args|Meaning N/A|VT100|scr|helpAlign||see above diff --git a/konsole/doc/VT100/techref.html b/konsole/doc/VT100/techref.html index 6e36f39e5..6b39bda55 100644 --- a/konsole/doc/VT100/techref.html +++ b/konsole/doc/VT100/techref.html @@ -2234,7 +2234,7 @@ Work is currently in progress to fix this issue. <tr><td><p></td> <tr><td></td> <td colspan=6> Causes the VT100 to fill it's screen with - uppercase Es for screen focus and alignment. + uppercase Es for screen focus and tqalignment. <tr><td><p></td></tr> <tr> <td></td> diff --git a/konsole/konsole/TEHistory.cpp b/konsole/konsole/TEHistory.cpp index cbe8b199d..917fb739e 100644 --- a/konsole/konsole/TEHistory.cpp +++ b/konsole/konsole/TEHistory.cpp @@ -457,7 +457,7 @@ void HistoryScrollBlockArray::addCells(ca a[], int count) size_t *pLen = new size_t; *pLen = count; - m_lineLengths.replace(m_blockArray.getCurrent(), pLen); + m_lineLengths.tqreplace(m_blockArray.getCurrent(), pLen); } void HistoryScrollBlockArray::addLine(bool) diff --git a/konsole/konsole/TEScreen.cpp b/konsole/konsole/TEScreen.cpp index 54b479844..7af02c247 100644 --- a/konsole/konsole/TEScreen.cpp +++ b/konsole/konsole/TEScreen.cpp @@ -783,7 +783,7 @@ void TEScreen::compose(TQString compose) TQChar c(image[lastPos].c); compose.prepend(c); compose.compose(); - image[lastPos].c = compose[0].unicode(); + image[lastPos].c = compose[0].tqunicode(); } // Region commands ------------------------------------------------------------- @@ -1023,7 +1023,7 @@ void TEScreen::clearEntireScreen() } /*! fill screen with 'E' - This is to aid screen alignment + This is to aid screen tqalignment */ void TEScreen::helpAlign() @@ -1190,7 +1190,7 @@ TQString TEScreen::getSelText(bool preserve_line_breaks) static TQString makeString(int *m, int d, bool stripTrailingSpaces) { - TQChar* qc = new QChar[d]; + TQChar* qc = new TQChar[d]; int last_space = -1; int j = 0; @@ -1281,7 +1281,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream) while (hX < eol && hX <= sel_Right % columns) { - Q_UINT16 c = hist->getCell(hY, hX++).c; + TQ_UINT16 c = hist->getCell(hY, hX++).c; if (c) m[d++] = c; s++; @@ -1293,7 +1293,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream) } else { // or from screen image. if (testIsSelected((s - hist_BR) % columns, (s - hist_BR) / columns)) { - Q_UINT16 c = image[s++ - hist_BR].c; + TQ_UINT16 c = image[s++ - hist_BR].c; if (c) { m[d++] = c; newlineneeded = true; @@ -1334,7 +1334,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream) while (hX < eol) { - Q_UINT16 c = hist->getCell(hY, hX++).c; + TQ_UINT16 c = hist->getCell(hY, hX++).c; if (c) m[d++] = c; s++; @@ -1401,7 +1401,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream) while (s <= eol) { - Q_UINT16 c = image[s++ - hist_BR].c; + TQ_UINT16 c = image[s++ - hist_BR].c; if (c) m[d++] = c; } diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index cb16ff497..6a97e46cd 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -144,7 +144,7 @@ static const ColorEntry base_color_table[TABLE_COLORS] = void TEWidget::setDefaultBackColor(const TQColor& color) { defaultBgColor = color; - if (qAlpha(blend_color) != 0xff && !backgroundPixmap()) + if (tqAlpha(blend_color) != 0xff && !backgroundPixmap()) setBackgroundColor(getDefaultBackColor()); } @@ -165,14 +165,14 @@ void TEWidget::setColorTable(const ColorEntry table[]) for (int i = 0; i < TABLE_COLORS; i++) color_table[i] = table[i]; const TQPixmap* pm = backgroundPixmap(); if (!pm) - if (!argb_visual || (qAlpha(blend_color) == 0xff)) + if (!argb_visual || (tqAlpha(blend_color) == 0xff)) setBackgroundColor(getDefaultBackColor()); else { - float alpha = qAlpha(blend_color) / 255.; - int pixel = qAlpha(blend_color) << 24 | - int(qRed(blend_color) * alpha) << 16 | - int(qGreen(blend_color) * alpha) << 8 | - int(qBlue(blend_color) * alpha); + float alpha = tqAlpha(blend_color) / 255.; + int pixel = tqAlpha(blend_color) << 24 | + int(tqRed(blend_color) * alpha) << 16 | + int(tqGreen(blend_color) * alpha) << 8 | + int(tqBlue(blend_color) * alpha); setBackgroundColor(TQColor(blend_color, pixel)); } update(); @@ -191,14 +191,14 @@ void TEWidget::setColorTable(const ColorEntry table[]) xterm fonts have these at 0x00..0x1f. QT's iso mapping leaves 0x00..0x7f without any changes. But the graphicals - come in here as proper unicode characters. + come in here as proper tqunicode characters. We treat non-iso10646 fonts as VT100 extended and do the requiered mapping - from unicode to 0x00..0x1f. The remaining translation is then left to the + from tqunicode to 0x00..0x1f. The remaining translation is then left to the QCodec. */ -static inline bool isLineChar(Q_UINT16 c) { return ((c & 0xFF80) == 0x2500);} +static inline bool isLineChar(TQ_UINT16 c) { return ((c & 0xFF80) == 0x2500);} // assert for i in [0..31] : vt100extended(vt100_graphics[i]) == i. @@ -213,7 +213,7 @@ unsigned short vt100_graphics[32] = /* static TQChar vt100extended(TQChar c) { - switch (c.unicode()) + switch (c.tqunicode()) { case 0x25c6 : return 1; case 0x2592 : return 2; @@ -265,7 +265,7 @@ void TEWidget::fontChange(const TQFont &) // "Base character width on widest ASCII character. This prevents too wide // characters in the presence of double wide (e.g. Japanese) characters." // Get the width from representative normal width characters - font_w = qRound((double)fm.width(REPCHAR)/(double)strlen(REPCHAR)); + font_w = tqRound((double)fm.width(REPCHAR)/(double)strlen(REPCHAR)); fixed_font = true; int fw = fm.width(REPCHAR[0]); @@ -382,7 +382,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) ,m_cursorCol(0) ,m_isIMEdit(false) ,m_isIMSel(false) -,blend_color(qRgba(0,0,0,0xff)) +,blend_color(tqRgba(0,0,0,0xff)) { // The offsets are not yet calculated. // Do not calculate these too often to be more smoothly when resizing @@ -394,7 +394,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) this, TQT_SLOT(onClearSelection()) ); scrollbar = new TQScrollBar(this); - scrollbar->setCursor( arrowCursor ); + scrollbar->setCursor( tqarrowCursor ); connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int))); blinkT = new TQTimer(this); @@ -405,14 +405,14 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) setMouseMarks(true); setColorTable(base_color_table); // init color table - qApp->installEventFilter( this ); //FIXME: see below + tqApp->installEventFilter( this ); //FIXME: see below KCursor::setAutoHideCursor( this, true ); // Init DnD //////////////////////////////////////////////////////////////// setAcceptDrops(true); // attempt dragInfo.state = diNone; - setFocusPolicy( WheelFocus ); + setFocusPolicy( TQ_WheelFocus ); // im setInputMethodEnabled(true); @@ -428,7 +428,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) // Here's a start (David) TEWidget::~TEWidget() { - qApp->removeEventFilter( this ); + tqApp->removeEventFilter( this ); if (image) free(image); } @@ -439,7 +439,7 @@ TEWidget::~TEWidget() /* ------------------------------------------------------------------------- */ /** - A table for emulating the simple (single width) unicode drawing chars. + A table for emulating the simple (single width) tqunicode drawing chars. It represents the 250x - 257x glyphs. If it's zero, we can't use it. if it's not, it's encoded as follows: imagine a 5x5 grid where the points are numbered 0 to 24 left to top, top to bottom. Each point is represented by the corresponding bit. @@ -496,7 +496,7 @@ static void drawLineChar(TQPainter& paint, int x, int y, int w, int h, uchar cod int ex = x + w - 1; int ey = y + h - 1; - Q_UINT32 toDraw = LineChars[code]; + TQ_UINT32 toDraw = LineChars[code]; //Top lines: if (toDraw & TopL) @@ -576,7 +576,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y, } //Check for line-drawing char - if (isLineChar(drawstr[0].unicode())) + if (isLineChar(drawstr[0].tqunicode())) { uchar code = drawstr[0].cell(); if (LineChars[code]) @@ -587,7 +587,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y, } } - paint.drawText(x,y, w, font_h, Qt::AlignHCenter | Qt::DontClip, drawstr, -1); + paint.drawText(x,y, w, font_h, Qt::AlignHCenter | TQt::DontClip, drawstr, -1); x += w; } } @@ -614,7 +614,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, if (attr->isTransparent(color_table)) { if (pm) - paint.setBackgroundMode( TransparentMode ); + paint.setBackgroundMode( Qt::TransparentMode ); if (clear || (blinking && (attr->r & RE_BLINK))) erase(rect); } @@ -624,17 +624,17 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, attr->b == cacol(CO_DFT, colorsSwapped ? DEFAULT_FORE_COLOR : DEFAULT_BACK_COLOR) ) // draw background colors with 75% opacity - if ( argb_visual && qAlpha(blend_color) < 0xff ) { + if ( argb_visual && tqAlpha(blend_color) < 0xff ) { QRgb col = bColor.rgb(); - Q_UINT8 salpha = 192; - Q_UINT8 dalpha = 255 - salpha; + TQ_UINT8 salpha = 192; + TQ_UINT8 dalpha = 255 - salpha; int a, r, g, b; - a = QMIN( (qAlpha (col) * salpha) / 255 + (qAlpha (blend_color) * dalpha) / 255, 255 ); - r = QMIN( (qRed (col) * salpha) / 255 + (qRed (blend_color) * dalpha) / 255, 255 ); - g = QMIN( (qGreen (col) * salpha) / 255 + (qGreen (blend_color) * dalpha) / 255, 255 ); - b = QMIN( (qBlue (col) * salpha) / 255 + (qBlue (blend_color) * dalpha) / 255, 255 ); + a = QMIN( (tqAlpha (col) * salpha) / 255 + (tqAlpha (blend_color) * dalpha) / 255, 255 ); + r = QMIN( (tqRed (col) * salpha) / 255 + (tqRed (blend_color) * dalpha) / 255, 255 ); + g = QMIN( (tqGreen (col) * salpha) / 255 + (tqGreen (blend_color) * dalpha) / 255, 255 ); + b = QMIN( (tqBlue (col) * salpha) / 255 + (tqBlue (blend_color) * dalpha) / 255, 255 ); col = a << 24 | r << 16 | g << 8 | b; int pixel = a << 24 | (r * a / 255) << 16 | (g * a / 255) << 8 | (b * a / 255); @@ -673,7 +673,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, // Paint cursor if ((attr->r & RE_CURSOR) && !isPrinting) { - paint.setBackgroundMode( TransparentMode ); + paint.setBackgroundMode( Qt::TransparentMode ); int h = font_h - m_lineSpacing; TQRect r(rect.x(),rect.y()+m_lineSpacing/2,rect.width(),h); if (hasFocus()) @@ -695,8 +695,8 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, { // ### Disabled for now, since it causes problems with characters // that use the full width and/or height of the character cells. - //bool shadow = ( !isPrinting && qAlpha(blend_color) < 0xff - // && qGray( fColor.rgb() ) > 64 ); + //bool shadow = ( !isPrinting && tqAlpha(blend_color) < 0xff + // && tqGray( fColor.rgb() ) > 64 ); bool shadow = false; paint.setPen(fColor); int x = rect.x(); @@ -747,7 +747,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, { paint.setClipRect(rect); // On screen we use overstrike for bold - paint.setBackgroundMode( TransparentMode ); + paint.setBackgroundMode( Qt::TransparentMode ); int x = rect.x()+1; if(!fixed_font) { @@ -819,9 +819,9 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) cacol cb; // undefined int cr = -1; // undefined - int lins = QMIN(this->lines, QMAX(0,lines )); - int cols = QMIN(this->columns,QMAX(0,columns)); - TQChar *disstrU = new QChar[cols]; + int lins = TQMIN(this->lines, TQMAX(0,lines )); + int cols = TQMIN(this->columns,TQMAX(0,columns)); + TQChar *disstrU = new TQChar[cols]; char *dirtyMask = (char *) malloc(cols+2); //{ static int cnt = 0; printf("setImage %d\n",cnt++); } @@ -830,7 +830,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) const ca* lcl = &image[y*this->columns]; const ca* const ext = &newimg[y*columns]; - // The dirty mask indicates which characters need repainting. We also + // The dirty mask indicates which characters need tqrepainting. We also // mark surrounding neighbours dirty, in case the character exceeds // its cell boundaries memset(dirtyMask, 0, cols+2); @@ -856,7 +856,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) // where characters exceed their cell width. if (dirtyMask[x]) { - Q_UINT16 c = ext[x+0].c; + TQ_UINT16 c = ext[x+0].c; if ( !c ) continue; int p = 0; @@ -947,7 +947,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) mResizeLabel = new TQLabel(i18n("Size: XXX x XXX"), mResizeWidget); l->addWidget(mResizeLabel, 1, AlignCenter); mResizeWidget->setMinimumWidth(mResizeLabel->fontMetrics().width(i18n("Size: XXX x XXX"))+20); - mResizeWidget->setMinimumHeight(mResizeLabel->sizeHint().height()+20); + mResizeWidget->setMinimumHeight(mResizeLabel->tqsizeHint().height()+20); mResizeTimer = new TQTimer(this); connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide())); } @@ -988,7 +988,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe ) TQPainter paint; setUpdatesEnabled(false); paint.begin( this ); - paint.setBackgroundMode( TransparentMode ); + paint.setBackgroundMode( Qt::TransparentMode ); // Note that the actual widget size can be slightly larger // that the image (the size is truncated towards the smaller @@ -1065,7 +1065,7 @@ void TEWidget::print(TQPainter &paint, bool friendly, bool exact) pm.fill(); TQPainter pm_paint; - pm_paint.begin(&pm, this); + pm_paint.tqbegin(&pm, TQT_TQWIDGET(this)); paintContents(pm_paint, contentsRect(), true); pm_paint.end(); paint.drawPixmap(0, 0, pm); @@ -1089,15 +1089,15 @@ void TEWidget::paintContents(TQPainter &paint, const TQRect &rect, bool pm) int tLx = tL.x(); int tLy = tL.y(); - int lux = QMIN(columns-1, QMAX(0,(rect.left() - tLx - bX ) / font_w)); - int luy = QMIN(lines-1, QMAX(0,(rect.top() - tLy - bY ) / font_h)); - int rlx = QMIN(columns-1, QMAX(0,(rect.right() - tLx - bX ) / font_w)); - int rly = QMIN(lines-1, QMAX(0,(rect.bottom() - tLy - bY ) / font_h)); + int lux = TQMIN(columns-1, TQMAX(0,(rect.left() - tLx - bX ) / font_w)); + int luy = TQMIN(lines-1, TQMAX(0,(rect.top() - tLy - bY ) / font_h)); + int rlx = TQMIN(columns-1, TQMAX(0,(rect.right() - tLx - bX ) / font_w)); + int rly = TQMIN(lines-1, TQMAX(0,(rect.bottom() - tLy - bY ) / font_h)); - TQChar *disstrU = new QChar[columns]; + TQChar *disstrU = new TQChar[columns]; for (int y = luy; y <= rly; y++) { - Q_UINT16 c = image[loc(lux,y)].c; + TQ_UINT16 c = image[loc(lux,y)].c; int x = lux; if(!c && x) x--; // Search for start of multi-col char @@ -1152,14 +1152,14 @@ void TEWidget::blinkEvent() { blinking = !blinking; isBlinkEvent = true; - repaint(false); + tqrepaint(false); isBlinkEvent = false; } void TEWidget::blinkCursorEvent() { cursorBlinking = !cursorBlinking; - repaint(cursorRect, true); + tqrepaint(cursorRect, true); } /* ------------------------------------------------------------------------- */ @@ -1178,9 +1178,9 @@ void TEWidget::propagateSize() if (isFixedSize) { setSize(columns, lines); - TQFrame::setFixedSize(sizeHint()); - parentWidget()->adjustSize(); - parentWidget()->setFixedSize(parentWidget()->sizeHint()); + TQFrame::setFixedSize(tqsizeHint()); + tqparentWidget()->adjustSize(); + tqparentWidget()->setFixedSize(tqparentWidget()->tqsizeHint()); return; } if (image) @@ -1283,12 +1283,12 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) { //printf("press [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button()); - if ( possibleTripleClick && (ev->button()==LeftButton) ) { + if ( possibleTripleClick && (ev->button()==Qt::LeftButton) ) { mouseTripleClickEvent(ev); return; } - if ( !contentsRect().contains(ev->pos()) ) return; + if ( !contentsRect().tqcontains(ev->pos()) ) return; TQPoint tL = contentsRect().topLeft(); int tLx = tL.x(); int tLy = tL.y(); @@ -1296,7 +1296,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) TQPoint pos = TQPoint((ev->x()-tLx-bX+(font_w/2))/font_w,(ev->y()-tLy-bY)/font_h); //printf("press top left [%d,%d] by=%d\n",tLx,tLy, bY); - if ( ev->button() == LeftButton) + if ( ev->button() == Qt::LeftButton) { line_selection_mode = false; word_selection_mode = false; @@ -1333,14 +1333,14 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) } } } - else if ( ev->button() == MidButton ) + else if ( ev->button() == Qt::MidButton ) { if ( mouse_marks || (!mouse_marks && (ev->state() & ShiftButton)) ) emitSelection(true,ev->state() & ControlButton); else emit mouseSignal( 1, (ev->x()-tLx-bX)/font_w +1, (ev->y()-tLy-bY)/font_h +1 +scrollbar->value() -scrollbar->maxValue() ); } - else if ( ev->button() == RightButton ) + else if ( ev->button() == Qt::RightButton ) { if (mouse_marks || (ev->state() & ShiftButton)) { configureRequestPoint = TQPoint( ev->x(), ev->y() ); @@ -1354,7 +1354,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) void TEWidget::mouseMoveEvent(TQMouseEvent* ev) { // for auto-hiding the cursor, we need mouseTracking - if (ev->state() == NoButton ) return; + if (ev->state() == Qt::NoButton ) return; if (dragInfo.state == diPending) { // we had a mouse down, but haven't confirmed a drag yet @@ -1378,7 +1378,7 @@ void TEWidget::mouseMoveEvent(TQMouseEvent* ev) if (actSel == 0) return; // don't extend selection while pasting - if (ev->state() & MidButton) return; + if (ev->state() & Qt::MidButton) return; extendSelection( ev->pos() ); } @@ -1390,7 +1390,7 @@ void TEWidget::setSelectionEnd() void TEWidget::extendSelection( TQPoint pos ) { - //if ( !contentsRect().contains(ev->pos()) ) return; + //if ( !contentsRect().tqcontains(ev->pos()) ) return; TQPoint tL = contentsRect().topLeft(); int tLx = tL.x(); int tLy = tL.y(); @@ -1570,7 +1570,7 @@ void TEWidget::extendSelection( TQPoint pos ) void TEWidget::mouseReleaseEvent(TQMouseEvent* ev) { //printf("release [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button()); - if ( ev->button() == LeftButton) + if ( ev->button() == Qt::LeftButton) { emit isBusySelecting(false); // Ok.. we can breath again. if(dragInfo.state == diPending) @@ -1600,8 +1600,8 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev) } dragInfo.state = diNone; } - if ( !mouse_marks && ((ev->button() == RightButton && !(ev->state() & ShiftButton)) - || ev->button() == MidButton) ) { + if ( !mouse_marks && ((ev->button() == Qt::RightButton && !(ev->state() & ShiftButton)) + || ev->button() == Qt::MidButton) ) { TQPoint tL = contentsRect().topLeft(); int tLx = tL.x(); int tLy = tL.y(); @@ -1613,7 +1613,7 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev) void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev) { - if ( ev->button() != LeftButton) return; + if ( ev->button() != Qt::LeftButton) return; TQPoint tL = contentsRect().topLeft(); int tLx = tL.x(); @@ -1735,14 +1735,14 @@ void TEWidget::mouseTripleClickEvent(TQMouseEvent* ev) void TEWidget::focusInEvent( TQFocusEvent * ) { - repaint(cursorRect, true); // *do* erase area, to get rid of the + tqrepaint(cursorRect, true); // *do* erase area, to get rid of the // hollow cursor rectangle. } void TEWidget::focusOutEvent( TQFocusEvent * ) { - repaint(cursorRect, true); // don't erase area + tqrepaint(cursorRect, true); // don't erase area } bool TEWidget::focusNextPrevChild( bool next ) @@ -1759,7 +1759,7 @@ int TEWidget::charClass(UINT16 ch) const TQChar qch=TQChar(ch); if ( qch.isSpace() ) return ' '; - if ( qch.isLetterOrNumber() || word_characters.contains(qch, false) ) + if ( qch.isLetterOrNumber() || word_characters.tqcontains(qch, false) ) return 'a'; // Everything else is weird @@ -1774,7 +1774,7 @@ void TEWidget::setWordCharacters(TQString wc) void TEWidget::setMouseMarks(bool on) { mouse_marks = on; - setCursor( mouse_marks ? ibeamCursor : arrowCursor ); + setCursor( mouse_marks ? tqibeamCursor : tqarrowCursor ); } /* ------------------------------------------------------------------------- */ @@ -1796,24 +1796,24 @@ void TEWidget::emitText(TQString text) void TEWidget::emitSelection(bool useXselection,bool appendReturn) // Paste Clipboard by simulating keypress events { - TQApplication::clipboard()->setSelectionMode( useXselection ); - TQString text = TQApplication::clipboard()->text(); + TQApplication::tqclipboard()->setSelectionMode( useXselection ); + TQString text = TQApplication::tqclipboard()->text(); if(appendReturn) text.append("\r"); if ( ! text.isEmpty() ) { - text.replace("\n", "\r"); + text.tqreplace("\n", "\r"); TQKeyEvent e(TQEvent::KeyPress, 0,-1,0, text); emit keyPressedSignal(&e); // expose as a big fat keypress event emit clearSelectionSignal(); } - TQApplication::clipboard()->setSelectionMode( false ); + TQApplication::tqclipboard()->setSelectionMode( false ); } void TEWidget::setSelection(const TQString& t) { // Disconnect signal while WE set the clipboard - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); TQObject::disconnect( cb, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(onClearSelection()) ); @@ -1853,7 +1853,7 @@ void TEWidget::onClearSelection() //FIXME: an `eventFilter' has been installed instead of a `keyPressEvent' // due to a bug in `QT' or the ignorance of the author to prevent -// repaint events being emitted to the screen whenever one leaves +// tqrepaint events being emitted to the screen whenever one leaves // or reenters the screen to/from another application. // // Troll says one needs to change focusInEvent() and focusOutEvent(), @@ -1873,12 +1873,12 @@ void TEWidget::doScroll(int lines) bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) { if ( (e->type() == TQEvent::Accel || - e->type() == TQEvent::AccelAvailable ) && qApp->focusWidget() == this ) + e->type() == TQEvent::AccelAvailable ) && tqApp->tqfocusWidget() == this ) { - static_cast<TQKeyEvent *>( e )->ignore(); + TQT_TQKEYEVENT( e )->ignore(); return false; } - if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ ) + if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(this) /* when embedded */ && TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(tqparent()) /* when standalone */ ) return false; // not us if ( e->type() == TQEvent::KeyPress ) { @@ -1971,13 +1971,13 @@ void TEWidget::imEndEvent( TQIMEvent *e ) int tLx = tL.x(); int tLy = tL.y(); - TQRect repaintRect = TQRect( bX+tLx, bY+tLy+font_h*m_imStartLine, + TQRect tqrepaintRect = TQRect( bX+tLx, bY+tLy+font_h*m_imStartLine, contentsRect().width(), contentsRect().height() ); m_imStart = 0; m_imPreeditLength = 0; m_isIMEdit = m_isIMSel = false; - repaint( repaintRect, true ); + tqrepaint( tqrepaintRect, true ); } // Override any Ctrl+<key> accelerator when pressed with the keyboard @@ -1986,11 +1986,11 @@ bool TEWidget::event( TQEvent *e ) { if ( e->type() == TQEvent::AccelOverride ) { - TQKeyEvent *ke = static_cast<TQKeyEvent *>( e ); + TQKeyEvent *ke = TQT_TQKEYEVENT( e ); KKey key( ke ); int keyCodeQt = key.keyCodeQt(); - if ( !standalone() && (ke->state() == Qt::ControlButton) ) + if ( !standalone() && (ke->state() == ControlButton) ) { ke->accept(); return true; @@ -2097,7 +2097,7 @@ void TEWidget::clearImage() void TEWidget::calcGeometry() { - scrollbar->resize(TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent), + scrollbar->resize(TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent), contentsRect().height()); switch(scrollLoc) { @@ -2170,7 +2170,7 @@ void TEWidget::setFixedSize(int cols, int lins) TQFrame::setFixedSize(m_size); } -TQSize TEWidget::sizeHint() const +TQSize TEWidget::tqsizeHint() const { return m_size; } @@ -2235,7 +2235,7 @@ void TEWidget::dropEvent(TQDropEvent* event) TQString tmp; if (url.isLocalFile()) { tmp = url.path(); // local URL : remove protocol. This helps "ln" & "cd" and doesn't harm the others - } else if ( url.protocol() == TQString::fromLatin1( "mailto" ) ) { + } else if ( url.protocol() == TQString::tqfromLatin1( "mailto" ) ) { justPaste = true; break; } else { diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h index 2c11eac2e..af0bef9c1 100644 --- a/konsole/konsole/TEWidget.h +++ b/konsole/konsole/TEWidget.h @@ -39,7 +39,7 @@ class Konsole; class TQLabel; class TQTimer; -class TEWidget : public QFrame +class TEWidget : public TQFrame // a widget representing attributed text { Q_OBJECT @@ -96,7 +96,7 @@ public: void updateImageSize(); void setSize(int cols, int lins); void setFixedSize(int cols, int lins); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void setWordCharacters(TQString wc); TQString wordCharacters() { return word_characters; } diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp index 0bdb0f42c..f704297cf 100644 --- a/konsole/konsole/TEmuVt102.cpp +++ b/konsole/konsole/TEmuVt102.cpp @@ -307,7 +307,7 @@ void TEmuVt102::initTokenizer() #define ESC 27 #define CNTL(c) ((c)-'@') -// process an incoming unicode character +// process an incoming tqunicode character void TEmuVt102::onRcvChar(int cc) { int i; @@ -382,7 +382,7 @@ void TEmuVt102::XtermHack() for (i = 2; i < ppos && '0'<=pbuf[i] && pbuf[i]<'9' ; i++) arg = 10*arg + (pbuf[i]-'0'); if (pbuf[i] != ';') { ReportErrorToken(); return; } - TQChar *str = new QChar[ppos-i-2]; + TQChar *str = new TQChar[ppos-i-2]; for (int j = 0; j < ppos-i-2; j++) str[j] = pbuf[i+1+j]; TQString unistr(str,ppos-i-2); // arg == 1 doesn't change the title. In XTerm it only changes the icon name @@ -939,13 +939,13 @@ void TEmuVt102::onKeyPress( TQKeyEvent* ev ) const char* txt; int len; bool metaspecified; - if (keytrans->findEntry(ev->key(), encodeMode(MODE_NewLine , BITS_NewLine ) + // OLD, - encodeMode(MODE_Ansi , BITS_Ansi ) + // OBSOLETE, - encodeMode(MODE_AppCuKeys, BITS_AppCuKeys ) + // VT100 stuff - encodeMode(MODE_AppScreen, BITS_AppScreen ) + // VT100 stuff - encodeStat(ControlButton , BITS_Control ) + - encodeStat(ShiftButton , BITS_Shift ) + - encodeStat(AltButton , BITS_Alt ), + if (keytrans->findEntry(ev->key(), encodeMode(MODE_NewLine , BITS_NewLine ) + // OLD, + encodeMode(MODE_Ansi , BITS_Ansi ) + // OBSOLETE, + encodeMode(MODE_AppCuKeys , BITS_AppCuKeys ) + // VT100 stuff + encodeMode(MODE_AppScreen , BITS_AppScreen ) + // VT100 stuff + encodeStat(TQt::ControlButton , BITS_Control ) + + encodeStat(TQt::ShiftButton , BITS_Shift ) + + encodeStat(TQt::AltButton , BITS_Alt ), &cmd, &txt, &len, &metaspecified )) //printf("cmd: %d, %s, %d\n",cmd,txt,len); if (connected) @@ -963,21 +963,21 @@ void TEmuVt102::onKeyPress( TQKeyEvent* ev ) { switch(ev->key()) { - case Key_Down : gui->doScroll(+1); return; - case Key_Up : gui->doScroll(-1); return; - case Key_PageUp : gui->doScroll(-gui->Lines()/2); return; - case Key_PageDown : gui->doScroll(gui->Lines()/2); return; + case Qt::Key_Down : gui->doScroll(+1); return; + case Qt::Key_Up : gui->doScroll(-1); return; + case Qt::Key_PageUp : gui->doScroll(-gui->Lines()/2); return; + case Qt::Key_PageDown : gui->doScroll(gui->Lines()/2); return; } } // revert to non-history when typing if (scr->getHistCursor() != scr->getHistLines() && (!ev->text().isEmpty() - || ev->key()==Key_Down || ev->key()==Key_Up || ev->key()==Key_Left || ev->key()==Key_Right - || ev->key()==Key_PageUp || ev->key()==Key_PageDown)) + || ev->key()==Qt::Key_Down || ev->key()==Qt::Key_Up || ev->key()==Qt::Key_Left || ev->key()==Qt::Key_Right + || ev->key()==Qt::Key_PageUp || ev->key()==Qt::Key_PageDown)) scr->setHistCursor(scr->getHistLines()); if (cmd==CMD_send) { - if ((ev->state() & AltButton) && !metaspecified ) sendString("\033"); + if ((ev->state() & TQt::AltButton) && !metaspecified ) sendString("\033"); emit sndBlock(txt,len); return; } @@ -985,13 +985,13 @@ void TEmuVt102::onKeyPress( TQKeyEvent* ev ) // fall back handling if (!ev->text().isEmpty()) { - if (ev->state() & AltButton) sendString("\033"); // ESC, this is the ALT prefix + if (ev->state() & TQt::AltButton) sendString("\033"); // ESC, this is the ALT prefix TQCString s = m_codec->fromUnicode(ev->text()); // encode for application // FIXME: In Qt 2, TQKeyEvent::text() would return "\003" for Ctrl-C etc. // while in Qt 3 it returns the actual key ("c" or "C") which caused // the ControlButton to be ignored. This hack seems to work for // latin1 locales at least. Please anyone find a clean solution (malte) - if (ev->state() & ControlButton) + if (ev->state() & TQt::ControlButton) s.fill(ev->ascii(), 1); emit sndBlock(s.data(),s.length()); // we may well have s.length() > 1 return; diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp index 39aeab542..e136c3c38 100644 --- a/konsole/konsole/TEmulation.cpp +++ b/konsole/konsole/TEmulation.cpp @@ -251,7 +251,7 @@ int TEmulation::keymapNo() */ void TEmulation::onRcvChar(int c) -// process application unicode input to terminal +// process application tqunicode input to terminal // this is a trivial scanner { c &= 0xff; @@ -284,10 +284,10 @@ void TEmulation::onKeyPress( TQKeyEvent* ev ) scr->setHistCursor(scr->getHistLines()); if (!ev->text().isEmpty()) { // A block of text - // Note that the text is proper unicode. + // Note that the text is proper tqunicode. // We should do a conversion here, but since this // routine will never be used, we simply emit plain ascii. - emit sndBlock(ev->text().ascii(),ev->text().length()); + emit sndBlock(TQString(ev->text()).ascii(),ev->text().length()); } else if (ev->ascii()>0) { unsigned char c[1]; @@ -299,7 +299,7 @@ void TEmulation::onKeyPress( TQKeyEvent* ev ) // Unblocking, Byte to Unicode translation --------------------------------- -- /* - We are doing code conversion from locale to unicode first. + We are doing code conversion from locale to tqunicode first. */ void TEmulation::onRcvBlock(const char *s, int len) @@ -345,7 +345,7 @@ void TEmulation::onRcvBlock(const char *s, int len) if (r[j].category() == TQChar::Mark_NonSpacing) scr->compose(r.mid(j,1)); else - onRcvChar(r[j].unicode()); + onRcvChar(r[j].tqunicode()); } i = l; } @@ -418,9 +418,9 @@ bool TEmulation::findTextNext( const TQString &str, bool forward, bool caseSensi for (int i = (m_findPos==-1?0:m_findPos+1); i<(scr->getHistLines()+scr->getLines()); i++) { string = scr->getHistoryLine(i); if (regExp) - pos = string.find( TQRegExp(str,caseSensitive) ); + pos = string.tqfind( TQRegExp(str,caseSensitive) ); else - pos = string.find(str, 0, caseSensitive); + pos = string.tqfind(str, 0, caseSensitive); if(pos!=-1) { m_findPos=i; if(i>scr->getHistLines()) @@ -436,9 +436,9 @@ bool TEmulation::findTextNext( const TQString &str, bool forward, bool caseSensi for(int i = (m_findPos==-1?(scr->getHistLines()+scr->getLines()):m_findPos-1); i>=0; i--) { string = scr->getHistoryLine(i); if (regExp) - pos = string.find( TQRegExp(str,caseSensitive) ); + pos = string.tqfind( TQRegExp(str,caseSensitive) ); else - pos = string.find(str, 0, caseSensitive); + pos = string.tqfind(str, 0, caseSensitive); if(pos!=-1) { m_findPos=i; if(i>scr->getHistLines()) diff --git a/konsole/konsole/fontembedder.cpp b/konsole/konsole/fontembedder.cpp index dfbd88ce4..d0c17e084 100644 --- a/konsole/konsole/fontembedder.cpp +++ b/konsole/konsole/fontembedder.cpp @@ -26,7 +26,7 @@ using namespace std; -static Q_UINT32 charVal(TQChar val) +static TQ_UINT32 charVal(TQChar val) { if (val == ' ') return 0; @@ -34,13 +34,13 @@ static Q_UINT32 charVal(TQChar val) return 1; } -static Q_UINT32 readGlyphLine(TQTextStream& input) +static TQ_UINT32 readGlyphLine(TQTextStream& input) { TQString line = input.readLine(); while (line.length() < 5) line += ' '; - Q_UINT32 val = charVal(line[0]) | + TQ_UINT32 val = charVal(line[0]) | (charVal(line[1]) << 1) | (charVal(line[2]) << 2) | (charVal(line[3]) << 3) | @@ -48,7 +48,7 @@ static Q_UINT32 readGlyphLine(TQTextStream& input) return val; } -static Q_UINT32 readGlyph(TQTextStream& input) +static TQ_UINT32 readGlyph(TQTextStream& input) { return readGlyphLine(input) | (readGlyphLine(input) << 5) | @@ -72,7 +72,7 @@ int main(int argc, char **argv) TQTextStream input(&inFile); - Q_UINT32 glyphStates[128]; + TQ_UINT32 glyphStates[128]; for (int i = 0; i < 128; ++i) glyphStates[i] = 0; //nothing.. @@ -98,7 +98,7 @@ int main(int argc, char **argv) //Output. cout<<"// WARNING: Autogenerated by \"fontembedder " << argv[1] << "\".\n"; cout<<"// You probably do not want to hand-edit this!\n\n"; - cout<<"static const Q_UINT32 LineChars[] = {\n"; + cout<<"static const TQ_UINT32 LineChars[] = {\n"; //Nicely formatted: 8 per line, 16 lines for (int line = 0; line < 128; line += 8) diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp index 36e299bc0..de35d49ff 100644 --- a/konsole/konsole/keytrans.cpp +++ b/konsole/konsole/keytrans.cpp @@ -90,10 +90,10 @@ KeyTrans::KeyTrans(const TQString& path) else { m_id = m_path; - int i = m_id.findRev('/'); + int i = m_id.tqfindRev('/'); if (i > -1) m_id = m_id.mid(i+1); - i = m_id.findRev('.'); + i = m_id.tqfindRev('.'); if (i > -1) m_id = m_id.left(i); } @@ -360,11 +360,11 @@ void KeyTrans::readConfig() TQCString txt = #include "default.keytab.h" ; - buf=new TQBuffer(txt); + buf=TQT_TQIODEVICE(new TQBuffer(txt)); } else { - buf=new TQFile(m_path); + buf=TQT_TQIODEVICE(new TQFile(m_path)); }; KeytabReader ktr(m_path,*buf); ktr.parseTo(this); @@ -533,8 +533,8 @@ void KeyTransSymbols::defKeySyms() defKeySym("Up", Qt::Key_Up ); defKeySym("Right", Qt::Key_Right ); defKeySym("Down", Qt::Key_Down ); - defKeySym("Prior", Qt::Key_Prior ); - defKeySym("Next", Qt::Key_Next ); + defKeySym("Prior", TQt::Key_Prior ); + defKeySym("Next", TQt::Key_Next ); defKeySym("Shift", Qt::Key_Shift ); defKeySym("Control", Qt::Key_Control ); defKeySym("Meta", Qt::Key_Meta ); @@ -670,8 +670,8 @@ static TQIntDict<KeyTrans> * numb2keymap = 0L; KeyTrans* KeyTrans::find(int numb) { - KeyTrans* res = numb2keymap->find(numb); - return res ? res : numb2keymap->find(0); + KeyTrans* res = numb2keymap->tqfind(numb); + return res ? res : numb2keymap->tqfind(0); } KeyTrans* KeyTrans::find(const TQString &id) @@ -683,7 +683,7 @@ KeyTrans* KeyTrans::find(const TQString &id) return it.current(); ++it; } - return numb2keymap->find(0); + return numb2keymap->tqfind(0); } int KeyTrans::count() diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index ecef79d4a..37f53bfb6 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -112,6 +112,7 @@ Time to start a requirement list. #include <dcopclient.h> #include <kglobalsettings.h> #include <knotifydialog.h> +#undef B0 #include <kprinter.h> #include <kaccelmanager.h> #include <kurifilter.h> @@ -279,7 +280,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo KAcceleratorManager::setNoAccel( menubar ); - sessionNumberMapper = new TQSignalMapper( this ); + sessionNumberMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), this, TQT_SLOT( newSessionTabbar( int ) ) ); @@ -547,7 +548,7 @@ void Konsole::makeGUI() m_moveSessionRight->plug(m_view); m_view->insertSeparator(); - KRadioAction *ra = session2action.find(se); + KRadioAction *ra = session2action.tqfind(se); if (ra!=0) ra->plug(m_view); //bookmarks menu @@ -582,7 +583,7 @@ void Konsole::makeGUI() showMenubar->plug ( m_options ); // Tabbar - selectTabbar = new KSelectAction(i18n("&Tab Bar"), 0, this, + selectTabbar = new KSelectAction(i18n("&Tab Bar"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectTabbar()), actions, "tabbar" ); TQStringList tabbaritems; tabbaritems << i18n("&Hide") << i18n("&Top") << i18n("&Bottom"); @@ -590,7 +591,7 @@ void Konsole::makeGUI() selectTabbar->plug(m_options); // Scrollbar - selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, this, + selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectScrollbar()), actions, "scrollbar" ); TQStringList scrollitems; scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right"); @@ -606,7 +607,7 @@ void Konsole::makeGUI() } // Select Bell - selectBell = new KSelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this, + selectBell = new KSelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotSelectBell()), actions, "bell"); TQStringList bellitems; bellitems << i18n("System &Bell") @@ -621,28 +622,28 @@ void Konsole::makeGUI() SmallIconSet( "text" ), actions, 0L ); m_fontsizes->insert( new KAction( i18n( "&Enlarge Font" ), - SmallIconSet( "fontsizeup" ), 0, this, + SmallIconSet( "fontsizeup" ), 0, TQT_TQOBJECT(this), TQT_SLOT( biggerFont() ), actions, "enlarge_font" ) ); m_fontsizes->insert( new KAction( i18n( "&Shrink Font" ), - SmallIconSet( "fontsizedown" ), 0, this, + SmallIconSet( "fontsizedown" ), 0, TQT_TQOBJECT(this), TQT_SLOT( smallerFont() ), actions, "shrink_font" ) ); m_fontsizes->insert( new KAction( i18n( "Se&lect..." ), - SmallIconSet( "font" ), 0, this, + SmallIconSet( "font" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSelectFont() ), actions, "select_font" ) ); if ( b_installBitmapFonts ) { m_fontsizes->insert( new KAction( i18n( "&Install Bitmap..." ), - SmallIconSet( "font" ), 0, this, + SmallIconSet( "font" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotInstallBitmapFonts() ), actions, "install_fonts" ) ); } m_fontsizes->plug(m_options); // encoding menu, start with default checked ! - selectSetEncoding = new KSelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, this, TQT_SLOT(slotSetEncoding()), actions, "set_encoding" ); + selectSetEncoding = new KSelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetEncoding()), actions, "set_encoding" ); TQStringList list = KGlobal::charsets()->descriptiveEncodingNames(); list.prepend( i18n( "Default" ) ); selectSetEncoding->setItems(list); @@ -659,7 +660,7 @@ void Konsole::makeGUI() // Select size if (!b_fixedSize) { - selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, this, + selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectSize()), actions, "size"); TQStringList sizeitems; sizeitems << i18n("40x15 (&Small)") @@ -673,13 +674,13 @@ void Konsole::makeGUI() selectSize->plug(m_options); } - KAction *historyType = new KAction(i18n("Hist&ory..."), "history", 0, this, + KAction *historyType = new KAction(i18n("Hist&ory..."), "history", 0, TQT_TQOBJECT(this), TQT_SLOT(slotHistoryType()), actions, "history"); historyType->plug(m_options); m_options->insertSeparator(); - KAction *save_settings = new KAction(i18n("&Save as Default"), "filesave", 0, this, + KAction *save_settings = new KAction(i18n("&Save as Default"), "filesave", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSettings()), actions, "save_default"); save_settings->plug(m_options); @@ -689,9 +690,9 @@ void Konsole::makeGUI() m_options->insertSeparator(); - KStdAction::configureNotifications(this, TQT_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options); - KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options); - KAction *configure = KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actions); + KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options); + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options); + KAction *configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actions); configure->plug(m_options); if (KGlobalSettings::insertTearOffHandle()) @@ -716,7 +717,7 @@ void Konsole::makeGUI() { updateRMBMenu(); // show menubar / exit fullscreen - KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, this, + KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetSelectionEnd()), actions, "selection_end"); selectionEnd->plug(m_rightButton); @@ -789,7 +790,7 @@ void Konsole::makeGUI() KeyTrans* ktr = kt_map[*it]; assert( ktr ); TQString title=ktr->hdr(); - m_keytab->insertItem(title.replace('&',"&&"),ktr->numb()); + m_keytab->insertItem(title.tqreplace('&',"&&"),ktr->numb()); } applySettingsToGUI(); @@ -800,29 +801,29 @@ void Konsole::makeGUI() m_tabPopupMenu = new KPopupMenu( this ); KAcceleratorManager::manage( m_tabPopupMenu ); - m_tabDetachSession= new KAction( i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, TQT_SLOT(slotTabDetachSession()), this ); + m_tabDetachSession= new KAction( i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTabDetachSession()), TQT_TQOBJECT(this) ); m_tabDetachSession->plug(m_tabPopupMenu); - m_tabPopupMenu->insertItem( i18n("&Rename Session..."), this, + m_tabPopupMenu->insertItem( i18n("&Rename Session..."), TQT_TQOBJECT(this), TQT_SLOT(slotTabRenameSession()) ); m_tabPopupMenu->insertSeparator(); m_tabMonitorActivity = new KToggleAction ( i18n( "Monitor for &Activity" ), - SmallIconSet("activity"), 0, this, TQT_SLOT( slotTabToggleMonitor() ), this ); + SmallIconSet("activity"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) ); m_tabMonitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) ); m_tabMonitorActivity->plug(m_tabPopupMenu); m_tabMonitorSilence = new KToggleAction ( i18n( "Monitor for &Silence" ), - SmallIconSet("silence"), 0, this, TQT_SLOT( slotTabToggleMonitor() ), this ); + SmallIconSet("silence"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) ); m_tabMonitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) ); m_tabMonitorSilence->plug(m_tabPopupMenu); - m_tabMasterMode = new KToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this, - TQT_SLOT( slotTabToggleMasterMode() ), this); + m_tabMasterMode = new KToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this), + TQT_SLOT( slotTabToggleMasterMode() ), TQT_TQOBJECT(this)); m_tabMasterMode->plug(m_tabPopupMenu); m_tabPopupMenu->insertSeparator(); - m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, TQT_SLOT(slotTabSelectColor()) ); + m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), TQT_TQOBJECT(this), TQT_SLOT(slotTabSelectColor()) ); m_tabPopupMenu->insertSeparator(); m_tabPopupTabsMenu = new KPopupMenu( m_tabPopupMenu ); @@ -831,7 +832,7 @@ void Konsole::makeGUI() TQT_SLOT( activateSession( int ) ) ); m_tabPopupMenu->insertSeparator(); - m_tabPopupMenu->insertItem( SmallIcon("fileclose"), i18n("C&lose Session"), this, + m_tabPopupMenu->insertItem( SmallIcon("fileclose"), i18n("C&lose Session"), TQT_TQOBJECT(this), TQT_SLOT(slotTabCloseSession()) ); if (m_options) { @@ -840,23 +841,23 @@ void Konsole::makeGUI() KAcceleratorManager::manage( m_tabbarPopupMenu ); selectTabbar->plug(m_tabbarPopupMenu); - KSelectAction *viewOptions = new KSelectAction(this); + KSelectAction *viewOptions = new KSelectAction(TQT_TQOBJECT(this)); viewOptions->setText(i18n("Tab &Options")); TQStringList options; options << i18n("&Text && Icons") << i18n("Text &Only") << i18n("&Icons Only"); viewOptions->setItems(options); viewOptions->setCurrentItem(m_tabViewMode); viewOptions->plug(m_tabbarPopupMenu); - connect(viewOptions, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTabSetViewOptions(int))); + connect(viewOptions, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotTabSetViewOptions(int))); slotTabSetViewOptions(m_tabViewMode); - KToggleAction *dynamicTabHideOption = new KToggleAction ( i18n( "&Dynamic Hide" ), 0, this, - TQT_SLOT( slotTabbarToggleDynamicHide() ), this); + KToggleAction *dynamicTabHideOption = new KToggleAction ( i18n( "&Dynamic Hide" ), 0, TQT_TQOBJECT(this), + TQT_SLOT( slotTabbarToggleDynamicHide() ), TQT_TQOBJECT(this)); dynamicTabHideOption->setChecked(b_dynamicTabHide); dynamicTabHideOption->plug(m_tabbarPopupMenu); KToggleAction *m_autoResizeTabs = new KToggleAction( i18n("&Auto Resize Tabs"), - 0, this, TQT_SLOT( slotToggleAutoResizeTabs() ), this); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleAutoResizeTabs() ), TQT_TQOBJECT(this)); m_autoResizeTabs->setChecked(b_autoResizeTabs); m_autoResizeTabs->plug(m_tabbarPopupMenu); } @@ -944,18 +945,18 @@ void Konsole::makeTabWidget() bool Konsole::eventFilter( TQObject *o, TQEvent *ev ) { - if (o == m_newSessionButton) + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_newSessionButton)) { // Popup the menu when the left mousebutton is pressed and the mouse // is moved by a small distance. if (ev->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); + TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); m_newSessionButtonMousePressPos = mev->pos(); } else if (ev->type() == TQEvent::MouseMove) { - TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); + TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); if ((mev->pos() - m_newSessionButtonMousePressPos).manhattanLength() > KGlobalSettings::dndEventDelay()) { @@ -965,7 +966,7 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev ) } else if (ev->type() == TQEvent::ContextMenu) { - TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); + TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); slotTabbarContextMenu(mev->globalPos()); return true; } @@ -1048,75 +1049,75 @@ void Konsole::makeBasicGUI() m_shortcuts = new KActionCollection(this); - m_copyClipboard = new KAction(i18n("&Copy"), "editcopy", 0, this, + m_copyClipboard = new KAction(i18n("&Copy"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy"); - m_pasteClipboard = new KAction(i18n("&Paste"), "editpaste", Qt::SHIFT+Qt::Key_Insert, this, + m_pasteClipboard = new KAction(i18n("&Paste"), "editpaste", Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste"); - m_pasteSelection = new KAction(i18n("Paste Selection"), Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, this, + m_pasteSelection = new KAction(i18n("Paste Selection"), Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection"); - m_clearTerminal = new KAction(i18n("C&lear Terminal"), 0, this, + m_clearTerminal = new KAction(i18n("C&lear Terminal"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal"); - m_resetClearTerminal = new KAction(i18n("&Reset && Clear Terminal"), 0, this, + m_resetClearTerminal = new KAction(i18n("&Reset && Clear Terminal"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal"); - m_findHistory = new KAction(i18n("&Find in History..."), "find", 0, this, + m_findHistory = new KAction(i18n("&Find in History..."), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFindHistory()), m_shortcuts, "find_history"); m_findHistory->setEnabled(b_histEnabled); - m_findNext = new KAction(i18n("Find &Next"), "next", 0, this, + m_findNext = new KAction(i18n("Find &Next"), "next", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()), m_shortcuts, "find_next"); m_findNext->setEnabled(b_histEnabled); - m_findPrevious = new KAction(i18n("Find Pre&vious"), "previous", 0, this, + m_findPrevious = new KAction(i18n("Find Pre&vious"), "previous", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFindPrevious()), m_shortcuts, "find_previous"); m_findPrevious->setEnabled( b_histEnabled ); - m_saveHistory = new KAction(i18n("S&ave History As..."), "filesaveas", 0, this, + m_saveHistory = new KAction(i18n("S&ave History As..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveHistory()), m_shortcuts, "save_history"); m_saveHistory->setEnabled(b_histEnabled ); - m_clearHistory = new KAction(i18n("Clear &History"), "history_clear", 0, this, + m_clearHistory = new KAction(i18n("Clear &History"), "history_clear", 0, TQT_TQOBJECT(this), TQT_SLOT(slotClearHistory()), m_shortcuts, "clear_history"); m_clearHistory->setEnabled(b_histEnabled); m_clearAllSessionHistories = new KAction(i18n("Clear All H&istories"), "history_clear", 0, - this, TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories"); + TQT_TQOBJECT(this), TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories"); - m_detachSession = new KAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, + m_detachSession = new KAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); m_detachSession->setEnabled(false); - m_renameSession = new KAction(i18n("&Rename Session..."), Qt::CTRL+Qt::ALT+Qt::Key_S, this, + m_renameSession = new KAction(i18n("&Rename Session..."), Qt::CTRL+Qt::ALT+Qt::Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotRenameSession()), m_shortcuts, "rename_session"); if (kapp->authorizeKAction("zmodem_upload")) m_zmodemUpload = new KAction( i18n( "&ZModem Upload..." ), - Qt::CTRL+Qt::ALT+Qt::Key_U, this, + Qt::CTRL+Qt::ALT+Qt::Key_U, TQT_TQOBJECT(this), TQT_SLOT( slotZModemUpload() ), m_shortcuts, "zmodem_upload" ); monitorActivity = new KToggleAction ( i18n( "Monitor for &Activity" ), - SmallIconSet("activity"), 0, this, + SmallIconSet("activity"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" ); monitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) ); monitorSilence = new KToggleAction ( i18n( "Monitor for &Silence" ), - SmallIconSet("silence"), 0, this, + SmallIconSet("silence"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" ); monitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) ); - masterMode = new KToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this, + masterMode = new KToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" ); - showMenubar = new KToggleAction ( i18n( "Show &Menubar" ), "showmenu", 0, this, + showMenubar = new KToggleAction ( i18n( "Show &Menubar" ), "showmenu", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" ); showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) ); m_fullscreen = KStdAction::fullScreen(0, 0, m_shortcuts, this ); - connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(updateFullScreen(bool))); + connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this),TQT_SLOT(updateFullScreen(bool))); m_fullscreen->setChecked(b_fullscreen); - m_saveProfile = new KAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("filesaveas"), 0, this, + m_saveProfile = new KAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("filesaveas"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" ); //help menu @@ -1125,37 +1126,37 @@ void Konsole::makeBasicGUI() // Don't steal F1 (handbook) accel (esp. since it not visible in // "Configure Shortcuts"). - m_closeSession = new KAction(i18n("C&lose Session"), "fileclose", 0, this, + m_closeSession = new KAction(i18n("C&lose Session"), "fileclose", 0, TQT_TQOBJECT(this), TQT_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session"); - m_print = new KAction(i18n("&Print Screen..."), "fileprint", 0, this, TQT_SLOT( slotPrint() ), m_shortcuts, "file_print"); - m_quit = new KAction(i18n("&Quit"), "exit", 0, this, TQT_SLOT( close() ), m_shortcuts, "file_quit"); + m_print = new KAction(i18n("&Print Screen..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), m_shortcuts, "file_print"); + m_quit = new KAction(i18n("&Quit"), "exit", 0, TQT_TQOBJECT(this), TQT_SLOT( close() ), m_shortcuts, "file_quit"); KShortcut shortcut(Qt::CTRL+Qt::ALT+Qt::Key_N); shortcut.append(KShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_N)); - new KAction(i18n("New Session"), shortcut, this, TQT_SLOT(newSession()), m_shortcuts, "new_session"); - new KAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::Key_M, this, TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu"); - new KAction(i18n("List Sessions"), 0, this, TQT_SLOT(listSessions()), m_shortcuts, "list_sessions"); + new KAction(i18n("New Session"), shortcut, TQT_TQOBJECT(this), TQT_SLOT(newSession()), m_shortcuts, "new_session"); + new KAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu"); + new KAction(i18n("List Sessions"), 0, TQT_TQOBJECT(this), TQT_SLOT(listSessions()), m_shortcuts, "list_sessions"); m_moveSessionLeft = new KAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, this, + TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this), TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); m_moveSessionRight = new KAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, this, + TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this), TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); new KAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left, - this, TQT_SLOT(prevSession()), m_shortcuts, "previous_session"); + TQT_TQOBJECT(this), TQT_SLOT(prevSession()), m_shortcuts, "previous_session"); new KAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Left : Qt::SHIFT+Qt::Key_Right, - this, TQT_SLOT(nextSession()), m_shortcuts, "next_session"); + TQT_TQOBJECT(this), TQT_SLOT(nextSession()), m_shortcuts, "next_session"); for (int i=1;i<13;i++) { // Due to 12 function keys? - new KAction(i18n("Switch to Session %1").arg(i), 0, this, TQT_SLOT(switchToSession()), m_shortcuts, TQString().sprintf("switch_to_session_%02d", i).latin1()); + new KAction(i18n("Switch to Session %1").tqarg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); } - new KAction(i18n("Enlarge Font"), 0, this, TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font"); - new KAction(i18n("Shrink Font"), 0, this, TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font"); + new KAction(i18n("Enlarge Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font"); + new KAction(i18n("Shrink Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font"); - new KAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, this, TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); + new KAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); // Should we load all *.desktop files now? Required for Session shortcuts. if ( KConfigGroup(KGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) { @@ -1280,7 +1281,7 @@ void Konsole::setColLin(int columns, int lines) te->setSize(columns, lines); adjustSize(); if (b_fixedSize) - setFixedSize(sizeHint()); + setFixedSize(tqsizeHint()); notifySize(columns, lines); // set menu items } } @@ -1316,7 +1317,7 @@ void Konsole::slotTabContextMenu(TQWidget* _te, const TQPoint & pos) int counter=0; for (TESession *ses = sessions.first(); ses; ses = sessions.next()) { TQString title=ses->Title(); - m_tabPopupTabsMenu->insertItem(SmallIcon(ses->IconName()),title.replace('&',"&&"),counter++); + m_tabPopupTabsMenu->insertItem(SmallIcon(ses->IconName()),title.tqreplace('&',"&&"),counter++); } m_tabPopupMenu->popup( pos ); @@ -1382,7 +1383,7 @@ void Konsole::slotTabSetViewOptions(int mode) else title = sessions.at(i)->Title(); - title=title.replace('&',"&&"); + title=title.tqreplace('&',"&&"); switch(mode) { case ShowIconAndText: tabwidget->changeTab(page, icon, title); @@ -1428,7 +1429,7 @@ void Konsole::slotSaveSessionsProfile() TQString::null, &ok, this ); if ( ok ) { TQString path = locateLocal( "data", - TQString::fromLatin1( "konsole/profiles/" ) + prof, + TQString::tqfromLatin1( "konsole/profiles/" ) + prof, KGlobal::instance() ); if ( TQFile::exists( path ) ) @@ -1597,9 +1598,9 @@ void Konsole::readProperties(KConfig* config, const TQString &schema, bool globa { n_defaultKeytab=KeyTrans::find(config->readEntry("keytab","default"))->numb(); // act. the keytab for this session b_fullscreen = config->readBoolEntry("Fullscreen",false); - n_scroll = QMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2); - n_tabbar = QMIN(config->readUnsignedNumEntry("tabbar",TabBottom),2); - n_bell = QMIN(config->readUnsignedNumEntry("bellmode",TEWidget::BELLSYSTEM),3); + n_scroll = TQMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2); + n_tabbar = TQMIN(config->readUnsignedNumEntry("tabbar",TabBottom),2); + n_bell = TQMIN(config->readUnsignedNumEntry("bellmode",TEWidget::BELLSYSTEM),3); // Options that should be applied to all sessions ///////////// @@ -1635,7 +1636,7 @@ void Konsole::readProperties(KConfig* config, const TQString &schema, bool globa delete rootxpms[te]; rootxpms.remove(te); } - pixmap_menu_activated(sch->alignment()); + pixmap_menu_activated(sch->tqalignment()); } te->setColorTable(sch->table()); //FIXME: set twice here to work around a bug @@ -1874,7 +1875,7 @@ void Konsole::updateSchemaMenu() ColorSchema* s = (ColorSchema*)colors->at(i); assert( s ); TQString title=s->title(); - m_schema->insertItem(title.replace('&',"&&"),s->numb(),0); + m_schema->insertItem(title.tqreplace('&',"&&"),s->numb(),0); } if (te && se) @@ -1912,7 +1913,7 @@ void Konsole::slotToggleMenubar() { if (b_fixedSize) { adjustSize(); - setFixedSize(sizeHint()); + setFixedSize(tqsizeHint()); } if (!showMenubar->isChecked()) { setCaption(i18n("Use the right mouse button to bring back the menu")); @@ -1987,12 +1988,12 @@ void Konsole::slotSelectTabbar() { /* FIXME: Still necessary ? */ TQPtrDictIterator<KRootPixmap> it(rootxpms); for (;it.current();++it) - it.current()->repaint(true); + it.current()->tqrepaint(true); if (b_fixedSize) { adjustSize(); - setFixedSize(sizeHint()); + setFixedSize(tqsizeHint()); } } @@ -2073,7 +2074,7 @@ void Konsole::reparseConfiguration() disconnect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), this, TQT_SLOT( newSessionTabbar( int ) ) ); delete sessionNumberMapper; - sessionNumberMapper = new TQSignalMapper( this ); + sessionNumberMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), this, TQT_SLOT( newSessionTabbar( int ) ) ); @@ -2218,13 +2219,13 @@ void Konsole::updateTitle(TESession* _se) } tabwidget->setTabIconSet(_se->widget(), iconSetForSession(_se)); TQString icon = _se->IconName(); - KRadioAction *ra = session2action.find(_se); + KRadioAction *ra = session2action.tqfind(_se); if (ra && (ra->icon() != icon)) ra->setIcon(icon); if (m_tabViewMode == ShowIconOnly) tabwidget->changeTab( _se->widget(), TQString::null ); else if (b_matchTabWinTitle) - tabwidget->setTabLabel( _se->widget(), _se->fullTitle().replace('&',"&&")); + tabwidget->setTabLabel( _se->widget(), _se->fullTitle().tqreplace('&',"&&")); } void Konsole::initSessionFont(TQFont font) { @@ -2362,7 +2363,7 @@ void Konsole::enterURL(const TQString& URL, const TQString&) KRun::shellQuote(newtext); te->emitText("cd "+newtext+"\r"); } - else if (URL.contains("://", true)) { + else if (URL.tqcontains("://", true)) { KURL u(URL); newtext = u.protocol(); bool isSSH = (newtext == "ssh"); @@ -2409,7 +2410,7 @@ void Konsole::sendSignal(int sn) void Konsole::runSession(TESession* s) { - KRadioAction *ra = session2action.find(s); + KRadioAction *ra = session2action.tqfind(s); ra->setChecked(true); activateSession(s); @@ -2445,10 +2446,10 @@ void Konsole::addSession(TESession* s) s->setTitle(newTitle); // create an action for the session - KRadioAction *ra = new KRadioAction(newTitle.replace('&',"&&"), + KRadioAction *ra = new KRadioAction(newTitle.tqreplace('&',"&&"), s->IconName(), 0, - this, + TQT_TQOBJECT(this), TQT_SLOT(activateSession()), m_shortcuts); ra->setExclusiveGroup("sessions"); @@ -2496,7 +2497,7 @@ void Konsole::listSessions() m_sessionList->setKeyboardShortcutsEnabled(true); for (TESession *ses = sessions.first(); ses; ses = sessions.next()) { TQString title=ses->Title(); - m_sessionList->insertItem(SmallIcon(ses->IconName()),title.replace('&',"&&"),counter++); + m_sessionList->insertItem(SmallIcon(ses->IconName()),title.tqreplace('&',"&&"),counter++); } m_sessionList->adjustSize(); m_sessionList->popup(mapToGlobal(TQPoint((width()/2)-(m_sessionList->width()/2),(height()/2)-(m_sessionList->height()/2)))); @@ -2504,7 +2505,7 @@ void Konsole::listSessions() void Konsole::switchToSession() { - activateSession( TQString( sender()->name() ).right( 2 ).toInt() -1 ); + activateSession( TQString( TQT_TQOBJECT_CONST(sender())->name() ).right( 2 ).toInt() -1 ); } void Konsole::activateSession(int position) @@ -2561,7 +2562,7 @@ void Konsole::activateSession(TESession *s) se->setListenToKeyPress(true); notifySessionState(se,NOTIFYNORMAL); // Delete the session if isn't in the session list any longer. - if (sessions.find(se) == -1) + if (sessions.tqfind(se) == -1) delete se; } if (se != s) @@ -2575,16 +2576,16 @@ void Konsole::activateSession(TESession *s) s_schema = cs->relPath(); curr_schema = cs->numb(); pmPath = cs->imagePath(); - n_render = cs->alignment(); + n_render = cs->tqalignment(); // BR 106464 temporary fix... // only 2 sessions opened, 2nd session viewable, right-click on 1st tab and // select 'Detach', close original Konsole window... crash // s is not set properly on original Konsole window - KRadioAction *ra = session2action.find(se); + KRadioAction *ra = session2action.tqfind(se); if (!ra) { se=sessions.first(); // Get new/correct TESession - ra = session2action.find(se); + ra = session2action.tqfind(se); } ra->setChecked(true); @@ -2616,7 +2617,7 @@ void Konsole::activateSession(TESession *s) if (monitorActivity) monitorActivity->setChecked( se->isMonitorActivity() ); if (monitorSilence) monitorSilence->setChecked( se->isMonitorSilence() ); masterMode->setChecked( se->isMasterMode() ); - sessions.find(se); + sessions.tqfind(se); uint position=sessions.at(); if (m_moveSessionLeft) m_moveSessionLeft->setEnabled(position>0); if (m_moveSessionRight) m_moveSessionRight->setEnabled(position<sessions.count()-1); @@ -2757,7 +2758,7 @@ void Konsole::newSession(int i) return; } - KSimpleConfig* co = no2command.find(i); + KSimpleConfig* co = no2command.tqfind(i); if (co) { newSession(co); resetScreenSessions(); @@ -2780,7 +2781,7 @@ void Konsole::newSessionTabbar(int i) return; } - KSimpleConfig* co = no2command.find(i); + KSimpleConfig* co = no2command.tqfind(i); if (co) { newSession(co); resetScreenSessions(); @@ -3021,7 +3022,7 @@ void Konsole::doneSession(TESession* s) if (se_previous) activateSession(se_previous); - KRadioAction *ra = session2action.find(s); + KRadioAction *ra = session2action.tqfind(s); ra->unplug(m_view); tabwidget->removePage( s->widget() ); if (rootxpms[s->widget()]) { @@ -3033,7 +3034,7 @@ void Konsole::doneSession(TESession* s) m_removeSessionButton->setEnabled(tabwidget->count()>1); session2action.remove(s); action2session.remove(ra); - int sessionIndex = sessions.findRef(s); + int sessionIndex = sessions.tqfindRef(s); sessions.remove(s); delete ra; // will the toolbar die? @@ -3050,7 +3051,7 @@ void Konsole::doneSession(TESession* s) { se = sessions.at(sessionIndex ? sessionIndex - 1 : 0); - session2action.find(se)->setChecked(true); + session2action.tqfind(se)->setChecked(true); //FIXME: this Timer stupidity originated from the connected // design of Emulations. By this the newly activated // session might get a Ctrl(D) if the session has be @@ -3065,7 +3066,7 @@ void Konsole::doneSession(TESession* s) close(); } else { - sessions.find(se); + sessions.tqfind(se); uint position=sessions.at(); m_moveSessionLeft->setEnabled(position>0); m_moveSessionRight->setEnabled(position<sessions.count()-1); @@ -3081,7 +3082,7 @@ void Konsole::doneSession(TESession* s) void Konsole::prevSession() { - sessions.find(se); sessions.prev(); + sessions.tqfind(se); sessions.prev(); if (!sessions.current()) sessions.last(); if (sessions.current() && sessions.count() > 1) activateSession(sessions.current()); @@ -3091,7 +3092,7 @@ void Konsole::prevSession() void Konsole::nextSession() { - sessions.find(se); sessions.next(); + sessions.tqfind(se); sessions.next(); if (!sessions.current()) sessions.first(); if (sessions.current() && sessions.count() > 1) activateSession(sessions.current()); @@ -3104,7 +3105,7 @@ void Konsole::slotMovedTab(int from, int to) sessions.remove(_se); sessions.insert(to,_se); - KRadioAction *ra = session2action.find(_se); + KRadioAction *ra = session2action.tqfind(_se); ra->unplug(m_view); ra->plug(m_view,(m_view->count()-sessions.count()+1)+to); @@ -3119,7 +3120,7 @@ void Konsole::slotMovedTab(int from, int to) /* Move session forward in session list if possible */ void Konsole::moveSessionLeft() { - sessions.find(se); + sessions.tqfind(se); uint position=sessions.at(); if (position==0) return; @@ -3127,7 +3128,7 @@ void Konsole::moveSessionLeft() sessions.remove(position); sessions.insert(position-1,se); - KRadioAction *ra = session2action.find(se); + KRadioAction *ra = session2action.tqfind(se); ra->unplug(m_view); ra->plug(m_view,(m_view->count()-sessions.count()+1)+position-1); @@ -3138,7 +3139,7 @@ void Konsole::moveSessionLeft() tabwidget->blockSignals(false); TQString title = se->Title(); createSessionTab(se->widget(), iconSetForSession(se), - title.replace('&', "&&"), position-1); + title.tqreplace('&', "&&"), position-1); tabwidget->showPage(se->widget()); tabwidget->setTabColor(se->widget(),oldcolor); @@ -3151,7 +3152,7 @@ void Konsole::moveSessionLeft() /* Move session back in session list if possible */ void Konsole::moveSessionRight() { - sessions.find(se); + sessions.tqfind(se); uint position=sessions.at(); if (position==sessions.count()-1) @@ -3160,7 +3161,7 @@ void Konsole::moveSessionRight() sessions.remove(position); sessions.insert(position+1,se); - KRadioAction *ra = session2action.find(se); + KRadioAction *ra = session2action.tqfind(se); ra->unplug(m_view); ra->plug(m_view,(m_view->count()-sessions.count()+1)+position+1); @@ -3171,7 +3172,7 @@ void Konsole::moveSessionRight() tabwidget->blockSignals(false); TQString title = se->Title(); createSessionTab(se->widget(), iconSetForSession(se), - title.replace('&', "&&"), position+1); + title.tqreplace('&', "&&"), position+1); tabwidget->showPage(se->widget()); tabwidget->setTabColor(se->widget(),oldcolor); @@ -3279,9 +3280,9 @@ void Konsole::notifySessionState(TESession* session, int state) // make sure they are not larger than 16x16 if (normal.width() > 16 || normal.height() > 16) - normal.convertFromImage(normal.convertToImage().smoothScale(16,16)); + normal.convertFromImage(TQImage(normal.convertToImage()).smoothScale(16,16)); if (active.width() > 16 || active.height() > 16) - active.convertFromImage(active.convertToImage().smoothScale(16,16)); + active.convertFromImage(TQImage(active.convertToImage()).smoothScale(16,16)); TQIconSet iconset; iconset.setPixmap(normal, TQIconSet::Small, TQIconSet::Normal); @@ -3383,7 +3384,7 @@ void Konsole::addSessionCommand(const TQString &path) TQString name = comment; name.prepend("SSC_"); // Allows easy searching for Session ShortCuts - name.replace(" ", "_"); + name.tqreplace(" ", "_"); sl_sessionShortCuts << name; // Is there already this shortcut? @@ -3391,7 +3392,7 @@ void Konsole::addSessionCommand(const TQString &path) if ( m_shortcuts->action( name.latin1() ) ) { sessionAction = m_shortcuts->action( name.latin1() ); } else { - sessionAction = new KAction( comment, 0, this, 0, m_shortcuts, name.latin1() ); + sessionAction = new KAction( comment, 0, TQT_TQOBJECT(this), 0, m_shortcuts, name.latin1() ); } connect( sessionAction, TQT_SIGNAL( activated() ), sessionNumberMapper, TQT_SLOT( map() ) ); sessionNumberMapper->setMapping( sessionAction, cmd_serial ); @@ -3433,13 +3434,13 @@ void Konsole::createSessionMenus() TQString txt = cfg->readEntry("Name"); TQString icon = cfg->readEntry("Icon", "konsole"); insertItemSorted(m_tabbarSessionsCommands, SmallIconSet(icon), - txt.replace('&',"&&"), SESSION_NEW_SHELL_ID ); + txt.tqreplace('&',"&&"), SESSION_NEW_SHELL_ID ); TQString comment = cfg->readEntry("Comment"); if (comment.isEmpty()) comment=txt.prepend(i18n("New ")); insertItemSorted(m_session, SmallIconSet(icon), - comment.replace('&',"&&"), SESSION_NEW_SHELL_ID); + comment.tqreplace('&',"&&"), SESSION_NEW_SHELL_ID); m_session->insertItem(SmallIconSet("window_new"), i18n("New &Window"), SESSION_NEW_WINDOW_ID); m_tabbarSessionsCommands->insertItem(SmallIconSet("window_new"), @@ -3455,12 +3456,12 @@ void Konsole::createSessionMenus() TQString txt = (*it).readEntry("Name"); TQString icon = (*it).readEntry("Icon", "konsole"); insertItemSorted(m_tabbarSessionsCommands, SmallIconSet(icon), - txt.replace('&',"&&"), it.currentKey() ); + txt.tqreplace('&',"&&"), it.currentKey() ); TQString comment = (*it).readEntry("Comment"); if (comment.isEmpty()) comment=txt.prepend(i18n("New ")); insertItemSorted(m_session, SmallIconSet(icon), - comment.replace('&',"&&"), it.currentKey()); + comment.tqreplace('&',"&&"), it.currentKey()); } if (m_bookmarksSession) @@ -3483,7 +3484,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket) co->writeEntry("Name", socket); TQString txt = i18n("Screen is a program controlling screens!", "Screen at %1").arg(socket); co->writeEntry("Comment", txt); - co->writePathEntry("Exec", TQString::fromLatin1("SCREENDIR=%1 screen -r %2") + co->writePathEntry("Exec", TQString::tqfromLatin1("SCREENDIR=%1 screen -r %2") .arg(path).arg(socket)); TQString icon = "konsole"; cmd_serial++; @@ -3616,7 +3617,7 @@ void Konsole::setSchema(ColorSchema* s, TEWidget* tewidget) rootxpms.insert( tewidget, new KRootPixmap(tewidget) ); rootxpms[tewidget]->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b())); } else { - tewidget->setBlendColor(qRgba(s->tr_r(), s->tr_g(), s->tr_b(), int(s->tr_x() * 255))); + tewidget->setBlendColor(tqRgba(s->tr_r(), s->tr_g(), s->tr_b(), int(s->tr_x() * 255))); tewidget->setErasePixmap( TQPixmap() ); // make sure any background pixmap is unset } } else { @@ -3624,8 +3625,8 @@ void Konsole::setSchema(ColorSchema* s, TEWidget* tewidget) delete rootxpms[tewidget]; rootxpms.remove(tewidget); } - pixmap_menu_activated(s->alignment(), tewidget); - tewidget->setBlendColor(qRgba(0, 0, 0, 0xff)); + pixmap_menu_activated(s->tqalignment(), tewidget); + tewidget->setBlendColor(tqRgba(0, 0, 0, 0xff)); } tewidget->setColorTable(s->table()); @@ -3645,12 +3646,12 @@ void Konsole::slotDetachSession() void Konsole::detachSession(TESession* _se) { if (!_se) _se=se; - KRadioAction *ra = session2action.find(_se); + KRadioAction *ra = session2action.tqfind(_se); ra->unplug(m_view); TEWidget* se_widget = _se->widget(); session2action.remove(_se); action2session.remove(ra); - int sessionIndex = sessions.findRef(_se); + int sessionIndex = sessions.tqfindRef(_se); sessions.remove(_se); delete ra; @@ -3704,7 +3705,7 @@ void Konsole::detachSession(TESession* _se) { se = se_previous; else se = sessions.at(sessionIndex ? sessionIndex - 1 : 0); - session2action.find(se)->setChecked(true); + session2action.tqfind(se)->setChecked(true); TQTimer::singleShot(1,this,TQT_SLOT(activateSession())); } @@ -3749,8 +3750,8 @@ void Konsole::attachSession(TESession* session) } TQString title=session->Title(); - KRadioAction *ra = new KRadioAction(title.replace('&',"&&"), session->IconName(), - 0, this, TQT_SLOT(activateSession()), m_shortcuts); + KRadioAction *ra = new KRadioAction(title.tqreplace('&',"&&"), session->IconName(), + 0, TQT_TQOBJECT(this), TQT_SLOT(activateSession()), m_shortcuts); ra->setExclusiveGroup("sessions"); ra->setChecked(true); @@ -3809,9 +3810,9 @@ void Konsole::slotRenameSession() { void Konsole::slotRenameSession(TESession* ses, const TQString &name) { - KRadioAction *ra = session2action.find(ses); + KRadioAction *ra = session2action.tqfind(ses); TQString title=name; - title=title.replace('&',"&&"); + title=title.tqreplace('&',"&&"); ra->setText(title); ra->setIcon( ses->IconName() ); // I don't know why it is needed here if (m_tabViewMode!=ShowIconOnly) @@ -3977,7 +3978,7 @@ void Konsole::slotOpenSelection() m_filterData = new KURIFilterData( selectedURL ); KURIFilter::self()->filterURI( *(m_filterData) ); - m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).arg(m_filterData->uri().url()), 1 ); + m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).tqarg(m_filterData->uri().url()), 1 ); connect(m_openSelection, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenURI(int))); } @@ -4192,7 +4193,7 @@ void Konsole::toggleBidi() TQPtrList<TEWidget> tes = activeTEs(); for (TEWidget *_te = tes.first(); _te; _te = tes.next()) { _te->setBidiEnabled(b_bidiEnabled); - _te->repaint(); + _te->tqrepaint(); } } @@ -4259,7 +4260,7 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ ) void KonsoleFind::slotEditRegExp() { if ( m_editorDialog == 0 ) - m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString::null, this ); + m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); assert( m_editorDialog ); diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index 620a0ebdb..d4b1d4627 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -76,12 +76,12 @@ konsoleFactory::~konsoleFactory() s_aboutData = 0; } -KParts::Part *konsoleFactory::createPartObject(TQWidget *parentWidget, const char *widgetName, +KParts::Part *konsoleFactory::createPartObject(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList&) { -// kdDebug(1211) << "konsoleFactory::createPart parentWidget=" << parentWidget << " parent=" << parent << endl; - KParts::Part *obj = new konsolePart(parentWidget, widgetName, parent, name, classname); +// kdDebug(1211) << "konsoleFactory::createPart tqparentWidget=" << tqparentWidget << " parent=" << parent << endl; + KParts::Part *obj = new konsolePart(tqparentWidget, widgetName, parent, name, classname); return obj; } @@ -97,7 +97,7 @@ KInstance *konsoleFactory::instance() #define DEFAULT_HISTORY_SIZE 1000 -konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname) +konsolePart::konsolePart(TQWidget *_tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname) : KParts::ReadOnlyPart(parent, name) ,te(0) ,se(0) @@ -120,7 +120,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje ,m_histSize(DEFAULT_HISTORY_SIZE) ,m_runningShell( false ) { - parentWidget=_parentWidget; + tqparentWidget=_tqparentWidget; setInstance(konsoleFactory::instance()); m_extension = new konsoleBrowserExtension(this); @@ -137,10 +137,10 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje const char* shell = getenv("SHELL"); if (shell == NULL || *shell == '\0') shell = "/bin/sh"; eargs.append(shell); - te = new TEWidget(parentWidget,widgetName); + te = new TEWidget(tqparentWidget,widgetName); te->setMinimumSize(150,70); // allow resizing, cause resize in TEWidget - setWidget(te); + setWidget(TQT_TQWIDGET(te)); te->setFocus(); connect( te,TQT_SIGNAL(configureRequest(TEWidget*,int,int,int)), this,TQT_SLOT(configureRequest(TEWidget*,int,int,int)) ); @@ -197,7 +197,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje KeyTrans* ktr = kt_map[*it]; assert( ktr ); TQString title=ktr->hdr(); - m_keytab->insertItem(title.replace('&',"&&"),ktr->numb()); + m_keytab->insertItem(title.tqreplace('&',"&&"),ktr->numb()); } } @@ -317,13 +317,13 @@ void konsolePart::makeGUI() if (!kapp->authorizeKAction("konsole_rmb")) return; - actions = new KActionCollection( (KMainWindow*)parentWidget ); - settingsActions = new KActionCollection( (KMainWindow*)parentWidget ); + actions = new KActionCollection( (KMainWindow*)tqparentWidget ); + settingsActions = new KActionCollection( (KMainWindow*)tqparentWidget ); // Send Signal Menu ------------------------------------------------------------- if (kapp->authorizeKAction("send_signal")) { - m_signals = new KPopupMenu((KMainWindow*)parentWidget); + m_signals = new KPopupMenu((KMainWindow*)tqparentWidget); m_signals->insertItem( i18n( "&Suspend Task" ) + " (STOP)", SIGSTOP); m_signals->insertItem( i18n( "&Continue Task" ) + " (CONT)", SIGCONT); m_signals->insertItem( i18n( "&Hangup" ) + " (HUP)", SIGHUP); @@ -338,7 +338,7 @@ void konsolePart::makeGUI() // Settings Menu ---------------------------------------------------------------- if (kapp->authorizeKAction("settings")) { - m_options = new KPopupMenu((KMainWindow*)parentWidget); + m_options = new KPopupMenu((KMainWindow*)tqparentWidget); // Scrollbar selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, this, @@ -379,7 +379,7 @@ void konsolePart::makeGUI() // Keyboard Options Menu --------------------------------------------------- if (kapp->authorizeKAction("keyboard")) { - m_keytab = new KPopupMenu((KMainWindow*)parentWidget); + m_keytab = new KPopupMenu((KMainWindow*)tqparentWidget); m_keytab->setCheckable(true); connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int))); m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab ); @@ -388,7 +388,7 @@ void konsolePart::makeGUI() // Schema Options Menu ----------------------------------------------------- if (kapp->authorizeKAction("schema")) { - m_schema = new KPopupMenu((KMainWindow*)parentWidget); + m_schema = new KPopupMenu((KMainWindow*)tqparentWidget); m_schema->setCheckable(true); connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int))); connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check())); @@ -452,17 +452,17 @@ void konsolePart::makeGUI() } // Popup Menu ------------------------------------------------------------------- - m_popupMenu = new KPopupMenu((KMainWindow*)parentWidget); - KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, te, + m_popupMenu = new KPopupMenu((KMainWindow*)tqparentWidget); + KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(te), TQT_SLOT(setSelectionEnd()), actions, "selection_end"); selectionEnd->plug(m_popupMenu); KAction *copyClipboard = new KAction(i18n("&Copy"), "editcopy", 0, - te, TQT_SLOT(copyClipboard()), actions, "edit_copy"); + TQT_TQOBJECT(te), TQT_SLOT(copyClipboard()), actions, "edit_copy"); copyClipboard->plug(m_popupMenu); KAction *pasteClipboard = new KAction(i18n("&Paste"), "editpaste", 0, - te, TQT_SLOT(pasteClipboard()), actions, "edit_paste"); + TQT_TQOBJECT(te), TQT_SLOT(pasteClipboard()), actions, "edit_paste"); pasteClipboard->plug(m_popupMenu); if (m_signals) @@ -561,9 +561,9 @@ void konsolePart::readProperties() b_framevis = config->readBoolEntry("has frame",false); b_histEnabled = config->readBoolEntry("historyenabled",true); - n_bell = QMIN(config->readUnsignedNumEntry("bellmode",TEWidget::BELLSYSTEM),3); + n_bell = TQMIN(config->readUnsignedNumEntry("bellmode",TEWidget::BELLSYSTEM),3); n_keytab=config->readNumEntry("keytab",0); // act. the keytab for this session - n_scroll = QMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2); + n_scroll = TQMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2); m_histSize = config->readNumEntry("history",DEFAULT_HISTORY_SIZE); s_word_seps= config->readEntry("wordseps",":@-./_~"); @@ -587,10 +587,10 @@ void konsolePart::readProperties() if (sch->useTransparency()) { if (!rootxpm) - rootxpm = new KRootPixmap(te); + rootxpm = new KRootPixmap(TQT_TQWIDGET(te)); rootxpm->setFadeEffect(sch->tr_x(), TQColor(sch->tr_r(), sch->tr_g(), sch->tr_b())); rootxpm->start(); - rootxpm->repaint(true); + rootxpm->tqrepaint(true); } else { if (rootxpm) { @@ -598,7 +598,7 @@ void konsolePart::readProperties() delete rootxpm; rootxpm=0; } - pixmap_menu_activated(sch->alignment()); + pixmap_menu_activated(sch->tqalignment()); } te->setBellMode(n_bell); @@ -733,7 +733,7 @@ void konsolePart::updateSchemaMenu() for (int i = 0; i < (int) colors->count(); i++) { ColorSchema* s = (ColorSchema*)colors->at(i); TQString title=s->title(); - m_schema->insertItem(title.replace('&',"&&"),s->numb(),0); + m_schema->insertItem(title.tqreplace('&',"&&"),s->numb(),0); } if (te && se) { @@ -775,10 +775,10 @@ void konsolePart::setSchema(ColorSchema* s) if (s->useTransparency()) { if (!rootxpm) - rootxpm = new KRootPixmap(te); + rootxpm = new KRootPixmap(TQT_TQWIDGET(te)); rootxpm->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b())); rootxpm->start(); - rootxpm->repaint(true); + rootxpm->tqrepaint(true); } else { if (rootxpm) { @@ -786,7 +786,7 @@ void konsolePart::setSchema(ColorSchema* s) delete rootxpm; rootxpm=0; } - pixmap_menu_activated(s->alignment()); + pixmap_menu_activated(s->tqalignment()); } te->setColorTable(s->table()); @@ -797,8 +797,8 @@ void konsolePart::notifySize(int /* columns */, int /* lines */) { ColorSchema *sch=colors->find(s_schema); - if (sch && sch->alignment() >= 3) - pixmap_menu_activated(sch->alignment()); + if (sch && sch->tqalignment() >= 3) + pixmap_menu_activated(sch->tqalignment()); } void konsolePart::pixmap_menu_activated(int item) @@ -847,7 +847,7 @@ void konsolePart::pixmap_menu_activated(int item) void konsolePart::slotHistoryType() { if ( ! se ) return; - HistoryTypeDialog dlg(se->history(), m_histSize, (KMainWindow*)parentWidget); + HistoryTypeDialog dlg(se->history(), m_histSize, (KMainWindow*)tqparentWidget); if (dlg.exec()) { if (dlg.isOn()) { if (dlg.nbLines() > 0) { @@ -917,7 +917,7 @@ void konsolePart::slotWordSeps() { bool ok; TQString seps = KInputDialog::getText( i18n( "Word Connectors" ), - i18n( "Characters other than alphanumerics considered part of a word when double clicking:" ), s_word_seps, &ok, parentWidget ); + i18n( "Characters other than alphanumerics considered part of a word when double clicking:" ), s_word_seps, &ok, tqparentWidget ); if ( ok ) { s_word_seps = seps; @@ -1077,7 +1077,7 @@ bool konsolePart::setPtyFd( int master_pty ) void konsolePart::newSession() { if ( se ) delete se; - se = new TESession(te, "xterm", parentWidget->winId()); + se = new TESession(te, "xterm", tqparentWidget->winId()); connect( se,TQT_SIGNAL(done(TESession*)), this,TQT_SLOT(doneSession(TESession*)) ); connect( se,TQT_SIGNAL(openURLRequest(const TQString &)), @@ -1125,7 +1125,7 @@ void konsolePart::showShellInDir( const TQString& dir ) { TQString text = dir; KRun::shellQuote(text); - text = TQString::fromLatin1("cd ") + text + '\n'; + text = TQString::tqfromLatin1("cd ") + text + '\n'; te->emitText( text ); }; } diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h index 1f65106ad..db7533178 100644 --- a/konsole/konsole/konsole_part.h +++ b/konsole/konsole/konsole_part.h @@ -52,7 +52,7 @@ public: konsoleFactory(); virtual ~konsoleFactory(); - virtual KParts::Part* createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, + virtual KParts::Part* createPartObject(TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, const char* classname = "KParts::Part", const TQStringList &args = TQStringList()); @@ -70,7 +70,7 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public { Q_OBJECT public: - konsolePart(TQWidget *parentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0); + konsolePart(TQWidget *tqparentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0); virtual ~konsolePart(); signals: @@ -140,7 +140,7 @@ signals: bool doWriteStream( const TQByteArray& ); bool doCloseStream(); - TQWidget* parentWidget; + TQWidget* tqparentWidget; TEWidget* te; TESession* se; ColorSchemaList* colors; diff --git a/konsole/konsole/konsole_wcwidth.cpp b/konsole/konsole/konsole_wcwidth.cpp index 73d7c7131..63abe8dd1 100644 --- a/konsole/konsole/konsole_wcwidth.cpp +++ b/konsole/konsole/konsole_wcwidth.cpp @@ -19,7 +19,7 @@ struct interval { }; /* auxiliary function for binary search in interval table */ -static int bisearch(Q_UINT16 ucs, const struct interval *table, int max) { +static int bisearch(TQ_UINT16 ucs, const struct interval *table, int max) { int min = 0; int mid; @@ -65,11 +65,11 @@ static int bisearch(Q_UINT16 ucs, const struct interval *table, int max) { * ISO 8859-1 and WGL4 characters, Unicode control characters, * etc.) have a column width of 1. * - * This implementation assumes that Q_UINT16 characters are encoded + * This implementation assumes that TQ_UINT16 characters are encoded * in ISO 10646. */ -int konsole_wcwidth_normal(Q_UINT16 ucs) +int konsole_wcwidth_normal(TQ_UINT16 ucs) { /* sorted list of non-overlapping intervals of non-spacing characters */ static const struct interval combining[] = { @@ -143,7 +143,7 @@ int konsole_wcwidth_normal(Q_UINT16 ucs) * encodings who want to migrate to UCS. It is not otherwise * recommended for general use. */ -int konsole_wcwidth_cjk(Q_UINT16 ucs) +int konsole_wcwidth_cjk(TQ_UINT16 ucs) { /* sorted list of non-overlapping intervals of East Asian Ambiguous * characters */ @@ -214,13 +214,13 @@ int string_width( const TQString &txt ) int w = 0; for ( uint i = 1; i < txt.length(); ++i ) { - w += konsole_wcwidth(txt[i].unicode()); + w += konsole_wcwidth(txt[i].tqunicode()); } return w; } -int konsole_wcwidth(Q_UINT16 ucs) { +int konsole_wcwidth(TQ_UINT16 ucs) { static int use_wcwidth_cjk = (getenv("KONSOLE_WCWIDTH_CJK")) ? 1: 0; diff --git a/konsole/konsole/konsole_wcwidth.h b/konsole/konsole/konsole_wcwidth.h index b070beb02..a7ca9ad4f 100644 --- a/konsole/konsole/konsole_wcwidth.h +++ b/konsole/konsole/konsole_wcwidth.h @@ -9,8 +9,8 @@ #include <tqglobal.h> #include <tqstring.h> -int konsole_wcwidth(Q_UINT16 ucs); -//int konsole_wcwidth_cjk(Q_UINT16 ucs); +int konsole_wcwidth(TQ_UINT16 ucs); +//int konsole_wcwidth_cjk(TQ_UINT16 ucs); int string_width( const TQString &txt ); diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp index 0686cfbf1..d9cea8293 100644 --- a/konsole/konsole/konsolebookmarkmenu.cpp +++ b/konsole/konsole/konsolebookmarkmenu.cpp @@ -97,7 +97,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() bm = parentBookmark.next(bm) ) { TQString text = bm.text(); - text.replace( '&', "&&" ); + text.tqreplace( '&', "&&" ); if ( !separatorInserted && m_bIsRoot) { // inserted before the first konq bookmark, to avoid the separator if no konq bookmark m_parentMenu->insertSeparator(); separatorInserted = true; @@ -149,7 +149,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() void KonsoleBookmarkMenu::slotBookmarkSelected() { if ( !m_pOwner ) return; // this view doesn't handle bookmarks... - m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */ + m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */ ( (KAction *)sender() )->text() /* Title */ ); } diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp index 4255c1938..9a89c6cb7 100644 --- a/konsole/konsole/kwrited.cpp +++ b/konsole/konsole/kwrited.cpp @@ -71,14 +71,14 @@ KWrited::KWrited() : TQTextEdit() setMinimumWidth(pref_width); setMinimumHeight(pref_height); setReadOnly(true); - setFocusPolicy(TQWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); setWordWrap(TQTextEdit::WidgetWidth); - setTextFormat(Qt::PlainText); + setTextFormat(TQt::PlainText); pty = new KPty(); pty->open(); pty->login(KUser().loginName().local8Bit().data(), getenv("DISPLAY")); - TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, this); + TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, TQT_TQOBJECT(this)); connect(sn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(block_in(int))); TQString txt = i18n("KWrited - Listening on Device %1").arg(pty->ttyName()); diff --git a/konsole/konsole/kwrited.h b/konsole/konsole/kwrited.h index 04cfca548..7c051c51a 100644 --- a/konsole/konsole/kwrited.h +++ b/konsole/konsole/kwrited.h @@ -28,7 +28,7 @@ class KPty; -class KWrited : public QTextEdit +class KWrited : public TQTextEdit { Q_OBJECT public: KWrited(); diff --git a/konsole/konsole/linefont.h b/konsole/konsole/linefont.h index 9873c43d4..a68457023 100644 --- a/konsole/konsole/linefont.h +++ b/konsole/konsole/linefont.h @@ -1,7 +1,7 @@ // WARNING: Autogenerated by "fontembedder ./linefont.src". // You probably do not want to hand-edit this! -static const Q_UINT32 LineChars[] = { +static const TQ_UINT32 LineChars[] = { 0x00007c00, 0x000fffe0, 0x00421084, 0x00e739ce, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00427000, 0x004e7380, 0x00e77800, 0x00ef7bc0, 0x00421c00, 0x00439ce0, 0x00e73c00, 0x00e7bde0, 0x00007084, 0x000e7384, 0x000079ce, 0x000f7bce, diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index 7be5e5146..9916ee82f 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -133,7 +133,7 @@ const char *konsole_shell(TQStrList &args) */ class KonsoleSessionManaged: public KSessionManaged { public: - bool saveState( QSessionManager&sm) { + bool saveState( TQSessionManager&sm) { TQStringList restartCommand = sm.restartCommand(); if (has_noxft) restartCommand.append("--noxft"); @@ -324,7 +324,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) TQString term = ""; if(args->isSet("tn")) { - term=TQString::fromLatin1(args->getOption("tn")); + term=TQString::tqfromLatin1(args->getOption("tn")); } login_shell = args->isSet("ls"); @@ -375,7 +375,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) it != types.end(); ++it) { TQString file = *it; - file = file.mid(file.findRev('/')+1); + file = file.mid(file.tqfindRev('/')+1); if (file.endsWith(".desktop")) file = file.left(file.length()-8); printf("%s\n", TQFile::encodeName(file).data()); @@ -437,7 +437,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) it != profiles.end(); ++it) { TQString file = *it; - file = file.mid(file.findRev('/')+1); + file = file.mid(file.tqfindRev('/')+1); printf("%s\n", TQFile::encodeName(file).data()); } return 0; @@ -515,7 +515,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) sIcon = sessionconfig->readEntry("Icon0","konsole"); sCwd = sessionconfig->readPathEntry("Cwd0"); workDir = sessionconfig->readPathEntry("workdir"); - n_tabbar = QMIN(sessionconfig->readUnsignedNumEntry("tabbar",Konsole::TabBottom),2); + n_tabbar = TQMIN(sessionconfig->readUnsignedNumEntry("tabbar",Konsole::TabBottom),2); Konsole *m = new Konsole(wname,histon,menubaron,tabbaron,frameon,scrollbaron,0/*type*/,true,n_tabbar, workDir); m->newSession(sPgm, eargs, sTerm, sIcon, sTitle, sCwd); @@ -558,7 +558,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) // if the -e option is passed on the command line, this overrides the program specified // in the profile file if ( args->isSet("e") ) - sPgm = (shell ? TQFile::decodeName(shell) : TQString::null); + sPgm = (shell ? TQFile::decodeName(shell) : TQString()); else sPgm = sessionconfig->readEntry(key, shell); @@ -614,7 +614,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) else { Konsole* m = new Konsole(wname,histon,menubaron,tabbaron,frameon,scrollbaron,type, false, 0, workDir); - m->newSession((shell ? TQFile::decodeName(shell) : TQString::null), eargs, term, TQString::null, title, workDir); + m->newSession((shell ? TQFile::decodeName(shell) : TQString()), eargs, term, TQString(), title, workDir); m->enableFullScripting(full_script); m->enableFixedSize(fixed_size); //3.8 :-( @@ -644,13 +644,13 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) //// Temporary code, waiting for Qt to do this properly // Delete all toplevel widgets that have WDestructiveClose - TQWidgetList *list = TQApplication::topLevelWidgets(); + TQWidgetList *list = TQApplication::tqtopLevelWidgets(); // remove all toplevel widgets that have a parent (i.e. they // got WTopLevel explicitly), they'll be deleted by the parent list->first(); while( list->current()) { - if( list->current()->parentWidget() != NULL || !list->current()->testWFlags( Qt::WDestructiveClose ) ) + if( list->current()->tqparentWidget() != NULL || !list->current()->testWFlags( TQt::WDestructiveClose ) ) { list->remove(); continue; diff --git a/konsole/konsole/printsettings.cpp b/konsole/konsole/printsettings.cpp index f27194c14..f4924b9e8 100644 --- a/konsole/konsole/printsettings.cpp +++ b/konsole/konsole/printsettings.cpp @@ -38,7 +38,7 @@ PrintSettings::PrintSettings(TQWidget *parent, const char *name) m_printheader->hide(); // Not yet implemented. - QVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10); + TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10); l0->addWidget(m_printfriendly); l0->addWidget(m_printexact); l0->addWidget(m_printheader); diff --git a/konsole/konsole/printsettings.h b/konsole/konsole/printsettings.h index 68d7b4d91..85eb89e95 100644 --- a/konsole/konsole/printsettings.h +++ b/konsole/konsole/printsettings.h @@ -36,9 +36,9 @@ public: void setOptions(const TQMap<TQString,TQString>& opts); private: - QCheckBox *m_printfriendly; - QCheckBox *m_printexact; - QCheckBox *m_printheader; + TQCheckBox *m_printfriendly; + TQCheckBox *m_printexact; + TQCheckBox *m_printheader; }; #endif diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp index 8d85329eb..211f99b77 100644 --- a/konsole/konsole/schema.cpp +++ b/konsole/konsole/schema.cpp @@ -131,7 +131,7 @@ ColorSchema::ColorSchema(const TQString& pathname) ,lastRead(new TQDateTime()) { //start with a valid time, aleXXX - *lastRead = TQDateTime::currentDateTime(); + *lastRead = TQDateTime::tqcurrentDateTime(); TQString fPath = pathname.startsWith("/") ? pathname : locate("data", "konsole/"+pathname); if (fPath.isEmpty() || !TQFile::exists(fPath)) { @@ -169,7 +169,7 @@ ColorSchema::ColorSchema(KConfig& c) m_title = c.readEntry("Title",i18n("[no title]")); m_imagePath = c.readEntry("ImagePath"); - m_alignment = c.readNumEntry("ImageAlignment",1); + m_tqalignment = c.readNumEntry("ImageAlignment",1); m_useTransparency = c.readBoolEntry("UseTransparency",false); m_tr_r = c.readNumEntry("TransparentR",0); @@ -203,7 +203,7 @@ void ColorSchema::clearSchema() } m_title = i18n("[no title]"); m_imagePath = ""; - m_alignment = 1; + m_tqalignment = 1; m_useTransparency = false; m_tr_x = 0.0; m_tr_r = 0; @@ -216,7 +216,7 @@ void ColorSchema::setDefaultSchema() m_numb = 0; m_title = i18n("Konsole Default"); m_imagePath = ""; // background pixmap - m_alignment = 1; // none + m_tqalignment = 1; // none m_useTransparency = false; // not use pseudo-transparency by default m_tr_r = m_tr_g = m_tr_b = 0; // just to be on the safe side m_tr_x = 0.0; @@ -273,7 +273,7 @@ void ColorSchema::writeConfig(const TQString& path) const c.setGroup("SchemaGeneral"); c.writeEntry("Title",m_title); c.writeEntry("ImagePath",m_imagePath); - c.writeEntry("ImageAlignment",m_alignment); + c.writeEntry("ImageAlignment",m_tqalignment); c.writeEntry("UseTransparency",m_useTransparency); c.writeEntry("TransparentR",m_tr_r); @@ -313,7 +313,7 @@ bool ColorSchema::rereadSchemaFile() char line[100]; - *lastRead = TQDateTime::currentDateTime(); + *lastRead = TQDateTime::tqcurrentDateTime(); while (fscanf(sysin,"%80[^\n]\n",line) > 0) { @@ -333,8 +333,8 @@ bool ColorSchema::rereadSchemaFile() continue; TQString qline(line); - m_imagePath = locate("wallpaper", qline.mid( qline.find(" ",7)+1 ) ); - m_alignment = attr; + m_imagePath = locate("wallpaper", qline.mid( qline.tqfind(" ",7)+1 ) ); + m_tqalignment = attr; } if (!strncmp(line,"transparency",12)) { float rx; @@ -388,7 +388,7 @@ bool ColorSchema::rereadSchemaFile() if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (!(0 <= tr && tr <= 1 )) continue; if (!(0 <= bo && bo <= 1 )) continue; - m_table[fi].color = kapp->palette().active().text(); + m_table[fi].color = kapp->tqpalette().active().text(); m_table[fi].transparent = tr; m_table[fi].bold = bo; } @@ -399,7 +399,7 @@ bool ColorSchema::rereadSchemaFile() if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (!(0 <= tr && tr <= 1 )) continue; if (!(0 <= bo && bo <= 1 )) continue; - m_table[fi].color = kapp->palette().active().base(); + m_table[fi].color = kapp->tqpalette().active().base(); m_table[fi].transparent = tr; m_table[fi].bold = bo; } @@ -537,7 +537,7 @@ bool ColorSchemaList::updateAllSchemaTimes(const TQDateTime& now) for (it=list.begin(); it!=list.end(); ++it) { TQString filename=*it; - int j=filename.findRev('/'); + int j=filename.tqfindRev('/'); if (j>-1) filename = filename.mid(8); @@ -615,7 +615,7 @@ bool ColorSchemaList::checkSchemas() // now. // // - TQDateTime now = TQDateTime::currentDateTime(); + TQDateTime now = TQDateTime::tqcurrentDateTime(); r = updateAllSchemaTimes(now); diff --git a/konsole/konsole/schema.h b/konsole/konsole/schema.h index 904767df6..0a1fb4cc1 100644 --- a/konsole/konsole/schema.h +++ b/konsole/konsole/schema.h @@ -150,7 +150,7 @@ protected: int numb() {if (!m_fileRead) rereadSchemaFile();return m_numb;}; const TQString& title() {if (!m_fileRead) rereadSchemaFile();return m_title;}; const TQString& imagePath() {if (!m_fileRead) rereadSchemaFile();return m_imagePath;}; - int alignment() {if (!m_fileRead) rereadSchemaFile();return m_alignment;}; + int tqalignment() {if (!m_fileRead) rereadSchemaFile();return m_tqalignment;}; const ColorEntry* table() {if (!m_fileRead) rereadSchemaFile();return m_table;}; bool useTransparency() {if (!m_fileRead) rereadSchemaFile();return m_useTransparency;}; double tr_x() {if (!m_fileRead) rereadSchemaFile();return m_tr_x;}; @@ -162,7 +162,7 @@ protected: private: int m_numb; int m_tr_r, m_tr_g, m_tr_b; - int m_alignment; + int m_tqalignment; TQString m_title; TQString m_imagePath; ColorEntry m_table[TABLE_COLORS]; @@ -170,7 +170,7 @@ protected: bool m_fileRead:1; double m_tr_x; TQString fRelPath; // File name of schema file - QDateTime *lastRead; // Time last checked for updates + TQDateTime *lastRead; // Time last checked for updates static int serial; // Serial number so that every // ColorSchema has a unique number. }; diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp index 53990af2f..3534b88c8 100644 --- a/konsole/konsole/session.cpp +++ b/konsole/konsole/session.cpp @@ -133,11 +133,11 @@ void TESession::ptyError() { // FIXME: sh->error() is always empty if ( sh->error().isEmpty() ) - KMessageBox::error( te->topLevelWidget(), + KMessageBox::error( te->tqtopLevelWidget(), i18n("Konsole is unable to open a PTY (pseudo teletype). It is likely that this is due to an incorrect configuration of the PTY devices. Konsole needs to have read/write access to the PTY devices."), i18n("A Fatal Error Has Occurred") ); else - KMessageBox::error(te->topLevelWidget(), sh->error()); + KMessageBox::error(te->tqtopLevelWidget(), sh->error()); emit done(this); } @@ -232,7 +232,7 @@ void TESession::setUserTitle( int what, const TQString &caption ) renameSession(caption); if (what == 31) { cwd=caption; - cwd=cwd.replace( TQRegExp("^~"), TQDir::homeDirPath() ); + cwd=cwd.tqreplace( TQRegExp("^~"), TQDir::homeDirPath() ); emit openURLRequest(cwd); } if (what == 32) { // change icon via \033]32;Icon\007 @@ -645,7 +645,7 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(zmodemRcvBlock(const char*,int)) ); connect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue())); - zmodemProgress = new ZModemDialog(te->topLevelWidget(), false, + zmodemProgress = new ZModemDialog(te->tqtopLevelWidget(), false, i18n("ZModem Progress")); connect(zmodemProgress, TQT_SIGNAL(user1Clicked()), @@ -676,8 +676,8 @@ void TESession::zmodemStatus(KProcess *, char *data, int len) TQCString msg(data, len+1); while(!msg.isEmpty()) { - int i = msg.find('\015'); - int j = msg.find('\012'); + int i = msg.tqfind('\015'); + int j = msg.tqfind('\012'); TQCString txt; if ((i != -1) && ((j == -1) || (i < j))) { @@ -767,7 +767,7 @@ QCStringList TESession::functionsDynamic() void TESession::onRcvBlock( const char* buf, int len ) { em->onRcvBlock( buf, len ); - emit receivedData( TQString::fromLatin1( buf, len ) ); + emit receivedData( TQString::tqfromLatin1( buf, len ) ); } void TESession::print( TQPainter &paint, bool friendly, bool exact ) diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index 3319418a1..8f4fc19ba 100644 --- a/kpager/desktop.cpp +++ b/kpager/desktop.cpp @@ -78,22 +78,22 @@ void Desktop::mouseMoveEvent( TQMouseEvent *ev ) { if ( !KPagerConfigDialog::m_windowDragging ) return; - if ( (ev->state() & LeftButton) == 0 ) + if ( (ev->state() & Qt::LeftButton) == 0 ) return; TQPoint p( ev->pos() - pressPos ); - if ( p.manhattanLength() >= qApp->startDragDistance() ) + if ( p.manhattanLength() >= tqApp->startDragDistance() ) startDrag( pressPos ); } void Desktop::mousePressEvent( TQMouseEvent * ev) { bool showWindows= KPagerConfigDialog::m_showWindows; - if (ev->button()==LeftButton){ + if (ev->button()==Qt::LeftButton){ pressPos = ev->pos(); } - else if ((ev->button()==MidButton)&&(showWindows)) + else if ((ev->button()==Qt::MidButton)&&(showWindows)) startDrag(ev->pos()); - else if (ev->button()==RightButton) { + else if (ev->button()==Qt::RightButton) { TQPoint pos; KWin::WindowInfo *info = windowAtPosition(ev->pos(), &pos); if ( info && showWindows ) @@ -107,7 +107,7 @@ void Desktop::mouseReleaseEvent( TQMouseEvent *ev ) { /** Note that mouseReleaseEvent is not called when releasing the mouse to drop a window in this desktop */ - if (ev->button()==LeftButton) + if (ev->button()==Qt::LeftButton) { bool showWindows= KPagerConfigDialog::m_showWindows; TQPoint pos; @@ -120,7 +120,7 @@ void Desktop::mouseReleaseEvent( TQMouseEvent *ev ) KWin::forceActiveWindow(info->win()); // if ( static_cast<WindowDrawMode>( KPagerConfigDialog::m_windowDrawMode ) == Pixmap ) - // m_windowPixmapsDirty.replace(info->win,true); + // m_windowPixmapsDirty.tqreplace(info->win,true); } } } @@ -140,7 +140,7 @@ KWin::WindowInfo *Desktop::windowAtPosition(const TQPoint &p, TQPoint *internalp { r=info->geometry(); convertRectS2P(r); - if (r.contains(p)) + if (r.tqcontains(p)) { if (internalpos) { @@ -181,7 +181,7 @@ TQPixmap scalePixmap(const TQPixmap &pixmap, int width, int height) return io.convertToPixmap(img.smoothScale(width,height)); } - TQImage img(pixmap.convertToImage().smoothScale(width,height)); + TQImage img(TQImage(pixmap.convertToImage()).smoothScale(width,height)); TQPixmap pix; pix.convertFromImage(img); @@ -295,7 +295,7 @@ TQPixmap *Desktop::paintNewWindow(const KWin::WindowInfo *info) p.begin(pixmap); p.setFont(font()); - p.fillRect( r, colorGroup().brush(TQColorGroup::Dark)); + p.fillRect( r, tqcolorGroup().brush(TQColorGroup::Dark)); paintWindow(p, info, false); p.end(); @@ -425,7 +425,7 @@ void Desktop::paintEvent( TQPaintEvent * ) p.begin(&pixmap); // p.setFont(font()); -// p.fillRect(rect(), colorGroup().brush(TQColorGroup::Dark)); +// p.fillRect(rect(), tqcolorGroup().brush(TQColorGroup::Dark)); // p.setPen(Qt::black); // p.drawRect(rect()); @@ -450,7 +450,7 @@ void Desktop::paintEvent( TQPaintEvent * ) else pixmap.fill(Qt::gray); } else - p.fillRect(rect(), colorGroup().brush(TQColorGroup::Mid)); + p.fillRect(rect(), tqcolorGroup().brush(TQColorGroup::Mid)); // set in/active pen if (isCurrent()) @@ -523,21 +523,21 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool TQBrush brush; - if ( isActive ) brush=colorGroup().brush( TQColorGroup::Highlight ); - else brush=colorGroup().brush( TQColorGroup::Button ); + if ( isActive ) brush=tqcolorGroup().brush( TQColorGroup::Highlight ); + else brush=tqcolorGroup().brush( TQColorGroup::Button ); if ( m_transparentMode==AllWindows || (m_transparentMode==MaximizedWindows && ( info->state() & NET::Max )) ) - brush.setStyle(TQBrush::Dense4Pattern); + brush.setStyle(Qt::Dense4Pattern); if ( isActive ) { - qDrawShadeRect( &p, r, colorGroup(), false, 1, 0, &brush ); + qDrawShadeRect( &p, r, tqcolorGroup(), false, 1, 0, &brush ); } else { p.fillRect( r, brush ); - qDrawShadeRect( &p, r, colorGroup(), true, 1, 0 ); + qDrawShadeRect( &p, r, tqcolorGroup(), true, 1, 0 ); } } @@ -602,8 +602,8 @@ void Desktop::paintWindowPixmap(TQPainter &p, const KWin::WindowInfo *info, nHg = rSmall.height(); } pixmap=new TQPixmap(fastScalePixmap(tmp, nWd, nHg)); - m_windowPixmaps.replace(info->win(),pixmap); - m_windowPixmapsDirty.replace(info->win(),false); + m_windowPixmaps.tqreplace(info->win(),pixmap); + m_windowPixmapsDirty.tqreplace(info->win(),false); } } @@ -669,7 +669,7 @@ void Desktop::backgroundLoaded(bool b) } else kdDebug() << "Error getting the background\n"; } -TQSize Desktop::sizeHint() const +TQSize Desktop::tqsizeHint() const { return TQSize(67,50); } diff --git a/kpager/desktop.h b/kpager/desktop.h index 74997dba3..bfaef5baf 100644 --- a/kpager/desktop.h +++ b/kpager/desktop.h @@ -35,7 +35,7 @@ class KPopupMenu; class TQPainter; class TQPoint; -class Desktop : public QWidget +class Desktop : public TQWidget { Q_OBJECT @@ -74,7 +74,7 @@ public: static void removeCachedPixmap(int nWin) { m_windowPixmaps.remove(nWin); }; - TQSize sizeHint() const; + TQSize tqsizeHint() const; /** * active is a bool that specifies if the frame is the active diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index e521f1e28..b8ecf9ddf 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -76,7 +76,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name) if (w > 0 && h > 0) resize(w,h); else - resize(m_pPager->sizeHint()); + resize(m_pPager->tqsizeHint()); // resize(cfg->readNumEntry(lWidth(),200),cfg->readNumEntry(lHeight(),90)); int xpos=cfg->readNumEntry("xPos",-1); @@ -91,7 +91,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name) // rect.pos.y+rect.size.height-m_pPager->height()); // antonio:The above lines don't work. I should look at them when I have // more time - move(kapp->desktop()->width()-m_pPager->sizeHint().width()-5,kapp->desktop()->height()-m_pPager->sizeHint().height()-25); + move(kapp->desktop()->width()-m_pPager->tqsizeHint().width()-5,kapp->desktop()->height()-m_pPager->tqsizeHint().height()-25); } // Set the wm flags to this window @@ -178,7 +178,7 @@ void KPagerMainWindow::toggleShow(int x, int y) } KPager::KPager(KPagerMainWindow *parent, const char *name) - : TQFrame (parent, name, WStyle_Customize | WStyle_NoBorder | WStyle_Tool) + : TQFrame (parent, name, (WFlags)(WStyle_Customize | WStyle_NoBorder | WStyle_Tool)) , m_layout(0) , m_mnu(0) , m_smnu(0) @@ -187,7 +187,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name) m_windows.setAutoDelete(true); // delete windows info after removal setBackgroundColor( black ); - m_winmodule=new KWinModule(this); + m_winmodule=new KWinModule(TQT_TQOBJECT(this)); m_currentDesktop=m_winmodule->currentDesktop(); m_grabWinTimer=new TQTimer(this,"grabWinTimer"); @@ -231,8 +231,8 @@ KPager::KPager(KPagerMainWindow *parent, const char *name) defFont = cfg->readFontEntry("Font", &defFont); setFont(defFont); - m_prefs_action = KStdAction::preferences(this, TQT_SLOT(configureDialog()), parent->actionCollection()); - m_quit_action = KStdAction::quit(kapp, TQT_SLOT(quit()), parent->actionCollection()); + m_prefs_action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configureDialog()), parent->actionCollection()); + m_quit_action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), parent->actionCollection()); updateLayout(); } @@ -374,7 +374,7 @@ void KPager::configureDialog() updateLayout(); for( TQValueList <Desktop *>::Iterator it = m_desktops.begin(); it != m_desktops.end(); ++it ) - (*it)->repaint(); + (*it)->tqrepaint(); } } @@ -409,7 +409,7 @@ void KPager::slotActiveWindowChanged( WId win ) { if ( (inf1 && inf1->isOnDesktop(i)) || (inf2 && inf2->isOnDesktop(i) ) ) - m_desktops[i-1]->repaint(false); + m_desktops[i-1]->tqrepaint(false); } } @@ -422,7 +422,7 @@ void KPager::slotWindowAdded( WId win) for ( int i=1; i <= (int) m_desktops.count(); ++i) { if ( inf->isOnDesktop( i )) - m_desktops[i-1]->repaint(false); + m_desktops[i-1]->tqrepaint(false); } } @@ -438,14 +438,14 @@ void KPager::slotWindowRemoved( WId win ) for (int i = 1; i <= (int) m_desktops.count(); ++i) { if (onAllDesktops || desktop == i) - m_desktops[i-1]->repaint(false); + m_desktops[i-1]->tqrepaint(false); } } } void KPager::slotWindowChanged( WId win , unsigned int prop) { - bool repaint=false; + bool tqrepaint=false; KWin::WindowInfo* inf = m_windows[win]; if (!inf) @@ -453,7 +453,7 @@ void KPager::slotWindowChanged( WId win , unsigned int prop) inf=info(win); prop=0; // info already calls KWin::info, so there's no need // to update anything else. - repaint=true; + tqrepaint=true; }; bool onAllDesktops = inf ? inf->onAllDesktops() : false; @@ -466,15 +466,15 @@ void KPager::slotWindowChanged( WId win , unsigned int prop) } if((prop & ~( NET::WMName | NET::WMVisibleName )) != 0 ) - repaint = true; + tqrepaint = true; - if (repaint) + if (tqrepaint) for ( int i=1; i <= (int) m_desktops.count(); ++i) { if ((inf && (inf->isOnDesktop(i))) || onAllDesktops || desktop == i ) { - m_desktops[i-1]->repaint(false); + m_desktops[i-1]->tqrepaint(false); } } // redrawDesktops(); @@ -485,9 +485,9 @@ void KPager::slotStackingOrderChanged() m_desktops[m_currentDesktop-1]->m_grabWindows=true; for ( int i=1; i <= (int) m_desktops.count(); ++i) { - m_desktops[i-1]->repaint(false); + m_desktops[i-1]->tqrepaint(false); } -// repaint(true); +// tqrepaint(true); } void KPager::slotDesktopNamesChanged() @@ -547,8 +547,8 @@ void KPager::slotCurrentDesktopChanged(int desk) m_desktops[m_currentDesktop-1]->update(); m_desktops[desk-1]->paintFrame( true ); m_desktops[desk-1]->update(); -// m_desktops[m_currentDesktop-1]->repaint(); -// m_desktops[desk-1]->repaint(); +// m_desktops[m_currentDesktop-1]->tqrepaint(); +// m_desktops[desk-1]->tqrepaint(); m_currentDesktop=desk; @@ -643,21 +643,21 @@ void KPager::redrawDesktops() { TQValueList <Desktop *>::Iterator it; for( it = m_desktops.begin(); it != m_desktops.end(); ++it ) - (*it)->repaint(); + (*it)->tqrepaint(); } void KPager::slotGrabWindows() { m_desktops[m_currentDesktop-1]->m_grabWindows=true; - m_desktops[m_currentDesktop-1]->repaint(); + m_desktops[m_currentDesktop-1]->tqrepaint(); } -TQSize KPager::sizeHint() const +TQSize KPager::tqsizeHint() const { int n=m_desktops.count(); int w=-1,h=-1; - TQSize size=m_desktops[0]->sizeHint(); + TQSize size=m_desktops[0]->tqsizeHint(); int wDsk=size.width(); int hDsk=size.height(); switch (m_layoutType) diff --git a/kpager/kpager.h b/kpager/kpager.h index 8911e1619..b82b43dff 100644 --- a/kpager/kpager.h +++ b/kpager/kpager.h @@ -57,7 +57,7 @@ protected: bool m_reallyClose; }; -class KPager : public QFrame +class KPager : public TQFrame { Q_OBJECT @@ -76,7 +76,7 @@ public: KWin::WindowInfo* info( WId win ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; enum LayoutTypes { Classical=0, Horizontal, Vertical }; diff --git a/kpager/main.cpp b/kpager/main.cpp index c2932478b..8b4d5926f 100644 --- a/kpager/main.cpp +++ b/kpager/main.cpp @@ -45,7 +45,7 @@ class KPagerApplication : public KUniqueApplication public: KPagerApplication() : KUniqueApplication() {} - void commitData(QSessionManager& sm) { + void commitData(TQSessionManager& sm) { if (mainWidget()->isHidden()) { sm.setRestartHint( QSessionManager::RestartNever ); return; diff --git a/kpager/windowdrag.h b/kpager/windowdrag.h index e42927459..a123ea1b5 100644 --- a/kpager/windowdrag.h +++ b/kpager/windowdrag.h @@ -27,7 +27,7 @@ #include <tqdragobject.h> #include <X11/Xlib.h> -class PagerWindowDrag : public QStoredDrag +class PagerWindowDrag : public TQStoredDrag { public: PagerWindowDrag(WId w,int deltax,int deltay,int origdesk,TQWidget *parent); diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp index 4e30c7363..d7e286c15 100644 --- a/kpersonalizer/kcountrypage.cpp +++ b/kpersonalizer/kcountrypage.cpp @@ -76,7 +76,7 @@ KCountryPage::~KCountryPage(){ void KCountryPage::loadCountryList(KLanguageButton *combo) { - TQString sub = TQString::fromLatin1("l10n/"); + TQString sub = TQString::tqfromLatin1("l10n/"); // clear the list combo->clear(); @@ -86,17 +86,17 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) { KSimpleConfig entry(*it); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); TQString tag = *it; int index; - index = tag.findRev('/'); + index = tag.tqfindRev('/'); if (index != -1) tag = tag.mid(index + 1); - index = tag.findRev('.'); + index = tag.tqfindRev('.'); if (index != -1) tag.truncate(index); @@ -113,17 +113,17 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { KSimpleConfig entry(*it); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); TQString submenu = '-' + entry.readEntry("Region"); TQString tag = *it; - int index = tag.findRev('/'); + int index = tag.tqfindRev('/'); tag.truncate(index); - index = tag.findRev('/'); + index = tag.tqfindRev('/'); tag = tag.mid(index+1); - TQPixmap flag( locate( "locale", TQString::fromLatin1("l10n/%1/flag.png").arg(tag) ) ); + TQPixmap flag( locate( "locale", TQString::tqfromLatin1("l10n/%1/flag.png").arg(tag) ) ); TQIconSet icon( flag ); combo->insertItem( icon, name, tag, submenu ); } @@ -138,7 +138,7 @@ void KCountryPage::fillLanguageMenu(KLanguageButton *combo) { for ( it = langlist.begin(); it != langlist.end(); ++it ) { if ((*it).isNull()) { combo->insertSeparator(); - submenu = TQString::fromLatin1("all"); + submenu = TQString::tqfromLatin1("all"); combo->insertSubmenu(i18n("All"), submenu, TQString::null); continue; } @@ -151,9 +151,9 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan kdDebug() << "KCountryPage::save()" << endl; KConfigBase *config = KGlobal::config(); - config->setGroup(TQString::fromLatin1("Locale")); - config->writeEntry(TQString::fromLatin1("Country"), comboCountry->current(), true, true); - config->writeEntry(TQString::fromLatin1("Language"), comboLang->current(), true, true); + config->setGroup(TQString::tqfromLatin1("Locale")); + config->writeEntry(TQString::tqfromLatin1("Country"), comboCountry->current(), true, true); + config->writeEntry(TQString::tqfromLatin1("Language"), comboLang->current(), true, true); config->sync(); // only make the system reload the language, if the selected one deferes from the old saved one. @@ -167,7 +167,7 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan kapp->dcopClient()->attach(); // ksycoca needs to be rebuilt KProcess proc; - proc << TQString::fromLatin1("kbuildsycoca"); + proc << TQString::tqfromLatin1("kbuildsycoca"); proc.start(KProcess::DontCare); kdDebug() << "KLocaleConfig::save : sending signal to kdesktop" << endl; // inform kicker and kdeskop about the new language @@ -182,10 +182,10 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan void KCountryPage::setLangForCountry(const TQString &country) { KSimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true); - ent.setGroup(TQString::fromLatin1("KCM Locale")); - langs = ent.readListEntry(TQString::fromLatin1("Languages")); + ent.setGroup(TQString::tqfromLatin1("KCM Locale")); + langs = ent.readListEntry(TQString::tqfromLatin1("Languages")); - TQString lang = TQString::fromLatin1("en_US"); + TQString lang = TQString::tqfromLatin1("en_US"); // use the first INSTALLED langauge in the list, or default to C for ( TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) { if (cb_language->contains(*it)) { diff --git a/kpersonalizer/kcountrypagedlg.ui b/kpersonalizer/kcountrypagedlg.ui index 72ab5f5cd..168c0d014 100644 --- a/kpersonalizer/kcountrypagedlg.ui +++ b/kpersonalizer/kcountrypagedlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KCountryPageDlg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KCountryPageDlg</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="6" column="1"> + <widget class="TQLayoutWidget" row="6" column="1"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -36,7 +36,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -56,7 +56,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>TextLabel10_2</cstring> </property> @@ -64,7 +64,7 @@ <string>Please choose your language:</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -84,7 +84,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -92,7 +92,7 @@ <property name="wordwrap" stdset="0"> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>txt_welcome</cstring> </property> @@ -100,7 +100,7 @@ <string><h3>Welcome to Trinity %VERSION%!</h3></string> </property> </widget> - <widget class="QLayoutWidget" row="4" column="1"> + <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> <cstring>Layout6_2</cstring> </property> @@ -120,7 +120,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -140,7 +140,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>TextLabel10</cstring> </property> @@ -148,7 +148,7 @@ <string>Please choose your country:</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="9" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="9" colspan="1"> <property name="name"> <cstring>px_introSidebar</cstring> </property> @@ -160,7 +160,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>170</width> <height>430</height> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp index bb76455b4..ca9846cc3 100644 --- a/kpersonalizer/keyecandypage.cpp +++ b/kpersonalizer/keyecandypage.cpp @@ -623,13 +623,13 @@ void KEyeCandyPage::save(bool currSettings){ kdesktopconf->sync(); KGlobal::config()->sync(); // restart kwin for window effects - kapp->dcopClient()->send("knotify", "Notify", "reconfigure()", ""); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("knotify", "Notify", "reconfigure()", TQString("")); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); // set the display options (style effects) KIPC::sendMessageAll(KIPC::SettingsChanged); TQApplication::syncX(); // kicker stuff: Iconzooming etc. - kapp->dcopClient()->send( "kicker", "Panel", "configure()", "" ); + kapp->dcopClient()->send( "kicker", "Panel", "configure()", TQString("") ); // Icon stuff for (int i=0; i<KIcon::LastGroup; i++) { KIPC::sendMessageAll(KIPC::IconChanged, i); @@ -637,10 +637,10 @@ void KEyeCandyPage::save(bool currSettings){ // font stuff KIPC::sendMessageAll(KIPC::FontChanged); // unfortunately, the konqiconview does not re-read the configuration to restructure the previews and the background picture - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", "" ); - kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", "" ); - kapp->dcopClient()->send( "kdesktop", "KBackgroundIface", "configure()", "" ); - kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "lineupIcons()", "" ); + kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") ); + kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") ); + kapp->dcopClient()->send( "kdesktop", "KBackgroundIface", "configure()", TQString("") ); + kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "lineupIcons()", TQString("") ); } void KEyeCandyPage::slotEyeCandyShowDetails(bool details){ diff --git a/kpersonalizer/keyecandypagedlg.ui b/kpersonalizer/keyecandypagedlg.ui index 4f94df4ed..81baf5c80 100644 --- a/kpersonalizer/keyecandypagedlg.ui +++ b/kpersonalizer/keyecandypagedlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KEyeCandyPageDlg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KEyeCandyPageDlg</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="6" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="6" colspan="1"> <property name="name"> <cstring>px_eyecandySidebar</cstring> </property> @@ -28,7 +28,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>170</width> <height>430</height> @@ -47,7 +47,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>TextLabel8</cstring> </property> @@ -63,7 +63,7 @@ <string><P>Trinity offers many visually appealing special effects, such as smoothed fonts, previews in the file manager and animated menus. All this beauty, however, comes at a small performance cost. </P> If you have a fast, new processor, you might want to turn them all on, but for those of us with slower processors, starting off with less eye candy helps to keep your desktop more responsive.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -71,7 +71,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t <property name="wordwrap" stdset="0"> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout8</cstring> </property> @@ -79,7 +79,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3_2</cstring> </property> @@ -98,7 +98,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -120,7 +120,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t <enum>Expanding</enum> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>Fast_2</cstring> </property> @@ -136,7 +136,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t <string>Fast Processor (more effects)</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -147,7 +147,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t </widget> </hbox> </widget> - <widget class="QSlider" row="2" column="1"> + <widget class="TQSlider" row="2" column="1"> <property name="name"> <cstring>sld_effects</cstring> </property> @@ -167,7 +167,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t <enum>Right</enum> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -175,7 +175,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btn_detail</cstring> </property> @@ -222,7 +222,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>120</height> diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp index a23f98322..61e2b1935 100644 --- a/kpersonalizer/kfindlanguage.cpp +++ b/kpersonalizer/kfindlanguage.cpp @@ -34,19 +34,19 @@ KFindLanguage::KFindLanguage() { m_oldlang = config->readEntry("Language"); m_oldlang = m_oldlang.lower(); - m_oldlang = m_oldlang.left(m_oldlang.find(':')); // only use the first lang + m_oldlang = m_oldlang.left(m_oldlang.tqfind(':')); // only use the first lang m_country = config->readEntry("Country", "C"); if (m_country == "C") { - m_country = TQString::fromLatin1(getenv("LANG")); + m_country = TQString::tqfromLatin1(getenv("LANG")); if(m_country.left(5) == "nn_NO") // glibc's nn_NO is KDE's no_NY m_country = "no"; - if(m_country.contains("_")) - m_country = m_country.mid(m_country.find("_")+1); - if(m_country.contains(".")) - m_country = m_country.left(m_country.find(".")); - if(m_country.contains("@")) - m_country = m_country.left(m_country.find("@")); + if(m_country.tqcontains("_")) + m_country = m_country.mid(m_country.tqfind("_")+1); + if(m_country.tqcontains(".")) + m_country = m_country.left(m_country.tqfind(".")); + if(m_country.tqcontains("@")) + m_country = m_country.left(m_country.tqfind("@")); if(m_country != "C") m_country = m_country.lower(); if(m_country == "en") // special-case "en" - should be "en_GB" or "en_US", but plain "en" is in use quite often @@ -54,7 +54,7 @@ KFindLanguage::KFindLanguage() { } // get the users primary Languages - KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop").arg(m_country)), true); + KSimpleConfig ent(locate("locale", TQString::tqfromLatin1("l10n/%1/entry.desktop").arg(m_country)), true); ent.setGroup("KCM Locale"); TQStringList langs = ent.readListEntry("Languages"); if (langs.isEmpty()) @@ -82,9 +82,9 @@ KFindLanguage::KFindLanguage() { TQString name = entry.readEntry("Name", i18n("without name")); TQString tag = *it; - int index = tag.findRev('/'); + int index = tag.tqfindRev('/'); tag = tag.left(index); - index = tag.findRev('/'); + index = tag.tqfindRev('/'); tag = tag.mid(index+1); m_langlist << tag; @@ -96,7 +96,7 @@ KFindLanguage::KFindLanguage() { if (m_oldlang.isEmpty()) { compare = langs.first(); for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) { - if (*it == TQString::fromLatin1(getenv("LANG")).mid(3, 2).lower()) + if (*it == TQString::tqfromLatin1(getenv("LANG")).mid(3, 2).lower()) compare = *it; } } @@ -109,10 +109,10 @@ KFindLanguage::KFindLanguage() { TQStringList::ConstIterator it; for( it = m_langlist.begin(); it != m_langlist.end(); ++it) { int match=0; - TQString l = (*it).left((*it).find(";")); + TQString l = (*it).left((*it).tqfind(";")); if (l == "C") match++; - if(l.contains(compare)) + if(l.tqcontains(compare)) match+=2; if(l.left(compare.length()) == compare) match+=10; diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp index 3d92f2f4e..7706331fb 100644 --- a/kpersonalizer/kospage.cpp +++ b/kpersonalizer/kospage.cpp @@ -93,7 +93,7 @@ void KOSPage::save(bool currSettings){ kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray()); /////////////////////////////////////////// /// restart kwin for window effects - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); /////////////////////////////////////////// // Make the kaccess daemon read the changed config file diff --git a/kpersonalizer/kospage.h b/kpersonalizer/kospage.h index b28719dc1..69bd2d959 100644 --- a/kpersonalizer/kospage.h +++ b/kpersonalizer/kospage.h @@ -64,7 +64,7 @@ private: // DEFAULT VALUES SET BY USER bool b_Gestures, b_MacMenuBar, b_SingleClick, b_BusyCursor, b_ShowMenuBar, b_DesktopUnderline, b_KonqUnderline, b_ChangeCursor, b_syncClipboards; - QString s_TitlebarDCC, s_FocusPolicy, s_AltTabStyle, s_MMB, + TQString s_TitlebarDCC, s_FocusPolicy, s_AltTabStyle, s_MMB, s_TitlebarMMB, s_TitlebarRMB; TQMap<TQString, TQString> map_AppUserKeys, map_GlobalUserKeys; // DEFAULT VALLUES SET BY USER (END) diff --git a/kpersonalizer/kospagedlg.ui b/kpersonalizer/kospagedlg.ui index e4c5fd4b3..1419a11bc 100644 --- a/kpersonalizer/kospagedlg.ui +++ b/kpersonalizer/kospagedlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KOSPageDlg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KOSPageDlg</cstring> </property> @@ -16,12 +16,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextView" row="4" column="1"> + <widget class="TQTextView" row="4" column="1"> <property name="name"> <cstring>textview_ospage</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="8" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="8" colspan="1"> <property name="name"> <cstring>px_osSidebar</cstring> </property> @@ -33,7 +33,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>170</width> <height>430</height> @@ -52,7 +52,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>TextLabel9</cstring> </property> @@ -60,7 +60,7 @@ <string>Description:</string> </property> </widget> - <widget class="QButtonGroup" row="2" column="1"> + <widget class="TQButtonGroup" row="2" column="1"> <property name="name"> <cstring>bg_ospage</cstring> </property> @@ -71,7 +71,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>rb_kde</cstring> </property> @@ -82,7 +82,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>rb_unix</cstring> </property> @@ -90,7 +90,7 @@ <string>UNIX (R)</string> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>rb_windows</cstring> </property> @@ -98,7 +98,7 @@ <string>Microsoft Windows (R)</string> </property> </widget> - <widget class="QRadioButton" row="1" column="1"> + <widget class="TQRadioButton" row="1" column="1"> <property name="name"> <cstring>rb_mac</cstring> </property> @@ -108,7 +108,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -136,7 +136,7 @@ Trinity allows you to customize its behavior according to your needs.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>22</width> <height>10</height> @@ -153,25 +153,25 @@ Trinity allows you to customize its behavior according to your needs.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>22</width> <height>16</height> </size> </property> </spacer> - <widget class="QLabel" row="6" column="1"> + <widget class="TQLabel" row="6" column="1"> <property name="name"> <cstring>TextLabel2</cstring> </property> <property name="text"> <string>For motion impaired users, Trinity provides keyboard gestures to activate special keyboard settings.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QCheckBox" row="7" column="1"> + <widget class="TQCheckBox" row="7" column="1"> <property name="name"> <cstring>cb_gestures</cstring> </property> diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp index e28848cc0..71349d2e9 100644 --- a/kpersonalizer/kpersonalizer.cpp +++ b/kpersonalizer/kpersonalizer.cpp @@ -232,11 +232,11 @@ void KPersonalizer::setBeforeSession(){ /** there seems to be a bug in TQWizard, that makes this evil hack necessary */ void KPersonalizer::setPosition() { - TQSize hint = countrypage->sizeHint(); - TQSize os_size = ospage->sizeHint(); - TQSize candy_size = eyecandy->sizeHint(); - TQSize style_size = stylepage->sizeHint(); - TQSize refine_size = refinepage->sizeHint(); + TQSize hint = countrypage->tqsizeHint(); + TQSize os_size = ospage->tqsizeHint(); + TQSize candy_size = eyecandy->tqsizeHint(); + TQSize style_size = stylepage->tqsizeHint(); + TQSize refine_size = refinepage->tqsizeHint(); // get the width of the broadest child-widget if ( hint.width() < os_size.width() ) diff --git a/kpersonalizer/krefinepagedlg.ui b/kpersonalizer/krefinepagedlg.ui index 8d5b58357..a13e3364b 100644 --- a/kpersonalizer/krefinepagedlg.ui +++ b/kpersonalizer/krefinepagedlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KRefinePageDlg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KRefinePageDlg</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>TextLabel11</cstring> </property> @@ -32,13 +32,13 @@ <string><h3>Finished</h3> <p>After closing this dialog you can always restart this Wizard by choosing the entry <b>Desktop Settings Wizard</b> from the Settings menu.</p></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> </property> </widget> - <widget class="QFrame" row="2" column="1"> + <widget class="TQFrame" row="2" column="1"> <property name="name"> <cstring>Frame3</cstring> </property> @@ -52,7 +52,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>px_kcontrol</cstring> </property> @@ -65,7 +65,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -80,13 +80,13 @@ <property name="text"> <string>You can refine the settings you made by starting the Trinity Control Center by choosing the entry <b>Control Center</b> in the K menu.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0" rowspan="7" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="7" colspan="1"> <property name="name"> <cstring>px_finishSidebar</cstring> </property> @@ -98,7 +98,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>170</width> <height>430</height> @@ -117,7 +117,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>lb_kcontrol</cstring> </property> @@ -132,7 +132,7 @@ <property name="text"> <string>You can also start the Trinity Control Center using the button below.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>16</height> @@ -163,14 +163,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="5" column="1"> + <widget class="TQLayoutWidget" row="5" column="1"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -188,14 +188,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"> + <widget class="TQPushButton"> <property name="name"> <cstring>pb_kcontrol</cstring> </property> @@ -213,7 +213,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -232,7 +232,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index 1323d94fe..04f6e49da 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -238,7 +238,7 @@ void KStylePage::saveIcons(bool curSettings) { for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++) { if (groups[i] == 0L) break; - KGlobal::config()->setGroup(TQString::fromLatin1(groups[i]) + "Icons"); + KGlobal::config()->setGroup(TQString::tqfromLatin1(groups[i]) + "Icons"); KGlobal::config()->writeEntry("Size", icontheme.defaultSize(i)); } KGlobal::config()->sync(); @@ -522,9 +522,9 @@ void KStylePage::liveUpdate() { // color palette changes KIPC::sendMessageAll(KIPC::PaletteChanged); // kwin-style - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); // kdesktop-background - kapp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", ""); + kapp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", TQString("")); } /** show the previewWidget styled with the selected one */ @@ -542,7 +542,7 @@ void KStylePage::switchPrevStyle() { // go ahead setStyleRecursive( stylePreview, palette, style ); // this flickers, but reliably draws the widgets corretly. - stylePreview->resize( stylePreview->sizeHint() ); + stylePreview->resize( stylePreview->tqsizeHint() ); delete appliedStyle; appliedStyle = style; @@ -552,11 +552,11 @@ void KStylePage::setStyleRecursive(TQWidget* w, TQPalette &palette, TQStyle* s) // Apply the new style. w->setStyle(s); // Recursively update all children. - const TQObjectList *children = w->children(); - if (!children) + const TQObjectList children = w->childrenListObject(); + if (children.isEmpty()) return; // Apply the style to each child widget. - TQPtrListIterator<TQObject> childit(*children); + TQPtrListIterator<TQObject> childit(children); TQObject *child; while ((child = childit.current()) != 0) { ++childit; diff --git a/kpersonalizer/kstylepagedlg.ui b/kpersonalizer/kstylepagedlg.ui index e32074ca3..58890bb36 100644 --- a/kpersonalizer/kstylepagedlg.ui +++ b/kpersonalizer/kstylepagedlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KStylePageDlg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KStylePageDlg</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -31,13 +31,13 @@ <property name="text"> <string>Please choose the way your computer should look by selecting one of the items below.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="4" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="4" colspan="1"> <property name="name"> <cstring>px_stylesSidebar</cstring> </property> @@ -49,7 +49,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>170</width> <height>430</height> @@ -81,7 +81,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>TextLabel2</cstring> </property> diff --git a/kpersonalizer/ksysinfo.cpp b/kpersonalizer/ksysinfo.cpp index 20a089b8f..014e6d489 100644 --- a/kpersonalizer/ksysinfo.cpp +++ b/kpersonalizer/ksysinfo.cpp @@ -57,9 +57,9 @@ void KSysInfo::initXInfo() { // vendor m_xvendor = !dpy ? TQString::null : (TQString)ServerVendor(dpy); // XFree-Inc? - m_xfree_inc = m_xvendor.contains("XFree86"); + m_xfree_inc = m_xvendor.tqcontains("XFree86"); // X.org ? - m_xorg = m_xvendor.contains("X.Org"); + m_xorg = m_xvendor.tqcontains("X.Org"); // release-number m_xrelease = !dpy ? 0 : VendorRelease(dpy); // RENDER-support @@ -99,29 +99,29 @@ bool KSysInfo::getRenderSupport(){ void KSysInfo::initFontFamilies() { TQFontDatabase fdb; - TQStringList families = fdb.families(); + TQStringList families = fdb.tqfamilies(); m_normal_font = TQString::null; m_fixed_font = TQString::null; int normal_priority = 0, fixed_priority = 0; for (uint i=0; i < families.count(); i++) { TQString font = *families.at(i); //add further NORMAL fonts here - if ( (font.contains("Arial [") || font=="Arial") && normal_priority < 15 ) { + if ( (font.tqcontains("Arial [") || font=="Arial") && normal_priority < 15 ) { m_normal_font = font; normal_priority = 15; - } else if ( font.contains("Vera Sans") && normal_priority < 12 ) { + } else if ( font.tqcontains("Vera Sans") && normal_priority < 12 ) { m_normal_font = font; normal_priority = 12; - } else if ( (font.contains("Luxi Sans") || font.contains("Lucidux Sans")) && normal_priority < 10 ) { + } else if ( (font.tqcontains("Luxi Sans") || font.tqcontains("Lucidux Sans")) && normal_priority < 10 ) { m_normal_font = font; normal_priority = 10; - } else if ( font.contains("Helmet") && normal_priority < 7 ) { + } else if ( font.tqcontains("Helmet") && normal_priority < 7 ) { m_normal_font = font; normal_priority = 7; - } else if ( font.contains("Nimbus Sans") && normal_priority < 5 ) { + } else if ( font.tqcontains("Nimbus Sans") && normal_priority < 5 ) { m_normal_font = font; normal_priority = 5; - } else if ( font.contains("Sans") & m_fdb->isSmoothlyScalable(font) && normal_priority < 3 ) { + } else if ( font.tqcontains("Sans") & m_fdb->isSmoothlyScalable(font) && normal_priority < 3 ) { m_normal_font = font; normal_priority = 3; } else if ( m_fdb->isSmoothlyScalable(font) && !(m_fdb->isFixedPitch(font,"Normal") && m_fdb->isFixedPitch(font,"Bold")) && normal_priority < 2) { @@ -132,16 +132,16 @@ void KSysInfo::initFontFamilies() { normal_priority = 1; } //add further FIXED fonts here - if (font.contains("Courier New") && fixed_priority < 15){ + if (font.tqcontains("Courier New") && fixed_priority < 15){ m_fixed_font = font; fixed_priority = 15; - } else if ( (font.contains("Luxi Mono") || font.contains("Lucidux Mono")) && fixed_priority < 10 ) { + } else if ( (font.tqcontains("Luxi Mono") || font.tqcontains("Lucidux Mono")) && fixed_priority < 10 ) { m_fixed_font = font; fixed_priority = 10; - } else if (font.contains("Andale Mono") && fixed_priority < 5) { + } else if (font.tqcontains("Andale Mono") && fixed_priority < 5) { m_fixed_font = font; fixed_priority = 5; - } else if ( font.contains("Mono") && m_fdb->isSmoothlyScalable(font) && fixed_priority < 3 ) { + } else if ( font.tqcontains("Mono") && m_fdb->isSmoothlyScalable(font) && fixed_priority < 3 ) { m_fixed_font = font; fixed_priority = 3; } else if ( m_fdb->isSmoothlyScalable(font) && m_fdb->isFixedPitch(font,"Normal") && fixed_priority < 2 ) { @@ -201,11 +201,11 @@ TQFont KSysInfo::getFixedWidthFont(){ // File Parser while (file->readLine(buf, sizeof(buf) - 1) > 0) { TQString s1 = TQString::fromLocal8Bit(buf); - TQString s2 = s1.mid(s1.find(":") + 1); - s1.truncate(s1.find(":")); + TQString s2 = s1.mid(s1.tqfind(":") + 1); + s1.truncate(s1.tqfind(":")); s1=s1.stripWhiteSpace(); s2=s2.stripWhiteSpace(); - if(s1.contains("MHz")){ + if(s1.tqcontains("MHz")){ float fspeed = s2.toFloat(0); fspeed = floor(fspeed); m_cpu_speed = (int)fspeed; diff --git a/kpersonalizer/stylepreview.ui b/kpersonalizer/stylepreview.ui index 0f0972b8a..7e132c4c7 100644 --- a/kpersonalizer/stylepreview.ui +++ b/kpersonalizer/stylepreview.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>StylePreview</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>StylePreview</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame3</cstring> </property> @@ -30,11 +30,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>TabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QProgressBar" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQProgressBar" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>ProgressBar1</cstring> </property> @@ -53,7 +53,7 @@ <number>70</number> </property> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>PushButton1</cstring> </property> @@ -61,12 +61,12 @@ <string>Button</string> </property> </widget> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>SpinBox1</cstring> </property> </widget> - <widget class="QComboBox" row="3" column="1" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="3" column="1" rowspan="1" colspan="2"> <item> <property name="text"> <string>ComboBox</string> @@ -76,7 +76,7 @@ <cstring>ComboBox1</cstring> </property> </widget> - <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>Slider1</cstring> </property> @@ -84,7 +84,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QButtonGroup" row="0" column="0" rowspan="4" colspan="1"> + <widget class="TQButtonGroup" row="0" column="0" rowspan="4" colspan="1"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -95,7 +95,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton1</cstring> </property> @@ -106,7 +106,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton2</cstring> </property> @@ -128,7 +128,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>CheckBox1</cstring> </property> @@ -144,7 +144,7 @@ </widget> </vbox> </widget> - <widget class="QScrollBar" row="0" column="3" rowspan="4" colspan="1"> + <widget class="TQScrollBar" row="0" column="3" rowspan="4" colspan="1"> <property name="name"> <cstring>ScrollBar1</cstring> </property> @@ -157,7 +157,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -176,10 +176,10 @@ <include location="local" impldecl="in implementation">stylepreview.ui.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot>init()</slot> - <slot returnType="bool">eventFilter( QObject * obj, QEvent * ev )</slot> -</slots> + <slot returnType="bool">eventFilter( TQObject * obj, TQEvent * ev )</slot> +</Q_SLOTS> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/kpersonalizer/stylepreview.ui.h b/kpersonalizer/stylepreview.ui.h index d073ddc34..048f9fba9 100644 --- a/kpersonalizer/stylepreview.ui.h +++ b/kpersonalizer/stylepreview.ui.h @@ -48,7 +48,7 @@ void StylePreview::init() { ++it; obj->installEventFilter(this); - ((TQWidget*)obj)->setFocusPolicy(NoFocus); + ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus); } delete l; } diff --git a/kreadconfig/kwriteconfig.cpp b/kreadconfig/kwriteconfig.cpp index 83d1afe23..5462eae5a 100644 --- a/kreadconfig/kwriteconfig.cpp +++ b/kreadconfig/kwriteconfig.cpp @@ -1,6 +1,6 @@ /* Write KConfig() entries - for use in shell scripts. - * (c) 2001 Red Hat, Inc. & Luís Pedro Coelho - * Programmed by Luís Pedro Coelho <luis_pedro@netcabo.pt> + * (c) 2001 Red Hat, Inc. & Lu�s Pedro Coelho + * Programmed by Lu�s Pedro Coelho <luis_pedro@netcabo.pt> * based on kreadconfig by Bernhard Rosenkraenzer <bero@redhat.com> * * License: GPL @@ -29,8 +29,8 @@ int main(int argc, char **argv) "1.0.0", I18N_NOOP("Write KConfig entries - for use in shell scripts"), KAboutData::License_GPL, - "(c) 2001 Red Hat, Inc. & Luís Pedro Coelho"); - aboutData.addAuthor("Luís Pedro Coelho", 0, "luis_pedro@netcabo.pt"); + "(c) 2001 Red Hat, Inc. & Lu�s Pedro Coelho"); + aboutData.addAuthor("Lu�s Pedro Coelho", 0, "luis_pedro@netcabo.pt"); aboutData.addAuthor("Bernhard Rosenkraenzer", "Wrote kreadconfig on which this is based", "bero@redhat.com"); KCmdLineArgs::init(argc, argv, &aboutData); KCmdLineArgs::addCmdLineOptions(options); @@ -52,7 +52,7 @@ int main(int argc, char **argv) KConfig *konfig; if (file.isEmpty()) - konfig = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); + konfig = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false); else konfig = new KConfig(file, false, false); @@ -66,7 +66,7 @@ int main(int argc, char **argv) } else if (type=="path") { konfig->writePathEntry( key, TQString::fromLocal8Bit( value ) ); } else { - konfig->writeEntry( key, TQString::fromLocal8Bit( value ) ); + konfig->writeEntry( key, TQString(TQString::fromLocal8Bit( value )) ); } konfig->sync(); delete konfig; diff --git a/kscreensaver/blankscrn.cpp b/kscreensaver/blankscrn.cpp index 1f57726b2..114bff145 100644 --- a/kscreensaver/blankscrn.cpp +++ b/kscreensaver/blankscrn.cpp @@ -69,7 +69,7 @@ KBlankSetup::KBlankSetup( TQWidget *parent, const char *name ) grid->setRowStretch( 2, 10 ); grid->setRowStretch( 3, 20 ); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); } // read settings from config file diff --git a/kscreensaver/random.cpp b/kscreensaver/random.cpp index cd984a145..d6b54c8d5 100644 --- a/kscreensaver/random.cpp +++ b/kscreensaver/random.cpp @@ -41,7 +41,7 @@ static void usage(char *name) { puts(i18n("Usage: %1 [-setup] [args]\n" "Starts a random screen saver.\n" - "Any arguments (except -setup) are passed on to the screen saver.").arg( name ).local8Bit().data()); + "Any arguments (except -setup) are passed on to the screen saver.").tqarg( name ).local8Bit().data()); } static const char appName[] = "random"; @@ -148,7 +148,7 @@ int main(int argc, char *argv[]) TQStringList defaults = type.readListEntry( "Defaults" ); TQMap<TQString, int> def_numbers; for ( TQStringList::ConstIterator it = defaults.begin(); it != defaults.end(); ++it ) { - int index = ( *it ).find( ':' ); + int index = ( *it ).tqfind( ':' ); if ( index == -1 ) def_numbers[*it] = 1; else @@ -160,7 +160,7 @@ int main(int argc, char *argv[]) int howoften = 1; if ( defaults.count() != 0 ) { TQFileInfo fi( tempSaverFileList[i] ); - if ( def_numbers.contains( fi.fileName() ) ) + if ( def_numbers.tqcontains( fi.fileName() ) ) howoften = def_numbers[fi.fileName()]; else howoften = 0; @@ -271,7 +271,7 @@ KRandomSetup::KRandomSetup( TQWidget *parent, const char *name ) manipulateScreen = new TQCheckBox(i18n("Use screen savers that manipulate the screen"), main); grid->addWidget(manipulateScreen, 1, 0); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); KConfig config("krandom.kssrc"); config.setGroup("Settings"); diff --git a/ksmserver/client.cpp b/ksmserver/client.cpp index 2f6708963..b1927890a 100644 --- a/ksmserver/client.cpp +++ b/ksmserver/client.cpp @@ -146,7 +146,7 @@ TQString KSMClient::program() const SmProp* p = property( SmProgram ); if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1) return TQString::null; - return TQString::fromLatin1( (const char*) p->vals[0].value ); + return TQString::tqfromLatin1( (const char*) p->vals[0].value ); } TQStringList KSMClient::restartCommand() const @@ -156,7 +156,7 @@ TQStringList KSMClient::restartCommand() const if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1) return result; for ( int i = 0; i < p->num_vals; i++ ) - result +=TQString::fromLatin1( (const char*) p->vals[i].value ); + result +=TQString::tqfromLatin1( (const char*) p->vals[i].value ); return result; } @@ -167,7 +167,7 @@ TQStringList KSMClient::discardCommand() const if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1) return result; for ( int i = 0; i < p->num_vals; i++ ) - result +=TQString::fromLatin1( (const char*) p->vals[i].value ); + result +=TQString::tqfromLatin1( (const char*) p->vals[i].value ); return result; } @@ -184,7 +184,7 @@ TQString KSMClient::userId() const SmProp* p = property( SmUserID ); if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1) return TQString::null; - return TQString::fromLatin1( (const char*) p->vals[0].value ); + return TQString::tqfromLatin1( (const char*) p->vals[0].value ); } diff --git a/ksmserver/global.h b/ksmserver/global.h index 326587ac6..b76a8b363 100644 --- a/ksmserver/global.h +++ b/ksmserver/global.h @@ -10,4 +10,8 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #define KSMVendorString "KDE" #define KSMReleaseString "1.0" +#ifdef USE_QT4 +#define NO_QT3_DBUS_SUPPORT +#endif + #endif diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp index 773cd514d..d7838253b 100644 --- a/ksmserver/legacy.cpp +++ b/ksmserver/legacy.cpp @@ -73,7 +73,7 @@ extern Time qt_x_time; static int winsErrorHandler(Display *, XErrorEvent *ev) { if (windowMapPtr) { - WindowMap::Iterator it = windowMapPtr->find(ev->resourceid); + WindowMap::Iterator it = windowMapPtr->tqfind(ev->resourceid); if (it != windowMapPtr->end()) (*it).type = SM_ERROR; } @@ -103,7 +103,7 @@ void KSMServer::performLegacySessionSave() for ( TQValueList<WId>::ConstIterator it = module.windows().begin(); it != module.windows().end(); ++it) { WId leader = windowWmClientLeader( *it ); - if (!legacyWindows.contains(leader) && windowSessionId( *it, leader ).isEmpty()) { + if (!legacyWindows.tqcontains(leader) && windowSessionId( *it, leader ).isEmpty()) { SMType wtype = SM_WMCOMMAND; int nprotocols = 0; Atom *protocols = 0; @@ -167,7 +167,7 @@ void KSMServer::performLegacySessionSave() XNextEvent(newdisplay, &ev); if ( ( ev.xany.type == UnmapNotify ) || ( ev.xany.type == PropertyNotify && ev.xproperty.atom == XA_WM_COMMAND ) ) { - WindowMap::Iterator it = legacyWindows.find( ev.xany.window ); + WindowMap::Iterator it = legacyWindows.tqfind( ev.xany.window ); if ( it != legacyWindows.end() && (*it).type != SM_WMCOMMAND ) { awaiting_replies -= 1; if ( (*it).type != SM_ERROR ) @@ -219,8 +219,8 @@ void KSMServer::storeLegacySession( KConfig* config ) int count = 0; for (WindowMap::ConstIterator it = legacyWindows.begin(); it != legacyWindows.end(); ++it) { if ( (*it).type != SM_ERROR) { - if( excludeApps.contains( (*it).wmclass1.lower()) - || excludeApps.contains( (*it).wmclass2.lower()) || (*it).wmCommand[0] == "compiz" || (*it).wmCommand[0] == "beryl" || (*it).wmCommand[0] == "aquamarine" || (*it).wmCommand[0] == "beryl-manager" || (*it).wmCommand[0] == "beryl-settings" || (*it).wmCommand[0] == "kde-window-decorator" || (*it).wmCommand[0] == "emerald") + if( excludeApps.tqcontains( (*it).wmclass1.lower()) + || excludeApps.tqcontains( (*it).wmclass2.lower()) || (*it).wmCommand[0] == "compiz" || (*it).wmCommand[0] == "beryl" || (*it).wmCommand[0] == "aquamarine" || (*it).wmCommand[0] == "beryl-manager" || (*it).wmCommand[0] == "beryl-settings" || (*it).wmCommand[0] == "kde-window-decorator" || (*it).wmCommand[0] == "emerald") continue; if ( !(*it).wmCommand.isEmpty() && !(*it).wmClientMachine.isEmpty() ) { count++; @@ -317,7 +317,7 @@ static TQStringList getQStringListProperty(WId w, Atom prop) if (!data) return result; for (int i=0; i<(int)nitems; i++) { - result << TQString::fromLatin1( (const char*)data + i ); + result << TQString::tqfromLatin1( (const char*)data + i ); while(data[i]) i++; } XFree(data); @@ -365,7 +365,7 @@ TQString KSMServer::windowWmClientMachine(WId w) } } } - return TQString::fromLatin1(result); + return TQString::tqfromLatin1(result); } WId KSMServer::windowWmClientLeader(WId w) diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index d41cfc1fa..797edae96 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -170,7 +170,7 @@ void sanity_check( int argc, char* argv[] ) qmsg.sprintf(msg.data(), path.data()); qmsg = msg_pre+qmsg+msg_post; TQMessageBox::critical(0, "KDE Installation Problem!", - TQString::fromLatin1(qmsg.data())); + TQString::tqfromLatin1(qmsg.data())); exit(255); } } @@ -218,7 +218,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) only_local = false; #endif - KSMServer *server = new KSMServer( TQString::fromLatin1(wm), only_local); + KSMServer *server = new KSMServer( TQString::tqfromLatin1(wm), only_local); kapp->dcopClient()->setDefaultObject( server->objId() ); IceSetIOErrorHandler( IoErrorHandler ); diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index d98faf09a..fc3afb288 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -297,7 +297,7 @@ void KSMGetPropertiesProc ( } -class KSMListener : public QSocketNotifier +class KSMListener : public TQSocketNotifier { public: KSMListener( IceListenObj obj ) @@ -310,7 +310,7 @@ public: IceListenObj listenObj; }; -class KSMConnection : public QSocketNotifier +class KSMConnection : public TQSocketNotifier { public: KSMConnection( IceConn conn ) @@ -632,9 +632,9 @@ KSMServer::KSMServer( const TQString& windowManager, bool _only_local ) TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver")); TQCString display = ::getenv("DISPLAY"); // strip the screen number from the display - display.replace(TQRegExp("\\.[0-9]+$"), ""); + display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); int i; - while( (i = display.find(':')) >= 0) + while( (i = display.tqfind(':')) >= 0) display[i] = '_'; fName += "_"+display; @@ -697,9 +697,9 @@ void KSMServer::cleanUp() TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver")); TQCString display = ::getenv("DISPLAY"); // strip the screen number from the display - display.replace(TQRegExp("\\.[0-9]+$"), ""); + display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); int i; - while( (i = display.find(':')) >= 0) + while( (i = display.tqfind(':')) >= 0) display[i] = '_'; fName += "_"+display; @@ -761,7 +761,7 @@ KSMClient* KSMServer::newClient( SmsConn conn ) void KSMServer::deleteClient( KSMClient* client ) { - if ( clients.findRef( client ) == -1 ) // paranoia + if ( clients.tqfindRef( client ) == -1 ) // paranoia return; clients.removeRef( client ); if ( client == clientInteracting ) { @@ -868,7 +868,7 @@ void KSMServer::storeSession() TQStringList restartCommand = c->restartCommand(); if (program.isEmpty() && restartCommand.isEmpty()) continue; - if (excludeApps.contains( program.lower())) + if (excludeApps.tqcontains( program.lower())) continue; count++; diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index a850d40be..c97b05ffb 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -184,7 +184,7 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm, // Set the real desktop background to black so that exit looks // clean regardless of what was on "our" desktop. - kapp->desktop()->setBackgroundColor( Qt::black ); + TQT_TQWIDGET(kapp->desktop())->setBackgroundColor( Qt::black ); state = Shutdown; wmPhase1WaitingCount = 0; saveType = saveSession?SmSaveBoth:SmSaveGlobal; diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 0c7211efd..354328677 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -79,7 +79,7 @@ KSMShutdownFeedback::KSMShutdownFeedback() { DCOPRef("kicker", "KMenu").call("hideMenu"); // Make sure the K Menu is completely removed from the screen before taking a snapshot... - m_grayImage = TQPixmap::grabWindow(qt_xrootwin(), 0, 0, TQApplication::desktop()->width(), TQApplication::desktop()->height()).convertToImage(); + m_grayImage = TQPixmap(TQPixmap::grabWindow(qt_xrootwin(), 0, 0, TQApplication::desktop()->width(), TQApplication::desktop()->height())).convertToImage(); m_unfadedImage = TQImage::TQImage(); resize(0, 0); setShown(true); @@ -247,7 +247,7 @@ void KSMShutdownFeedback::slotPaintEffect() } KPixmap pixmap; - pixmap = TQPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 ); + pixmap = TQPixmap(TQPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 )); TQImage image = pixmap.convertToImage(); KImageEffect::blend( Qt::black, image, 0.4 ); KImageEffect::toGray( image, true ); @@ -264,7 +264,7 @@ void KSMShutdownFeedback::slotPaintEffect() KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, bool maysd, KApplication::ShutdownType sdtype ) - : TQDialog( parent, 0, TRUE, WType_Popup ), targets(0) + : TQDialog( parent, 0, TRUE, (WFlags)WType_Popup ), targets(0) // this is a WType_Popup on purpose. Do not change that! Not // having a popup here has severe side effects. @@ -274,7 +274,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, TQFrame* frame = new TQFrame( this ); frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); - frame->setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) ); + frame->setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) ); // we need to set the minimum size for the logout box, since it // gets too small if there isn't all options available frame->setMinimumWidth(400); @@ -315,12 +315,12 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, { // first line of buttons hbuttonbox = new TQHBoxLayout( hbox, factor * KDialog::spacingHint() ); - hbuttonbox->setAlignment( Qt::AlignHCenter ); + hbuttonbox->tqsetAlignment( Qt::AlignHCenter ); // End session FlatButton* btnLogout = new FlatButton( frame ); btnLogout->setTextLabel( TQString("&") + i18n("Log out"), false ); btnLogout->setPixmap( DesktopIcon( "back") ); - int i = btnLogout->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 + int i = btnLogout->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1 btnLogout->setAccel( "ALT+" + btnLogout->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnLogout ); connect(btnLogout, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogout())); @@ -335,12 +335,12 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, hbox->addWidget( lfrm, AlignCenter ); buttonlay = new TQVBoxLayout( hbox, factor * KDialog::spacingHint() ); - buttonlay->setAlignment( Qt::AlignHCenter ); + buttonlay->tqsetAlignment( Qt::AlignHCenter ); TQLabel* icon = new TQLabel( lfrm ); icon->setPixmap( UserIcon( "shutdownkonq" ) ); - lfrm->setFixedSize( icon->sizeHint()); - icon->setFixedSize( icon->sizeHint()); + lfrm->setFixedSize( icon->tqsizeHint()); + icon->setFixedSize( icon->tqsizeHint()); buttonlay->addStretch( 1 ); // End session @@ -431,7 +431,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, FlatButton* btnSuspend = new FlatButton( frame ); btnSuspend->setTextLabel( i18n("&Suspend"), false ); btnSuspend->setPixmap( DesktopIcon( "suspend") ); - int i = btnSuspend->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 + int i = btnSuspend->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1 btnSuspend->setAccel( "ALT+" + btnSuspend->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnSuspend); connect(btnSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotSuspend())); @@ -443,7 +443,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, FlatButton* btnHibernate = new FlatButton( frame ); btnHibernate->setTextLabel( i18n("&Hibernate"), false ); btnHibernate->setPixmap( DesktopIcon( "hibernate") ); - int i = btnHibernate->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 + int i = btnHibernate->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1 btnHibernate->setAccel( "ALT+" + btnHibernate->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnHibernate); connect(btnHibernate, TQT_SIGNAL(clicked()), TQT_SLOT(slotHibernate())); @@ -454,13 +454,13 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, // bottom buttons TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); - hbuttonbox2->setAlignment( Qt::AlignHCenter ); + hbuttonbox2->tqsetAlignment( Qt::AlignHCenter ); // Reboot FlatButton* btnReboot = new FlatButton( frame ); btnReboot->setTextLabel( i18n("&Restart"), false ); btnReboot->setPixmap( DesktopIcon( "reload") ); - int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 + int i = btnReboot->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1 btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ; hbuttonbox2->addWidget ( btnReboot); connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot())); @@ -479,7 +479,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, for (TQStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index) { TQString label = (*it); - label=label.replace('&',"&&"); + label=label.tqreplace('&',"&&"); if (index == cur) targets->insertItem( label + i18n("current option in boot loader", " (current)"), index); else @@ -495,7 +495,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, FlatButton* btnHalt = new FlatButton( frame ); btnHalt->setTextLabel( i18n("&Turn Off"), false ); btnHalt->setPixmap( DesktopIcon( "exit") ); - i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 + i = btnHalt->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1 btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ; hbuttonbox2->addWidget ( btnHalt ); connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt())); @@ -504,7 +504,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, // cancel buttonbox TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); - hbuttonbox3->setAlignment( Qt::AlignRight ); + hbuttonbox3->tqsetAlignment( Qt::AlignRight ); // Back to Desktop KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame ); @@ -544,7 +544,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, for (TQStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index) { TQString label = (*it); - label=label.replace('&',"&&"); + label=label.tqreplace('&',"&&"); if (index == cur) targets->insertItem( label + i18n("current option in boot loader", " (current)"), index); else @@ -591,7 +591,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, { // cancel buttonbox TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); - hbuttonbox3->setAlignment( Qt::AlignRight ); + hbuttonbox3->tqsetAlignment( Qt::AlignRight ); // Back to Desktop KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame ); @@ -716,7 +716,7 @@ bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sd maysd, sdtype ); // Show dialog (will save the background in showEvent) - TQSize sh = l->sizeHint(); + TQSize sh = l->tqsizeHint(); TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); l->move(rect.x() + (rect.width() - sh.width())/2, @@ -770,7 +770,7 @@ void KSMDelayedPushButton::slotTimeout() } KSMDelayedMessageBox::KSMDelayedMessageBox( KApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay ) - : TimedLogoutDlg( 0, 0, true, WType_Popup ), m_remaining(confirmDelay) + : TimedLogoutDlg( 0, 0, true, (WFlags)WType_Popup ), m_remaining(confirmDelay) { if ( sdtype == KApplication::ShutdownTypeHalt ) { @@ -798,7 +798,7 @@ KSMDelayedMessageBox::KSMDelayedMessageBox( KApplication::ShutdownType sdtype, c adjustSize(); if ( double( height() ) / width() < 0.25 ) { - setFixedHeight( qRound( width() * 0.3 ) ); + setFixedHeight( tqRound( width() * 0.3 ) ); adjustSize(); } TQTimer *timer = new TQTimer( this ); @@ -822,7 +822,7 @@ bool KSMDelayedMessageBox::showTicker( KApplication::ShutdownType sdtype, const { kapp->enableStyles(); KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay ); - TQSize sh = msg.sizeHint(); + TQSize sh = msg.tqsizeHint(); TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); msg.move(rect.x() + (rect.width() - sh.width())/2, @@ -910,7 +910,7 @@ void FlatButton::init() setUsesBigPixmap(true); setAutoRaise(true); setTextPosition( TQToolButton::Under ); - setFocusPolicy(TQWidget::StrongFocus); + setFocusPolicy(TQ_StrongFocus); } diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h index 65081e1c3..e3c67eb31 100644 --- a/ksmserver/shutdowndlg.h +++ b/ksmserver/shutdowndlg.h @@ -30,13 +30,16 @@ class KAction; #include <kapplication.h> #include <kpixmapio.h> +#ifndef NO_QT3_DBUS_SUPPORT /* We acknowledge the the dbus API is unstable */ #define DBUS_API_SUBJECT_TO_CHANGE #include <dbus/connection.h> -#include <libhal.h> +#endif // NO_QT3_DBUS_SUPPORT + +#include <hal/libhal.h> // The (singleton) widget that makes/fades the desktop gray. -class KSMShutdownFeedback : public QWidget +class KSMShutdownFeedback : public TQWidget { Q_OBJECT @@ -72,7 +75,7 @@ private: // The confirmation dialog -class KSMShutdownDlg : public QDialog +class KSMShutdownDlg : public TQDialog { Q_OBJECT @@ -140,7 +143,7 @@ private: -class FlatButton : public QToolButton +class FlatButton : public TQToolButton { Q_OBJECT diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index 2778b9dd9..e74083de6 100644 --- a/ksmserver/startup.cpp +++ b/ksmserver/startup.cpp @@ -363,14 +363,14 @@ bool KSMServer::checkStartupSuspend() void KSMServer::suspendStartup( TQCString app ) { - if( !startupSuspendCount.contains( app )) + if( !startupSuspendCount.tqcontains( app )) startupSuspendCount[ app ] = 0; ++startupSuspendCount[ app ]; } void KSMServer::resumeStartup( TQCString app ) { - if( !startupSuspendCount.contains( app )) + if( !startupSuspendCount.tqcontains( app )) return; if( --startupSuspendCount[ app ] == 0 ) { startupSuspendCount.remove( app ); diff --git a/ksmserver/timed.ui b/ksmserver/timed.ui index 23d7aa2a0..14337f6cd 100644 --- a/ksmserver/timed.ui +++ b/ksmserver/timed.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TimedLogoutDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>TimedLogoutDlg</cstring> </property> @@ -33,7 +33,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame3</cstring> </property> @@ -64,7 +64,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout10</cstring> </property> @@ -78,7 +78,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout8</cstring> </property> @@ -86,7 +86,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout6</cstring> </property> @@ -110,14 +110,14 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>2</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_logo</cstring> </property> @@ -129,7 +129,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>48</width> <height>48</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>2</height> @@ -158,7 +158,7 @@ </spacer> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout7</cstring> </property> @@ -169,7 +169,7 @@ <property name="margin"> <number>7</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_title</cstring> </property> @@ -192,11 +192,11 @@ <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_text</cstring> </property> @@ -215,7 +215,7 @@ after X automatically.</string> <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -229,7 +229,7 @@ after X automatically.</string> <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -240,7 +240,7 @@ after X automatically.</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout9</cstring> </property> @@ -258,14 +258,14 @@ after X automatically.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton1</cstring> </property> @@ -286,14 +286,14 @@ after X automatically.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton2</cstring> </property> @@ -319,7 +319,7 @@ after X automatically.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>20</height> diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp index 335611a9f..172ab8520 100644 --- a/ksplashml/kcmksplash/installer.cpp +++ b/ksplashml/kcmksplash/installer.cpp @@ -99,7 +99,7 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn hbox->setStretchFactor( leftbox, 1 ); mThemesList = new ThemeListBox(this); - mThemesList->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); + mThemesList->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); connect(mThemesList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSetTheme(int))); connect(mThemesList, TQT_SIGNAL(filesDropped(const KURL::List&)), TQT_SLOT(slotFilesDropped(const KURL::List&))); leftbox->addWidget(mThemesList); @@ -120,16 +120,16 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn hbox->setStretchFactor( rightbox, 3 ); mPreview = new TQLabel(this); - mPreview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + mPreview->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); mPreview->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); mPreview->setMinimumSize(TQSize(320,240)); - mPreview->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter); + mPreview->tqsetAlignment(Qt::AlignHCenter|Qt::AlignVCenter); rightbox->addWidget(mPreview); rightbox->setStretchFactor( mPreview, 3 ); mText = new TQTextEdit(this); - mText->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); - mText->setMinimumSize(mText->sizeHint()); + mText->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); + mText->setMinimumSize(mText->tqsizeHint()); mText->setReadOnly(true); rightbox->addWidget(mText); rightbox->setStretchFactor( mText, 1 ); @@ -164,7 +164,7 @@ void SplashInstaller::addNewTheme(const KURL &srcURL) TQString dir = KGlobal::dirs()->saveLocation("ksplashthemes"); KURL url; TQString filename = srcURL.fileName(); - int i = filename.findRev('.'); + int i = filename.tqfindRev('.'); // Convert extension to lower case. if (i >= 0) filename = filename.left(i)+filename.mid(i).lower(); @@ -275,9 +275,9 @@ void SplashInstaller::save() if (cur < 0) return; TQString path = mThemesList->text(cur); - if ( mThemesList->text2path.contains( path ) ) + if ( mThemesList->text2path.tqcontains( path ) ) path = mThemesList->text2path[path]; - cur = path.findRev('/'); + cur = path.tqfindRev('/'); cnf.writeEntry("Theme", path.mid(cur+1) ); cnf.sync(); emit changed( false ); @@ -331,7 +331,7 @@ void SplashInstaller::slotSetTheme(int id) { TQString error = i18n("(Could not load theme)"); path = mThemesList->text(id); - if ( mThemesList->text2path.contains( path ) ) + if ( mThemesList->text2path.tqcontains( path ) ) path = mThemesList->text2path[path]; enabled = false; KURL url; @@ -339,7 +339,7 @@ void SplashInstaller::slotSetTheme(int id) if (!path.isEmpty()) { // Make sure the correct plugin is installed. - int i = path.findRev('/'); + int i = path.tqfindRev('/'); if (i >= 0) themeName = path.mid(i+1); url.setPath( path + "/Theme.rc" ); @@ -459,7 +459,7 @@ void SplashInstaller::slotTest() if (i < 0) return; TQString themeName = mThemesList->text2path[mThemesList->text(i)]; - int r = themeName.findRev('/'); + int r = themeName.tqfindRev('/'); if (r >= 0) themeName = themeName.mid(r+1); diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp index 77274da99..5e918cef3 100644 --- a/ksplashml/themeengine/default/themelegacy.cpp +++ b/ksplashml/themeengine/default/themelegacy.cpp @@ -164,7 +164,7 @@ void ThemeDefault::_initUi() mProgressBar->setPaletteBackgroundPixmap( blimage ); bottom_label->setFixedWidth( QMAX(blimage.width(),tlimage.width()) ); - bottom_label->setFixedHeight( mLabel->sizeHint().height()+4 ); + bottom_label->setFixedHeight( mLabel->tqsizeHint().height()+4 ); // 3 pixels of whitespace between the label and the progressbar. mLabel->resize( bottom_label->width(), bottom_label->height() ); @@ -274,7 +274,7 @@ TQPixmap ThemeDefault::updateBarPixmap( int state ) p.drawPixmap(0, 0, *mInactivePixmap, 0, 0, tmp.width()-offs ); else #endif - p.drawPixmap(offs, 0, *mInactivePixmap, offs, 0); + p.tqdrawPixmap(offs, 0, *mInactivePixmap, offs, 0); return tmp ; } diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp index 9aa6d2b26..dfcec5c4d 100644 --- a/ksplashml/themeengine/objkstheme.cpp +++ b/ksplashml/themeengine/objkstheme.cpp @@ -41,7 +41,7 @@ ObjKsTheme::ObjKsTheme( const TQString& theme ) if (desktop->isVirtualDesktop() && mXineramaScreen != -2) { TQRect rect = desktop->screenGeometry( mXineramaScreen ); - if (!rect.contains(TQCursor::pos())) + if (!rect.tqcontains(TQCursor::pos())) TQCursor::setPos(rect.center()); } diff --git a/ksplashml/themeengine/redmond/previewredmond.h b/ksplashml/themeengine/redmond/previewredmond.h index 69bef6b43..5fc5558c2 100644 --- a/ksplashml/themeengine/redmond/previewredmond.h +++ b/ksplashml/themeengine/redmond/previewredmond.h @@ -25,7 +25,7 @@ * images, so we'll just use a nice shade of gray or black as the * background... */ -class PreviewRedmond: public QWidget +class PreviewRedmond: public TQWidget { Q_OBJECT public: diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp index 5c7118441..175863f74 100644 --- a/ksplashml/themeengine/redmond/themeredmond.cpp +++ b/ksplashml/themeengine/redmond/themeredmond.cpp @@ -199,11 +199,11 @@ void ThemeRedmond::_initUi() kdmconfig->setGroup("X-*-Greeter"); TQString userPicsDir = kdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/'; TQString fs = kdmconfig->readEntry( "FaceSource" ); - if (fs == TQString::fromLatin1("UserOnly")) + if (fs == TQString::tqfromLatin1("UserOnly")) faceSource = fUserOnly; - else if (fs == TQString::fromLatin1("PreferUser")) + else if (fs == TQString::tqfromLatin1("PreferUser")) faceSource = fUserFirst; - else if (fs == TQString::fromLatin1("PreferAdmin")) + else if (fs == TQString::tqfromLatin1("PreferAdmin")) faceSource = fAdminFirst; else faceSource = fAdminOnly; // Admin Only diff --git a/ksplashml/themeengine/redmond/themeredmond.h b/ksplashml/themeengine/redmond/themeredmond.h index 6f8cc1550..3ae82031a 100644 --- a/ksplashml/themeengine/redmond/themeredmond.h +++ b/ksplashml/themeengine/redmond/themeredmond.h @@ -57,7 +57,7 @@ public slots: if( mText != s ) { mText = s; - repaint( false ); + tqrepaint( false ); } }; diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp index c7e9220e2..b0ceff516 100644 --- a/ksplashml/themeengine/standard/themestandard.cpp +++ b/ksplashml/themeengine/standard/themestandard.cpp @@ -156,8 +156,8 @@ void ThemeStandard::_readSettings() if( mSbFontItalic ) mSbFont.setItalic( true ); - mSbFg = cfg->readColorEntry( "Statusbar Foreground", &Qt::white ); - mSbBg = cfg->readColorEntry( "Statusbar Background", &Qt::black ); + mSbFg = cfg->readColorEntry( "Statusbar Foreground", &TQt::white ); + mSbBg = cfg->readColorEntry( "Statusbar Background", &TQt::black ); mSbIcon = cfg->readEntry( "Statusbar Icon", "run" ); mIconsVisible = cfg->readBoolEntry( "Icons Visible", true); mIconsJumping = cfg->readBoolEntry( "Icons Jumping", true); diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp index ce153e461..87ac35a1a 100644 --- a/ksplashml/themeengine/standard/wndicon.cpp +++ b/ksplashml/themeengine/standard/wndicon.cpp @@ -42,7 +42,7 @@ WndIcon::WndIcon( Position icon_position, bool statusAtTop, bool iconsJumping ) - :TQHBox( 0, "wndSplash", WStyle_Customize|WX11BypassWM ), + :TQHBox( 0, "wndSplash", (WFlags)(WStyle_Customize|WX11BypassWM) ), mStatusText(text), mIconPos(icon_position), mXineramaScreen( xineramaScreen ), mPosX(0), mPosY(0), mGroundX(0), mGroundY(0), mVelocity(8.0), mInitialVelocity(8.0), mGravity(0.8), mIconNum(icon_num), mStatusHeight(status_height), mIconSize(icon_std_width), mStatusAtTop(statusAtTop), @@ -53,10 +53,10 @@ WndIcon::WndIcon( TQLabel *w = new TQLabel( this ); w->setFixedSize( pix.width(), pix.height() ); w->setPixmap( pix ); - if(pix.mask()) + if(pix.tqmask()) { - setMask(*pix.mask()); - w->setMask(*pix.mask()); + setMask(*pix.tqmask()); + w->setMask(*pix.tqmask()); } resize( pix.width(), pix.height() ); diff --git a/ksplashml/themeengine/standard/wndicon.h b/ksplashml/themeengine/standard/wndicon.h index d488f85df..5338835a4 100644 --- a/ksplashml/themeengine/standard/wndicon.h +++ b/ksplashml/themeengine/standard/wndicon.h @@ -26,7 +26,7 @@ * @short Displays an icon on the screen. */ class WndIcon: - public QHBox + public TQHBox { Q_OBJECT public: diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp index 04685d9cf..6227de9b1 100644 --- a/ksplashml/themeengine/standard/wndstatus.cpp +++ b/ksplashml/themeengine/standard/wndstatus.cpp @@ -37,7 +37,7 @@ WndStatus::WndStatus( TQPalette /*pal*/, const TQColor& fgc, const TQColor & bgc, const TQString& icon ) - :TQHBox( 0, "wndStatus", WStyle_Customize|WX11BypassWM ) + :TQHBox( 0, "wndStatus", (WFlags)(WStyle_Customize|WX11BypassWM) ) { setFrameStyle( TQFrame::NoFrame ); //setPalette( pal ); diff --git a/ksplashml/themeengine/standard/wndstatus.h b/ksplashml/themeengine/standard/wndstatus.h index 63e253d1d..bc908779d 100644 --- a/ksplashml/themeengine/standard/wndstatus.h +++ b/ksplashml/themeengine/standard/wndstatus.h @@ -25,7 +25,7 @@ class KProgress; /** @short Window displaying status and progress bar. */ class WndStatus: - public QHBox + public TQHBox { Q_OBJECT public: diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp index 79e47bfe1..bf1fd4a8a 100644 --- a/ksplashml/themeengine/themeengine.cpp +++ b/ksplashml/themeengine/themeengine.cpp @@ -41,7 +41,7 @@ struct ThemeEngine::ThemeEnginePrivate }; ThemeEngine::ThemeEngine( TQWidget *, const char *, const TQStringList& args ) - : TQVBox( 0, "wndSplash", WStyle_Customize|WX11BypassWM ), d(0) + : TQVBox( 0, "wndSplash", (WFlags)(WStyle_Customize|WX11BypassWM) ), d(0) { d = new ThemeEnginePrivate; kapp->installX11EventFilter( this ); @@ -74,7 +74,7 @@ ThemeEngine::~ThemeEngine() bool ThemeEngine::eventFilter( TQObject* o, TQEvent* e ) { if( e->type() == TQEvent::Show && o->isWidgetType()) - addSplashWindow( static_cast< TQWidget* >( o )); + addSplashWindow( TQT_TQWIDGET( o )); return false; } @@ -87,7 +87,7 @@ void ThemeEngine::addSplashWindow( TQWidget* w ) { if( !w->isTopLevel()) return; - if( d->mSplashWindows.contains( w->winId())) + if( d->mSplashWindows.tqcontains( w->winId())) return; if( !w->testWFlags( WX11BypassWM )) { // All toplevel widgets should be probably required to be WX11BypassWM @@ -104,7 +104,7 @@ void ThemeEngine::addSplashWindow( TQWidget* w ) void ThemeEngine::splashWindowDestroyed( TQObject* obj ) { - d->mSplashWindows.remove( static_cast< TQWidget* >( obj )->winId()); + d->mSplashWindows.remove( TQT_TQWIDGET( obj )->winId()); } bool ThemeEngine::x11Event( XEvent* e ) diff --git a/ksplashml/themeengine/themeengine.h b/ksplashml/themeengine/themeengine.h index d62497a07..c9fdd3528 100644 --- a/ksplashml/themeengine/themeengine.h +++ b/ksplashml/themeengine/themeengine.h @@ -25,7 +25,7 @@ class TQMouseEvent; /** * @short The base for the ThemeEngine's configuration widget. */ -class KDE_EXPORT ThemeEngineConfig: public QVBox +class KDE_EXPORT ThemeEngineConfig: public TQVBox { Q_OBJECT public: @@ -48,7 +48,7 @@ protected: * @short Base class for all theme engines. Member functions need to be * overridden by derived classes in order to provide actual functionality. */ -class KDE_EXPORT ThemeEngine: public QVBox +class KDE_EXPORT ThemeEngine: public TQVBox { Q_OBJECT public: diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp index f3be8e607..d9b8b5e0b 100644 --- a/kstart/kstart.cpp +++ b/kstart/kstart.cpp @@ -56,7 +56,7 @@ KStart::KStart() else { // connect to window add to get the NEW windows connect(kwinmodule, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId))); - if (windowtitle) + if (windowtitle != 0) kwinmodule->doNotManage( windowtitle ); } // propagate the app startup notification info to the started app @@ -70,7 +70,7 @@ KStart::KStart() data.addPid( proc.pid() ); TQCString bin = proc.args().first(); data.setName( bin ); - data.setBin( bin.mid( bin.findRev( '/' ) + 1 )); + data.setBin( bin.mid( bin.tqfindRev( '/' ) + 1 )); KStartupInfo::sendChange( id, data ); } else @@ -82,14 +82,14 @@ KStart::KStart() void KStart::sendRule() { KXMessages msg; TQCString message; - if( windowtitle ) + if( windowtitle != 0 ) message += "title=" + windowtitle + "\ntitlematch=3\n"; // 3 = regexp match - if( windowclass ) + if( windowclass != 0 ) message += "wmclass=" + windowclass + "\nwmclassmatch=1\n" // 1 = exact match + "wmclasscomplete=" // if windowclass contains a space (i.e. 2 words, use whole WM_CLASS) - + ( windowclass.contains( ' ' ) ? "true" : "false" ) + "\n"; - if( windowtitle || windowclass ) { + + ( windowclass.tqcontains( ' ' ) ? "true" : "false" ) + "\n"; + if( (windowtitle != 0) || (windowclass != 0) ) { // always ignore these window types message += "types=" + TQCString().setNum( -1U & ~( NET::TopMenuMask | NET::ToolbarMask | NET::DesktopMask | NET::SplashMask | NET::MenuMask )) + "\n"; @@ -143,17 +143,17 @@ void KStart::windowAdded(WId w){ || info.windowType( SUPPORTED_WINDOW_TYPES_MASK ) == NET::Desktop ) return; - if ( windowtitle ) { + if ( windowtitle != 0 ) { TQString title = info.name().lower(); TQRegExp r( windowtitle.lower()); if (r.match(title) == -1) return; // no match } - if ( windowclass ) { + if ( windowclass != 0 ) { XClassHint hint; if( !XGetClassHint( qt_xdisplay(), w, &hint )) return; - TQCString cls = windowclass.contains( ' ' ) + TQCString cls = windowclass.tqcontains( ' ' ) ? TQCString( hint.res_name ) + ' ' + hint.res_class : TQCString( hint.res_class ); cls = cls.lower(); XFree( hint.res_name ); @@ -161,7 +161,7 @@ void KStart::windowAdded(WId w){ if( cls != windowclass ) return; } - if( !windowtitle && !windowclass ) { + if( (windowtitle == 0) && (windowclass == 0) ) { // accept only "normal" windows if( info.windowType( SUPPORTED_WINDOW_TYPES_MASK ) != NET::Unknown && info.windowType( SUPPORTED_WINDOW_TYPES_MASK ) != NET::Normal @@ -185,7 +185,7 @@ static bool wstate_withdrawn( WId winid ) &length, &after, &data ); bool withdrawn = TRUE; if ( r == Success && data && format == 32 ) { - Q_UINT32 *wstate = (Q_UINT32*)data; + TQ_UINT32 *wstate = (TQ_UINT32*)data; withdrawn = (*wstate == WithdrawnState ); XFree( (char *)data ); } @@ -322,7 +322,7 @@ int main( int argc, char *argv[] ) windowtitle = args->getOption( "window" ); windowclass = args->getOption( "windowclass" ); - if( windowclass ) + if( windowclass != 0 ) windowclass = windowclass.lower(); if( windowtitle.isEmpty() && windowclass.isEmpty()) diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cc index 5160dbddb..5aef8a26f 100644 --- a/ksysguard/gui/KSGAppletSettings.cc +++ b/ksysguard/gui/KSGAppletSettings.cc @@ -65,7 +65,7 @@ KSGAppletSettings::KSGAppletSettings( TQWidget *parent, const char *name ) topLayout->addWidget( mInterval, 2, 1 ); label->setBuddy( mInterval ); - resize( TQSize( 250, 130 ).expandedTo( minimumSizeHint() ) ); + resize( TQSize( 250, 130 ).expandedTo( tqminimumSizeHint() ) ); KAcceleratorManager::manage( page ); } diff --git a/ksysguard/gui/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cc index 245600cb6..2dff511e3 100644 --- a/ksysguard/gui/KSysGuardApplet.cc +++ b/ksysguard/gui/KSysGuardApplet.cc @@ -156,7 +156,7 @@ void KSysGuardApplet::sensorDisplayModified( bool modified ) void KSysGuardApplet::layout() { - if ( orientation() == Horizontal ) { + if ( orientation() == Qt::Horizontal ) { int h = height(); int w = (int) ( h * mSizeRatio + 0.5 ); for ( uint i = 0; i < mDockCount; ++i ) @@ -173,7 +173,7 @@ void KSysGuardApplet::layout() int KSysGuardApplet::findDock( const TQPoint& point ) { - if ( orientation() == Horizontal ) + if ( orientation() == Qt::Horizontal ) return ( point.x() / (int) ( height() * mSizeRatio + 0.5 ) ); else return ( point.y() / (int) ( width() * mSizeRatio + 0.5 ) ); diff --git a/ksysguard/gui/SensorBrowser.cc b/ksysguard/gui/SensorBrowser.cc index 1e51a5631..90705af1c 100644 --- a/ksysguard/gui/SensorBrowser.cc +++ b/ksysguard/gui/SensorBrowser.cc @@ -33,7 +33,7 @@ #include "SensorBrowser.h" -class HostItem : public QListViewItem +class HostItem : public TQListViewItem { public: HostItem( SensorBrowser *parent, const TQString &text, int id, @@ -225,13 +225,13 @@ void SensorBrowser::answerReceived( int id, const TQString &answer ) parent = lvi; // The child indicator might need to be updated. - repaintItem( parent ); + tqrepaintItem( parent ); } else parent = sibling; } } - repaintItem( (*it)->listViewItem() ); + tqrepaintItem( (*it)->listViewItem() ); } void SensorBrowser::viewportMouseMoveEvent( TQMouseEvent *e ) @@ -240,7 +240,7 @@ void SensorBrowser::viewportMouseMoveEvent( TQMouseEvent *e ) * mouse tracking cannot be turned off. So we have to check each event * whether the LMB is really pressed. */ - if ( !( e->state() & LeftButton ) ) + if ( !( e->state() & Qt::LeftButton ) ) return; TQListViewItem* item = itemAt( e->pos() ); diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cc b/ksysguard/gui/SensorDisplayLib/BarGraph.cc index 8d2b5e302..79d8f5961 100644 --- a/ksysguard/gui/SensorDisplayLib/BarGraph.cc +++ b/ksysguard/gui/SensorDisplayLib/BarGraph.cc @@ -52,7 +52,7 @@ BarGraph::BarGraph( TQWidget *parent, const char *name ) // Anything smaller than this does not make sense. setMinimumSize( 16, 16 ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding, false ) ); } @@ -103,7 +103,7 @@ void BarGraph::paintEvent( TQPaintEvent* ) TQPixmap pm( w, h ); TQPainter p; - p.begin( &pm, this ); + p.tqbegin( &pm, this ); p.setFont( TQFont( p.font().family(), fontSize ) ); TQFontMetrics fm( p.font() ); @@ -111,7 +111,7 @@ void BarGraph::paintEvent( TQPaintEvent* ) /* Draw white line along the bottom and the right side of the * widget to create a 3D like look. */ - p.setPen( TQColor( colorGroup().light() ) ); + p.setPen( TQColor( tqcolorGroup().light() ) ); p.drawLine( 0, h - 1, w - 1, h - 1 ); p.drawLine( w - 1, 0, w - 1, h - 1 ); diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.h b/ksysguard/gui/SensorDisplayLib/BarGraph.h index 744faf777..1a1262594 100644 --- a/ksysguard/gui/SensorDisplayLib/BarGraph.h +++ b/ksysguard/gui/SensorDisplayLib/BarGraph.h @@ -28,7 +28,7 @@ #include <tqptrvector.h> #include <tqwidget.h> -class BarGraph : public QWidget +class BarGraph : public TQWidget { Q_OBJECT diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cc b/ksysguard/gui/SensorDisplayLib/DancingBars.cc index 3917fc86b..e2b3917f5 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBars.cc +++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cc @@ -53,7 +53,7 @@ DancingBars::DancingBars( TQWidget *parent, const char *name, const TQString &ti else mPlotter = new BarGraph( frame() ); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); /* All RMB clicks to the mPlotter widget will be handled by * SensorDisplay::eventFilter. */ @@ -147,7 +147,7 @@ void DancingBars::applySettings() removeSensor( i ); } - repaint(); + tqrepaint(); setModified( true ); } @@ -158,7 +158,7 @@ void DancingBars::applyStyle() mPlotter->backgroundColor = KSGRD::Style->backgroundColor(); mPlotter->fontSize = KSGRD::Style->fontSize(); - repaint(); + tqrepaint(); setModified( true ); } @@ -231,12 +231,12 @@ void DancingBars::resizeEvent( TQResizeEvent* ) frame()->setGeometry( 0, 0, width(), height() ); } -TQSize DancingBars::sizeHint() +TQSize DancingBars::tqsizeHint() { if ( noFrame() ) - return ( mPlotter->sizeHint() ); + return ( mPlotter->tqsizeHint() ); else - return ( frame()->sizeHint() ); + return ( frame()->tqsizeHint() ); } void DancingBars::answerReceived( int id, const TQString &answer ) diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.h b/ksysguard/gui/SensorDisplayLib/DancingBars.h index 3ccc03f86..35feaa07f 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBars.h +++ b/ksysguard/gui/SensorDisplayLib/DancingBars.h @@ -54,7 +54,7 @@ class DancingBars : public KSGRD::SensorDisplay void updateSamples( const TQMemArray<double> &samples ); - virtual TQSize sizeHint(); + virtual TQSize tqsizeHint(); virtual void answerReceived( int id, const TQString &answer ); diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc index 2e499e852..42267af42 100644 --- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc +++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc @@ -49,7 +49,7 @@ void DummyDisplay::resizeEvent( TQResizeEvent* ) bool DummyDisplay::eventFilter( TQObject* object, TQEvent* event ) { if ( event->type() == TQEvent::MouseButtonRelease && - ( (TQMouseEvent*)event)->button() == LeftButton ) + ( (TQMouseEvent*)event)->button() == Qt::LeftButton ) setFocus(); return TQWidget::eventFilter( object, event ); diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc index 0434877bb..65a9ec809 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc @@ -52,13 +52,13 @@ FancyPlotter::FancyPlotter( TQWidget* parent, const char* name, mPlotter->setTitle( title ); mPlotter->setThinFrame(!isApplet); //if we aren't an applet, draw a thin white frame on the left and bottom, for a 3d effect - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); /* All RMB clicks to the mPlotter widget will be handled by * SensorDisplay::eventFilter. */ mPlotter->installEventFilter( this ); - setPlotterWidget( mPlotter ); + setPlotterWidget( TQT_TQWIDGET(mPlotter) ); setModified( false ); } @@ -242,8 +242,8 @@ bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name, .arg( sensors().at( mBeams - i - 1 )->name() ); } - TQToolTip::remove( mPlotter ); - TQToolTip::add( mPlotter, tooltip ); + TQToolTip::remove( TQT_TQWIDGET(mPlotter) ); + TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip ); return true; } @@ -267,8 +267,8 @@ bool FancyPlotter::removeSensor( uint pos ) .arg( sensors().at( mBeams - i - 1 )->name() ); } - TQToolTip::remove( mPlotter ); - TQToolTip::add( mPlotter, tooltip ); + TQToolTip::remove( TQT_TQWIDGET(mPlotter) ); + TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip ); return true; } @@ -281,12 +281,12 @@ void FancyPlotter::resizeEvent( TQResizeEvent* ) frame()->setGeometry( 0, 0, width(), height() ); } -TQSize FancyPlotter::sizeHint() +TQSize FancyPlotter::tqsizeHint() { if ( noFrame() ) - return mPlotter->sizeHint(); + return mPlotter->tqsizeHint(); else - return frame()->sizeHint(); + return frame()->tqsizeHint(); } void FancyPlotter::answerReceived( int id, const TQString &answer ) diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h index 2f0e36c60..00d88223a 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h @@ -66,7 +66,7 @@ class FancyPlotter : public KSGRD::SensorDisplay bool removeSensor( uint pos ); - virtual TQSize sizeHint(void); + virtual TQSize tqsizeHint(void); virtual void answerReceived( int id, const TQString &answer ); diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc index de345e7b8..95587dde6 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc @@ -90,7 +90,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) boxLayout->addWidget( label, 1, 0 ); mMinValue = new KLineEdit( groupBox ); - mMinValue->setAlignment( AlignRight ); + mMinValue->tqsetAlignment( AlignRight ); mMinValue->setEnabled( false ); TQWhatsThis::add( mMinValue, i18n( "Enter the minimum value for the display here. If both values are 0, automatic range detection is enabled." ) ); boxLayout->addWidget( mMinValue, 1, 1 ); @@ -100,7 +100,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) boxLayout->addWidget( label, 1, 3 ); mMaxValue = new KLineEdit( groupBox ); - mMaxValue->setAlignment( AlignRight ); + mMaxValue->tqsetAlignment( AlignRight ); mMaxValue->setEnabled( false ); TQWhatsThis::add( mMaxValue, i18n( "Enter the maximum value for the display here. If both values are 0, automatic range detection is enabled." ) ); boxLayout->addWidget( mMaxValue, 1, 4 ); @@ -532,7 +532,7 @@ TQValueList< TQStringList > FancyPlotterSettings::sensors() const entry << it.current()->text( 3 ); entry << it.current()->text( 4 ); QRgb rgb = it.current()->pixmap( 2 )->convertToImage().pixel( 1, 1 ); - TQColor color( qRed( rgb ), qGreen( rgb ), qBlue( rgb ) ); + TQColor color( tqRed( rgb ), tqGreen( rgb ), tqBlue( rgb ) ); entry << ( color.name() ); list.prepend( entry ); @@ -549,7 +549,7 @@ void FancyPlotterSettings::editSensor() return; TQColor color = lvi->pixmap( 2 )->convertToImage().pixel( 1, 1 ); - int result = KColorDialog::getColor( color, parentWidget() ); + int result = KColorDialog::getColor( color, tqparentWidget() ); if ( result == KColorDialog::Accepted ) { TQPixmap newPm( 12, 12 ); newPm.fill( color ); diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cc index c980196e6..dbd11a7b5 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.cc +++ b/ksysguard/gui/SensorDisplayLib/ListView.cc @@ -105,7 +105,7 @@ int PrivateListViewItem::compare( TQListViewItem *item, int col, bool ascending PrivateListView::PrivateListView(TQWidget *parent, const char *name) : TQListView(parent, name) { - TQColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); cg.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor()); cg.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor()); @@ -290,12 +290,12 @@ ListView::restoreSettings(TQDomElement& element) { addSensor(element.attribute("hostName"), element.attribute("sensorName"), (element.attribute("sensorType").isEmpty() ? "listview" : element.attribute("sensorType")), element.attribute("title")); - TQColorGroup colorGroup = monitor->colorGroup(); - colorGroup.setColor(TQColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor())); - colorGroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor())); - colorGroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", KSGRD::Style->backgroundColor())); + TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); + tqcolorGroup.setColor(TQColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor())); + tqcolorGroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor())); + tqcolorGroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", KSGRD::Style->backgroundColor())); - monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup)); + monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup)); SensorDisplay::restoreSettings(element); @@ -311,10 +311,10 @@ ListView::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) element.setAttribute("sensorName", sensors().at(0)->name()); element.setAttribute("sensorType", sensors().at(0)->type()); - TQColorGroup colorGroup = monitor->colorGroup(); - saveColor(element, "gridColor", colorGroup.color(TQColorGroup::Link)); - saveColor(element, "textColor", colorGroup.color(TQColorGroup::Text)); - saveColor(element, "backgroundColor", colorGroup.color(TQColorGroup::Base)); + TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); + saveColor(element, "gridColor", tqcolorGroup.color(TQColorGroup::Link)); + saveColor(element, "textColor", tqcolorGroup.color(TQColorGroup::Text)); + saveColor(element, "backgroundColor", tqcolorGroup.color(TQColorGroup::Base)); SensorDisplay::saveSettings(doc, element); @@ -331,10 +331,10 @@ ListView::configureSettings() Q_CHECK_PTR(lvs); connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings())); - TQColorGroup colorGroup = monitor->colorGroup(); - lvs->setGridColor(colorGroup.color(TQColorGroup::Link)); - lvs->setTextColor(colorGroup.color(TQColorGroup::Text)); - lvs->setBackgroundColor(colorGroup.color(TQColorGroup::Base)); + TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); + lvs->setGridColor(tqcolorGroup.color(TQColorGroup::Link)); + lvs->setTextColor(tqcolorGroup.color(TQColorGroup::Text)); + lvs->setBackgroundColor(tqcolorGroup.color(TQColorGroup::Base)); lvs->setTitle(title()); if (lvs->exec()) @@ -347,11 +347,11 @@ ListView::configureSettings() void ListView::applySettings() { - TQColorGroup colorGroup = monitor->colorGroup(); - colorGroup.setColor(TQColorGroup::Link, lvs->gridColor()); - colorGroup.setColor(TQColorGroup::Text, lvs->textColor()); - colorGroup.setColor(TQColorGroup::Base, lvs->backgroundColor()); - monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup)); + TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); + tqcolorGroup.setColor(TQColorGroup::Link, lvs->gridColor()); + tqcolorGroup.setColor(TQColorGroup::Text, lvs->textColor()); + tqcolorGroup.setColor(TQColorGroup::Base, lvs->backgroundColor()); + monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup)); setTitle(lvs->title()); @@ -361,11 +361,11 @@ ListView::applySettings() void ListView::applyStyle() { - TQColorGroup colorGroup = monitor->colorGroup(); - colorGroup.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor()); - colorGroup.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor()); - colorGroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); - monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup)); + TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); + tqcolorGroup.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor()); + tqcolorGroup.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor()); + tqcolorGroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); + monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup)); setModified(true); } diff --git a/ksysguard/gui/SensorDisplayLib/ListView.h b/ksysguard/gui/SensorDisplayLib/ListView.h index 1c63d95cb..3a79a20b3 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.h +++ b/ksysguard/gui/SensorDisplayLib/ListView.h @@ -35,7 +35,7 @@ class TQLabel; class QBoxGroup; class ListViewSettings; -class PrivateListView : public QListView +class PrivateListView : public TQListView { Q_OBJECT public: @@ -52,14 +52,14 @@ private: TQStringList mColumnTypes; }; -class PrivateListViewItem : public QListViewItem +class PrivateListViewItem : public TQListViewItem { public: PrivateListViewItem(PrivateListView *parent = 0); - void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int alignment) { - TQColorGroup cgroup = _parent->colorGroup(); - TQListViewItem::paintCell(p, cgroup, column, width, alignment); + void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int tqalignment) { + TQColorGroup cgroup = _parent->tqcolorGroup(); + TQListViewItem::paintCell(p, cgroup, column, width, tqalignment); p->setPen(cgroup.color(TQColorGroup::Link)); p->drawLine(0, height() - 1, width - 1, height() - 1); } diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui index f61f30dd7..53124ca65 100644 --- a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ListViewSettingsWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ListViewSettingsWidget</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>titleFrame</cstring> </property> @@ -27,14 +27,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_title</cstring> </property> </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>colorFrame</cstring> </property> @@ -55,7 +55,7 @@ <property name="title"> <string>Colors</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -66,7 +66,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>layout2</cstring> </property> @@ -74,7 +74,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -82,7 +82,7 @@ <string>Text color:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -90,7 +90,7 @@ <string>Grid color:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -100,7 +100,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>layout1</cstring> </property> @@ -164,14 +164,14 @@ <include location="local" impldecl="in implementation">ListViewSettingsWidget.ui.h</include> </includes> <functions> - <function specifier="non virtual" returnType="QString">title()</function> - <function specifier="non virtual" returnType="QColor">gridColor()</function> - <function specifier="non virtual" returnType="QColor">backgroundColor()</function> - <function specifier="non virtual" returnType="QColor">textColor()</function> - <function specifier="non virtual">setTitle( const QString & t )</function> - <function specifier="non virtual">setBackgroundColor( const QColor & c )</function> - <function specifier="non virtual">setTextColor( const QColor & c )</function> - <function specifier="non virtual">setGridColor( const QColor & c )</function> + <function specifier="non virtual" returnType="TQString">title()</function> + <function specifier="non virtual" returnType="TQColor">gridColor()</function> + <function specifier="non virtual" returnType="TQColor">backgroundColor()</function> + <function specifier="non virtual" returnType="TQColor">textColor()</function> + <function specifier="non virtual">setTitle( const TQString & t )</function> + <function specifier="non virtual">setBackgroundColor( const TQColor & c )</function> + <function specifier="non virtual">setTextColor( const TQColor & c )</function> + <function specifier="non virtual">setGridColor( const TQColor & c )</function> </functions> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc index 7de7899ab..575ca6919 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFile.cc +++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc @@ -62,7 +62,7 @@ LogFile::addSensor(const TQString& hostName, const TQString& sensorName, const T registerSensor(new KSGRD::SensorProperties(hostName, sensorName, sensorType, title)); - TQString sensorID = sensorName.right(sensorName.length() - (sensorName.findRev("/") + 1)); + TQString sensorID = sensorName.right(sensorName.length() - (sensorName.tqfindRev("/") + 1)); sendRequest(sensors().at(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42); @@ -79,7 +79,7 @@ LogFile::addSensor(const TQString& hostName, const TQString& sensorName, const T void LogFile::configureSettings(void) { - TQColorGroup cgroup = monitor->colorGroup(); + TQColorGroup cgroup = monitor->tqcolorGroup(); lfs = new LogFileSettings(this); Q_CHECK_PTR(lfs); @@ -147,7 +147,7 @@ void LogFile::settingsRuleListSelected(int index) void LogFile::applySettings(void) { - TQColorGroup cgroup = monitor->colorGroup(); + TQColorGroup cgroup = monitor->tqcolorGroup(); cgroup.setColor(TQColorGroup::Text, lfs->fgColor->color()); cgroup.setColor(TQColorGroup::Base, lfs->bgColor->color()); @@ -166,7 +166,7 @@ void LogFile::applySettings(void) void LogFile::applyStyle() { - TQColorGroup cgroup = monitor->colorGroup(); + TQColorGroup cgroup = monitor->tqcolorGroup(); cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor()); cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); @@ -179,7 +179,7 @@ bool LogFile::restoreSettings(TQDomElement& element) { TQFont font; - TQColorGroup cgroup = monitor->colorGroup(); + TQColorGroup cgroup = monitor->tqcolorGroup(); cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green)); cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black)); @@ -212,8 +212,8 @@ LogFile::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) element.setAttribute("font", monitor->font().toString()); - saveColor(element, "textColor", monitor->colorGroup().text()); - saveColor(element, "backgroundColor", monitor->colorGroup().base()); + saveColor(element, "textColor", monitor->tqcolorGroup().text()); + saveColor(element, "backgroundColor", monitor->tqcolorGroup().base()); for (TQStringList::Iterator it = filterRules.begin(); it != filterRules.end(); it++) diff --git a/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui b/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui index b5dcff0ee..a1cc1572c 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui +++ b/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>LogFileSettings</class> <author>Tobias Koenig <tokoe@kde.org></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>LogFileSettings</cstring> </property> @@ -23,11 +23,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>TabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -38,7 +38,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox8</cstring> </property> @@ -49,14 +49,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>title</cstring> </property> </widget> </hbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>styleGroup</cstring> </property> @@ -70,7 +70,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout6</cstring> </property> @@ -78,7 +78,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout5</cstring> </property> @@ -86,7 +86,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -94,7 +94,7 @@ <string>Foreground color:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -104,7 +104,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout4</cstring> </property> @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -151,7 +151,7 @@ </spacer> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox11</cstring> </property> @@ -172,14 +172,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"> + <widget class="TQPushButton"> <property name="name"> <cstring>fontButton</cstring> </property> @@ -191,7 +191,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -202,7 +202,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -210,19 +210,19 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>ruleText</cstring> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>ruleList</cstring> </property> </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -230,7 +230,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addButton</cstring> </property> @@ -238,7 +238,7 @@ <string>&Add</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>deleteButton</cstring> </property> @@ -246,7 +246,7 @@ <string>&Delete</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>changeButton</cstring> </property> @@ -264,7 +264,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -276,7 +276,7 @@ </hbox> </widget> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -284,7 +284,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>okButton</cstring> </property> @@ -295,7 +295,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>applyButton</cstring> </property> @@ -313,14 +313,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"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc index 8a9cc9b60..3a54aefd3 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc +++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc @@ -53,7 +53,7 @@ MultiMeter::MultiMeter(TQWidget* parent, const char* name, Q_CHECK_PTR(lcd); lcd->setSegmentStyle(TQLCDNumber::Filled); setDigitColor(KSGRD::Style->backgroundColor()); - lcd->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + lcd->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, false)); setBackgroundColor(KSGRD::Style->backgroundColor()); @@ -225,7 +225,7 @@ MultiMeter::applySettings() alarmDigitColor = mms->alarmDigitColor(); setBackgroundColor(mms->meterBackgroundColor()); - repaint(); + tqrepaint(); setModified(true); } @@ -234,7 +234,7 @@ MultiMeter::applyStyle() { normalDigitColor = KSGRD::Style->firstForegroundColor(); setBackgroundColor(KSGRD::Style->backgroundColor()); - repaint(); + tqrepaint(); setModified(true); } diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui index 7ecdef88f..40209feac 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MultiMeterSettingsWidget</class> <comment>MultiMeterSettingsWidget</comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MultiMeterSettingsWidget</cstring> </property> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox7</cstring> </property> @@ -28,7 +28,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="0"> + <widget class="TQLineEdit" row="0" column="0"> <property name="name"> <cstring>m_title</cstring> </property> @@ -36,7 +36,7 @@ <string>Enter the title of the display here.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>m_showUnit</cstring> </property> @@ -49,11 +49,11 @@ </widget> </grid> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>TabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -64,7 +64,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>GroupBox1_2</cstring> </property> @@ -75,7 +75,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_upperLimitActive</cstring> </property> @@ -96,14 +96,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="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>m_lblUpperLimit</cstring> </property> @@ -114,14 +114,14 @@ <string>Upper limit:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="3"> + <widget class="TQLineEdit" row="0" column="3"> <property name="name"> <cstring>m_upperLimit</cstring> </property> <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>70</width> <height>0</height> @@ -130,7 +130,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -141,7 +141,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_lowerLimitActive</cstring> </property> @@ -162,14 +162,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="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>m_lblLowerLimit</cstring> </property> @@ -180,14 +180,14 @@ <string>Lower limit:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="3"> + <widget class="TQLineEdit" row="0" column="3"> <property name="name"> <cstring>m_lowerLimit</cstring> </property> <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>70</width> <height>0</height> @@ -198,7 +198,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -209,7 +209,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout1</cstring> </property> @@ -217,7 +217,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -225,7 +225,7 @@ <string>Normal digit color:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -233,7 +233,7 @@ <string>Alarm digit color:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -243,7 +243,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -334,14 +334,14 @@ <slot access="public" specifier="">update()</slot> <slot access="public" specifier="">update(int,int,int,int)</slot> <slot access="public" specifier="">update(const QRect&)</slot> - <slot access="public" specifier="">repaint()</slot> - <slot access="public" specifier="">repaint(bool)</slot> - <slot access="public" specifier="">repaint(int,int,int,int)</slot> - <slot access="public" specifier="">repaint(int,int,int,int,bool)</slot> - <slot access="public" specifier="">repaint(const QRect&)</slot> - <slot access="public" specifier="">repaint(const QRect&,bool)</slot> - <slot access="public" specifier="">repaint(const QRegion&)</slot> - <slot access="public" specifier="">repaint(const QRegion&,bool)</slot> + <slot access="public" specifier="">tqrepaint()</slot> + <slot access="public" specifier="">tqrepaint(bool)</slot> + <slot access="public" specifier="">tqrepaint(int,int,int,int)</slot> + <slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot> + <slot access="public" specifier="">tqrepaint(const QRect&)</slot> + <slot access="public" specifier="">tqrepaint(const QRect&,bool)</slot> + <slot access="public" specifier="">tqrepaint(const QRegion&)</slot> + <slot access="public" specifier="">tqrepaint(const QRegion&,bool)</slot> <slot access="public" specifier="">show()</slot> <slot access="public" specifier="">hide()</slot> <slot access="public" specifier="">setShown(bool)</slot> @@ -377,8 +377,8 @@ <property type="Bool">enabled</property> <property type="Rect">geometry</property> <property type="SizePolicy">sizePolicy</property> - <property type="Size">minimumSize</property> - <property type="Size">maximumSize</property> + <property type="Size">tqminimumSize</property> + <property type="Size">tqmaximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</property> @@ -444,28 +444,28 @@ <include location="global" impldecl="in implementation">knumvalidator.h</include> <include location="local" impldecl="in implementation">MultiMeterSettingsWidget.ui.h</include> </includes> -<slots> - <slot>setMeterBackgroundColor( const QColor & c )</slot> -</slots> +<Q_SLOTS> + <slot>setMeterBackgroundColor( const TQColor & c )</slot> +</Q_SLOTS> <functions> <function access="private" specifier="non virtual">init()</function> - <function specifier="non virtual" returnType="QString">title()</function> + <function specifier="non virtual" returnType="TQString">title()</function> <function specifier="non virtual" returnType="bool">showUnit()</function> <function returnType="bool">lowerLimitActive()</function> <function specifier="non virtual" returnType="double">lowerLimit()</function> <function returnType="bool">upperLimitActive()</function> <function returnType="double">upperLimit()</function> - <function specifier="non virtual" returnType="QColor">normalDigitColor()</function> - <function specifier="non virtual" returnType="QColor">alarmDigitColor()</function> - <function returnType="QColor">meterBackgroundColor()</function> - <function specifier="non virtual">setTitle( const QString & s )</function> + <function specifier="non virtual" returnType="TQColor">normalDigitColor()</function> + <function specifier="non virtual" returnType="TQColor">alarmDigitColor()</function> + <function returnType="TQColor">meterBackgroundColor()</function> + <function specifier="non virtual">setTitle( const TQString & s )</function> <function specifier="non virtual">setShowUnit( bool b )</function> <function specifier="non virtual">setLowerLimitActive( bool b )</function> <function specifier="non virtual">setLowerLimit( double d )</function> <function specifier="non virtual">setUpperLimitActive( bool b )</function> <function specifier="non virtual">setUpperLimit( double d )</function> - <function specifier="non virtual">setNormalDigitColor( const QColor & c )</function> - <function specifier="non virtual">setAlarmDigitColor( const QColor & c )</function> + <function specifier="non virtual">setNormalDigitColor( const TQColor & c )</function> + <function specifier="non virtual">setAlarmDigitColor( const TQColor & c )</function> </functions> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h index e97fabffc..fe88f292f 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h +++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h @@ -9,8 +9,8 @@ void MultiMeterSettingsWidget::init() { - m_lowerLimit->setValidator(new KDoubleValidator(m_lowerLimit)); - m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit)); + m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit))); + m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit))); m_title->setFocus(); } diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc index f02b02af9..90f86a0e8 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc @@ -98,11 +98,11 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T cbFilter->insertItem(i18n("System Processes"), 1); cbFilter->insertItem(i18n("User Processes"), 2); cbFilter->insertItem(i18n("Own Processes"), 3); - cbFilter->setMinimumSize(cbFilter->sizeHint()); + cbFilter->setMinimumSize(cbFilter->tqsizeHint()); // Create the check box to switch between tree view and list view. xbTreeView = new TQCheckBox(i18n("&Tree"), this, "xbTreeView"); Q_CHECK_PTR(xbTreeView); - xbTreeView->setMinimumSize(xbTreeView->sizeHint()); + xbTreeView->setMinimumSize(xbTreeView->tqsizeHint()); connect(xbTreeView, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setTreeView(bool))); @@ -116,13 +116,13 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T bRefresh = new KPushButton( KGuiItem( i18n( "&Refresh" ), "reload" ), this, "bRefresh" ); Q_CHECK_PTR(bRefresh); - bRefresh->setMinimumSize(bRefresh->sizeHint()); + bRefresh->setMinimumSize(bRefresh->tqsizeHint()); connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList())); // Create the 'Kill' button. bKill = new KPushButton(i18n("&Kill"), this, "bKill"); Q_CHECK_PTR(bKill); - bKill->setMinimumSize(bKill->sizeHint()); + bKill->setMinimumSize(bKill->tqsizeHint()); connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess())); /* Disable the kill button until we know that the daemon supports the * kill command. */ @@ -147,7 +147,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T setPlotterWidget(pList); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); fixTabOrder(); } @@ -247,7 +247,7 @@ ProcessController::killProcess() KDialogBase *dlg = new KDialogBase ( i18n ("Kill Process"), KDialogBase::Yes | KDialogBase::Cancel, - KDialogBase::Yes, KDialogBase::Cancel, this->parentWidget(), + KDialogBase::Yes, KDialogBase::Cancel, this->tqparentWidget(), "killconfirmation", true, true, KGuiItem(i18n("Kill"))); diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc index 2f5b3fe51..cc5ca3266 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -486,7 +486,7 @@ ProcessList::buildList() addProcess(p, pli); - if (selectedPIds.findIndex(p->pid()) != -1) + if (selectedPIds.tqfindIndex(p->pid()) != -1) pli->setSelected(true); } pl.removeFirst(); @@ -513,7 +513,7 @@ ProcessList::buildTree() int pid = ps->pid(); pl.remove(); - if (selectedPIds.findIndex(pid) != -1) + if (selectedPIds.tqfindIndex(pid) != -1) pli->setSelected(true); // insert all child processes of current process @@ -569,10 +569,10 @@ ProcessList::extendTree(TQPtrList<KSGRD::SensorPSLine>* pl, ProcessLVI* parent, addProcess(ps, pli); - if (selectedPIds.findIndex(ps->pid()) != -1) + if (selectedPIds.tqfindIndex(ps->pid()) != -1) pli->setSelected(true); - if (ps->ppid() != INIT_PID && closedSubTrees.findIndex(ps->ppid()) != -1) + if (ps->ppid() != INIT_PID && closedSubTrees.tqfindIndex(ps->ppid()) != -1) parent->setOpen(false); else parent->setOpen(true); @@ -635,7 +635,7 @@ ProcessList::addProcess(KSGRD::SensorPSLine* p, ProcessLVI* pli) icon.fill(); bitBlt(&icon, 4, 0, &pix, 0, 0, pix.width(), pix.height()); TQBitmap mask(24, 16, true); - bitBlt(&mask, 4, 0, pix.mask(), 0, 0, pix.width(), pix.height()); + bitBlt(&mask, 4, 0, pix.tqmask(), 0, 0, pix.width(), pix.height()); icon.setMask(mask); pix = icon; } @@ -909,7 +909,7 @@ ProcessList::selectAllItems(bool select) for ( ; it.current(); ++it ) { it.current()->setSelected(select); - repaintItem(it.current()); + tqrepaintItem(it.current()); if (select) selectedPIds.append(it.current()->text(1).toInt()); } @@ -928,7 +928,7 @@ ProcessList::selectAllChilds(int pid, bool select) { int currPId = it.current()->text(1).toInt(); it.current()->setSelected(select); - repaintItem(it.current()); + tqrepaintItem(it.current()); if (select) selectedPIds.append(currPId); else diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc index dfd535883..f5d13ed5c 100644 --- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc +++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc @@ -43,7 +43,7 @@ ReniceDlg::ReniceDlg(TQWidget* parent, const char* name, int currentPPrio, "the number is the higher the priority.\n\n" "Please enter the desired nice level:").arg(pid); message = new TQLabel(msg, page); - message->setMinimumSize(message->sizeHint()); + message->setMinimumSize(message->tqsizeHint()); vLay->addWidget(message); /* diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc index c80ad65ee..dca7163b8 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc @@ -66,7 +66,7 @@ SensorDisplay::SensorDisplay( TQWidget *parent, const char *name, if(!nf) { mFrame = new TQGroupBox( 2, Qt::Vertical, "", this, "displayFrame"); mFrame->setFlat(true); - mFrame->setAlignment(Qt::AlignHCenter); + mFrame->tqsetAlignment(Qt::AlignHCenter); mFrame->setInsideMargin(2); setTitle( title ); @@ -124,7 +124,7 @@ void SensorDisplay::configureUpdateInterval() if ( dlg.useGlobalUpdate() ) { mUseGlobalUpdateInterval = true; - SensorBoard* sb = dynamic_cast<SensorBoard*>( parentWidget() ); + SensorBoard* sb = dynamic_cast<SensorBoard*>( tqparentWidget() ); if ( !sb ) { kdDebug(1215) << "dynamic cast lacks" << endl; setUpdateInterval( 2 ); @@ -156,7 +156,7 @@ void SensorDisplay::resizeEvent( TQResizeEvent* ) bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event ) { if ( event->type() == TQEvent::MouseButtonPress && - ( (TQMouseEvent*)event)->button() == RightButton ) { + ( (TQMouseEvent*)event)->button() == Qt::RightButton ) { TQPopupMenu pm; if ( mIsApplet ) { pm.insertItem( i18n( "Launch &System Guard"), 1 ); @@ -200,7 +200,7 @@ bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event ) return true; } else if ( event->type() == TQEvent::MouseButtonRelease && - ( ( TQMouseEvent*)event)->button() == LeftButton ) { + ( ( TQMouseEvent*)event)->button() == Qt::LeftButton ) { setFocus(); } @@ -247,7 +247,7 @@ void SensorDisplay::updateWhatsThis() void SensorDisplay::hosts( TQStringList& list ) { for ( SensorProperties *s = mSensors.first(); s; s = mSensors.next() ) - if ( !list.contains( s->hostName() ) ) + if ( !list.tqcontains( s->hostName() ) ) list.append( s->hostName() ); } @@ -344,7 +344,7 @@ bool SensorDisplay::restoreSettings( TQDomElement &element ) } else { mUseGlobalUpdateInterval = true; - SensorBoard* sb = dynamic_cast<SensorBoard*>( parentWidget() ); + SensorBoard* sb = dynamic_cast<SensorBoard*>( tqparentWidget() ); if ( !sb ) { kdDebug(1215) << "dynamic cast lacks" << endl; setUpdateInterval( 2 ); @@ -447,8 +447,8 @@ void SensorDisplay::setSensorOk( bool ok ) mErrorIndicator = new TQWidget( mPlotterWdg ); mErrorIndicator->setErasePixmap( errorIcon ); mErrorIndicator->resize( errorIcon.size() ); - if ( errorIcon.mask() ) - mErrorIndicator->setMask( *errorIcon.mask() ); + if ( errorIcon.tqmask() ) + mErrorIndicator->setMask( *errorIcon.tqmask() ); mErrorIndicator->move( 0, 0 ); mErrorIndicator->show(); } diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc index 383bf525e..383e7b53c 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc @@ -50,7 +50,7 @@ LogSensor::LogSensor(TQListView *parent) pixmap_waiting = UserIcon( "waiting" ); lvi->setPixmap(0, pixmap_waiting); - lvi->setTextColor(monitor->colorGroup().text()); + lvi->setTextColor(monitor->tqcolorGroup().text()); monitor->insertItem(lvi); } @@ -72,8 +72,8 @@ void LogSensor::stopLogging(void) { lvi->setPixmap(0, pixmap_waiting); - lvi->setTextColor(monitor->colorGroup().text()); - lvi->repaint(); + lvi->setTextColor(monitor->tqcolorGroup().text()); + lvi->tqrepaint(); timerOff(); } @@ -104,21 +104,21 @@ LogSensor::answerReceived(int id, const TQString& answer) { timerOff(); lowerLimitActive = false; - lvi->setTextColor(monitor->colorGroup().foreground()); - lvi->repaint(); + lvi->setTextColor(monitor->tqcolorGroup().foreground()); + lvi->tqrepaint(); KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached lower limit").arg(sensorName).arg(hostName)); timerOn(); } else if (upperLimitActive && value > upperLimit) { timerOff(); upperLimitActive = false; - lvi->setTextColor(monitor->colorGroup().foreground()); - lvi->repaint(); + lvi->setTextColor(monitor->tqcolorGroup().foreground()); + lvi->tqrepaint(); KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName)); timerOn(); } - TQDate date = TQDateTime::currentDateTime().date(); - TQTime time = TQDateTime::currentDateTime().time(); + TQDate date = TQT_TQDATE_OBJECT(TQDateTime::tqcurrentDateTime().date()); + TQTime time = TQT_TQTIME_OBJECT(TQDateTime::tqcurrentDateTime().time()); stream << TQString("%1 %2 %3 %4 %5: %6\n").arg(date.shortMonthName(date.month())).arg(date.day()).arg(time.toString()).arg(hostName).arg(sensorName).arg(value); } @@ -139,7 +139,7 @@ SensorLogger::SensorLogger(TQWidget *parent, const char *name, const TQString& t monitor->addColumn(i18n("Host Name")); monitor->addColumn(i18n("Log File")); - TQColorGroup cgroup = monitor->colorGroup(); + TQColorGroup cgroup = monitor->tqcolorGroup(); cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor()); cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); cgroup.setColor(TQColorGroup::Foreground, KSGRD::Style->alarmColor()); @@ -232,7 +232,7 @@ SensorLogger::editSensor(LogSensor* sensor) void SensorLogger::configureSettings() { - TQColorGroup cgroup = monitor->colorGroup(); + TQColorGroup cgroup = monitor->tqcolorGroup(); sls = new SensorLoggerSettings(this, "SensorLoggerSettings"); Q_CHECK_PTR(sls); @@ -254,7 +254,7 @@ SensorLogger::configureSettings() void SensorLogger::applySettings() { - TQColorGroup cgroup = monitor->colorGroup(); + TQColorGroup cgroup = monitor->tqcolorGroup(); setTitle(sls->title()); @@ -269,7 +269,7 @@ SensorLogger::applySettings() void SensorLogger::applyStyle(void) { - TQColorGroup cgroup = monitor->colorGroup(); + TQColorGroup cgroup = monitor->tqcolorGroup(); cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor()); cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); @@ -282,7 +282,7 @@ SensorLogger::applyStyle(void) bool SensorLogger::restoreSettings(TQDomElement& element) { - TQColorGroup cgroup = monitor->colorGroup(); + TQColorGroup cgroup = monitor->tqcolorGroup(); cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green)); cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black)); @@ -319,9 +319,9 @@ SensorLogger::restoreSettings(TQDomElement& element) bool SensorLogger::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - saveColor(element, "textColor", monitor->colorGroup().text()); - saveColor(element, "backgroundColor", monitor->colorGroup().base()); - saveColor(element, "alarmColor", monitor->colorGroup().foreground()); + saveColor(element, "textColor", monitor->tqcolorGroup().text()); + saveColor(element, "backgroundColor", monitor->tqcolorGroup().base()); + saveColor(element, "alarmColor", monitor->tqcolorGroup().foreground()); for (LogSensor* sensor = logSensors.first(); sensor != 0; sensor = logSensors.next()) { diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.h b/ksysguard/gui/SensorDisplayLib/SensorLogger.h index 018e36bf9..db247238b 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.h +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.h @@ -37,17 +37,17 @@ class SensorLoggerSettings; -class SLListViewItem : public QListViewItem +class SLListViewItem : public TQListViewItem { public: SLListViewItem(TQListView *parent = 0); void setTextColor(const TQColor& color) { textColor = color; } - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { TQColorGroup cgroup(cg); cgroup.setColor(TQColorGroup::Text, textColor); - TQListViewItem::paintCell(p, cgroup, column, width, alignment); + TQListViewItem::paintCell(p, cgroup, column, width, tqalignment); } diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui index 26d3b2d49..78d99b953 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>SensorLoggerDlgWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SensorLoggerDlgWidget</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>fileFrame</cstring> </property> @@ -40,7 +40,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>timerFrame</cstring> </property> @@ -70,7 +70,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -81,7 +81,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_lowerLimitActive</cstring> </property> @@ -102,14 +102,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_lblLowerLimit</cstring> </property> @@ -120,14 +120,14 @@ <string>Lower limit:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_lowerLimit</cstring> </property> <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>70</width> <height>0</height> @@ -136,7 +136,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1_2</cstring> </property> @@ -147,7 +147,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_upperLimitActive</cstring> </property> @@ -168,14 +168,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_lblUpperLimit</cstring> </property> @@ -186,14 +186,14 @@ <string>Upper limit:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_upperLimit</cstring> </property> <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>70</width> <height>0</height> @@ -237,13 +237,13 @@ </includes> <functions> <function access="private" specifier="non virtual">init()</function> - <function specifier="non virtual" returnType="QString">fileName()</function> + <function specifier="non virtual" returnType="TQString">fileName()</function> <function specifier="non virtual" returnType="int">timerInterval()</function> <function specifier="non virtual" returnType="bool">lowerLimitActive()</function> <function specifier="non virtual" returnType="double">lowerLimit()</function> <function returnType="bool">upperLimitActive()</function> <function specifier="non virtual" returnType="double">upperLimit()</function> - <function specifier="non virtual">setFileName( const QString & url )</function> + <function specifier="non virtual">setFileName( const TQString & url )</function> <function specifier="non virtual">setTimerInterval( int i )</function> <function specifier="non virtual">setLowerLimitActive( bool b )</function> <function specifier="non virtual">setLowerLimit( double d )</function> diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h index ad1f2687b..515cb13f6 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h @@ -9,8 +9,8 @@ void SensorLoggerDlgWidget::init() { - m_lowerLimit->setValidator(new KDoubleValidator(m_lowerLimit)); - m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit)); + m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit))); + m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit))); m_timerInterval->setRange(1, 99, 1, true); m_fileName->setFocus(); diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui index c86e671b2..f253e3ecc 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SensorLoggerSettingsWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SensorLoggerSettingsWidget</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>titleFrame</cstring> </property> @@ -33,14 +33,14 @@ <property name="margin"> <number>11</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_title</cstring> </property> </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>colorFrame</cstring> </property> @@ -61,7 +61,7 @@ <property name="title"> <string>Colors</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -75,7 +75,7 @@ <property name="margin"> <number>11</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -83,7 +83,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -91,7 +91,7 @@ <string>Text color:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -99,7 +99,7 @@ <string>Background color:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -109,7 +109,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout1</cstring> </property> @@ -166,14 +166,14 @@ <include location="local" impldecl="in implementation">SensorLoggerSettingsWidget.ui.h</include> </includes> <functions> - <function specifier="non virtual" returnType="QString">title()</function> - <function specifier="non virtual" returnType="QColor">foregroundColor()</function> - <function specifier="non virtual" returnType="QColor">backgroundColor()</function> - <function specifier="non virtual" returnType="QColor">alarmColor()</function> - <function specifier="non virtual">setTitle( const QString & t )</function> - <function specifier="non virtual">setForegroundColor( const QColor & c )</function> - <function specifier="non virtual">setBackgroundColor( const QColor & c )</function> - <function specifier="non virtual">setAlarmColor( const QColor & c )</function> + <function specifier="non virtual" returnType="TQString">title()</function> + <function specifier="non virtual" returnType="TQColor">foregroundColor()</function> + <function specifier="non virtual" returnType="TQColor">backgroundColor()</function> + <function specifier="non virtual" returnType="TQColor">alarmColor()</function> + <function specifier="non virtual">setTitle( const TQString & t )</function> + <function specifier="non virtual">setForegroundColor( const TQColor & c )</function> + <function specifier="non virtual">setBackgroundColor( const TQColor & c )</function> + <function specifier="non virtual">setAlarmColor( const TQColor & c )</function> </functions> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc index 3d4d9c6f6..70d4d1900 100644 --- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc +++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc @@ -50,7 +50,7 @@ SignalPlotter::SignalPlotter( TQWidget *parent, const char *name ) // Anything smaller than this does not make sense. setMinimumSize( 16, 16 ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding, false ) ); mShowVerticalLines = true; @@ -390,18 +390,18 @@ void SignalPlotter::paintEvent( TQPaintEvent* ) uint w = width(); uint h = height(); - /* Do not do repaints when the widget is not yet setup properly. */ + /* Do not do tqrepaints when the widget is not yet setup properly. */ if ( w <= 2 ) return; TQPixmap pm( w, h ); TQPainter p; - p.begin( &pm, this ); + p.tqbegin( &pm, this ); pm.fill( mBackgroundColor ); /* Draw white line along the bottom and the right side of the * widget to create a 3D like look. */ - p.setPen( TQColor( colorGroup().light() ) ); + p.setPen( TQColor( tqcolorGroup().light() ) ); if(mShowThinFrame) { p.drawLine( 0, h - 1, w - 1, h - 1 ); p.drawLine( w - 1, 0, w - 1, h - 1 ); diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.h b/ksysguard/gui/SensorDisplayLib/SignalPlotter.h index 32231f359..cc632ac94 100644 --- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.h +++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.h @@ -34,7 +34,7 @@ class TQColor; -class SignalPlotter : public QWidget +class SignalPlotter : public TQWidget { Q_OBJECT diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc index 8d53edb6b..f3d9e240e 100644 --- a/ksysguard/gui/WorkSheet.cc +++ b/ksysguard/gui/WorkSheet.cc @@ -450,14 +450,14 @@ void WorkSheet::dropEvent( TQDropEvent *e ) * event and replace or add sensor. */ for ( uint r = 0; r < mRows; ++r ) for ( uint c = 0; c < mColumns; ++c ) - if ( mDisplayList[ r ][ c ]->geometry().contains( e->pos() ) ) { + if ( mDisplayList[ r ][ c ]->tqgeometry().tqcontains( e->pos() ) ) { addDisplay( hostName, sensorName, sensorType, sensorDescr, r, c ); return; } } } -TQSize WorkSheet::sizeHint() const +TQSize WorkSheet::tqsizeHint() const { return TQSize( 200,150 ); } @@ -531,7 +531,7 @@ void WorkSheet::replaceDisplay( uint row, uint column, KSGRD::SensorDisplay* new mDisplayList[ row ][ column ]->show(); } - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); setModified( true ); } diff --git a/ksysguard/gui/WorkSheet.h b/ksysguard/gui/WorkSheet.h index 37bafbda3..61ae0c46e 100644 --- a/ksysguard/gui/WorkSheet.h +++ b/ksysguard/gui/WorkSheet.h @@ -90,7 +90,7 @@ class WorkSheet : public TQWidget, public KSGRD::SensorBoard void titleChanged( TQWidget *sheet ); protected: - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; void dragEnterEvent( TQDragEnterEvent* ); void dropEvent( TQDropEvent* ); void customEvent( TQCustomEvent* ); diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc index 3e4c28e50..f14e462a2 100644 --- a/ksysguard/gui/WorkSheetSettings.cc +++ b/ksysguard/gui/WorkSheetSettings.cc @@ -50,7 +50,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) group->layout()->setSpacing( spacingHint() ); TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 1, 1 ); - groupLayout->setAlignment( Qt::AlignTop ); + groupLayout->tqsetAlignment( Qt::AlignTop ); mSheetTitle = new KLineEdit( group ); groupLayout->addWidget( mSheetTitle, 0, 0 ); @@ -62,7 +62,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) group->layout()->setSpacing( spacingHint() ); groupLayout = new TQGridLayout( group->layout(), 3, 2 ); - groupLayout->setAlignment( Qt::AlignTop ); + groupLayout->tqsetAlignment( Qt::AlignTop ); TQLabel *label = new TQLabel( i18n( "Rows:" ), group ); groupLayout->addWidget( label, 0, 0 ); @@ -103,7 +103,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) mSheetTitle->setFocus(); - resize( TQSize( 250, 230 ).expandedTo( minimumSizeHint() ) ); + resize( TQSize( 250, 230 ).expandedTo( tqminimumSizeHint() ) ); } WorkSheetSettings::~WorkSheetSettings() diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc index 3c1a92a56..c39425919 100644 --- a/ksysguard/gui/Workspace.cc +++ b/ksysguard/gui/Workspace.cc @@ -196,7 +196,7 @@ void Workspace::loadWorkSheet( const KURL &url ) * code. */ TQString tmpFile; KIO::NetAccess::download( url, tmpFile, this ); - mWorkDir = tmpFile.left( tmpFile.findRev( '/' ) ); + mWorkDir = tmpFile.left( tmpFile.tqfindRev( '/' ) ); // Load sheet from file. if ( !restoreWorkSheet( tmpFile ) ) @@ -240,13 +240,13 @@ void Workspace::saveWorkSheet( WorkSheet *sheet ) if ( fileName.isEmpty() ) return; - mWorkDir = fileName.left( fileName.findRev( '/' ) ); + mWorkDir = fileName.left( fileName.tqfindRev( '/' ) ); // extract filename without path - TQString baseName = fileName.right( fileName.length() - fileName.findRev( '/' ) - 1 ); + TQString baseName = fileName.right( fileName.length() - fileName.tqfindRev( '/' ) - 1 ); // chop off extension (usually '.sgrd') - baseName = baseName.left( baseName.findRev( '.' ) ); + baseName = baseName.left( baseName.tqfindRev( '.' ) ); changeTab( sheet, baseName ); } @@ -278,13 +278,13 @@ void Workspace::saveWorkSheetAs( WorkSheet *sheet ) if ( fileName.isEmpty() ) return; - mWorkDir = fileName.left( fileName.findRev( '/' ) ); + mWorkDir = fileName.left( fileName.tqfindRev( '/' ) ); // extract filename without path - TQString baseName = fileName.right( fileName.length() - fileName.findRev( '/' ) - 1 ); + TQString baseName = fileName.right( fileName.length() - fileName.tqfindRev( '/' ) - 1 ); // chop off extension (usually '.sgrd') - baseName = baseName.left( baseName.findRev( '.' ) ); + baseName = baseName.left( baseName.tqfindRev( '.' ) ); changeTab( sheet, baseName ); } while ( !sheet->save( fileName ) ); @@ -354,10 +354,10 @@ WorkSheet *Workspace::restoreWorkSheet( const TQString &fileName, const TQString tmpStr = newName; // extract filename without path - TQString baseName = tmpStr.right( tmpStr.length() - tmpStr.findRev( '/' ) - 1 ); + TQString baseName = tmpStr.right( tmpStr.length() - tmpStr.tqfindRev( '/' ) - 1 ); // chop off extension (usually '.sgrd') - baseName = baseName.left( baseName.findRev( '.' ) ); + baseName = baseName.left( baseName.tqfindRev( '.' ) ); WorkSheet *sheet = new WorkSheet( this ); sheet->setTitle( baseName ); diff --git a/ksysguard/gui/Workspace.h b/ksysguard/gui/Workspace.h index 78c4906bd..924e2b732 100644 --- a/ksysguard/gui/Workspace.h +++ b/ksysguard/gui/Workspace.h @@ -32,7 +32,7 @@ class KURL; class TQString; class WorkSheet; -class Workspace : public QTabWidget +class Workspace : public TQTabWidget { Q_OBJECT diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc index 3885a9518..c5250a3cb 100644 --- a/ksysguard/gui/ksgrd/HostConnector.cc +++ b/ksysguard/gui/ksgrd/HostConnector.cc @@ -61,7 +61,7 @@ HostConnector::HostConnector( TQWidget *parent, const char *name ) i18n( "Connection Type" ), page ); TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 4, 4, spacingHint() ); - groupLayout->setAlignment( Qt::AlignTop ); + groupLayout->tqsetAlignment( Qt::AlignTop ); mUseSsh = new TQRadioButton( i18n( "ssh" ), group ); mUseSsh->setEnabled( true ); diff --git a/ksysguard/gui/ksgrd/SensorAgent.cc b/ksysguard/gui/ksgrd/SensorAgent.cc index 5fcb14a9c..363d66494 100644 --- a/ksysguard/gui/ksgrd/SensorAgent.cc +++ b/ksysguard/gui/ksgrd/SensorAgent.cc @@ -99,7 +99,7 @@ void SensorAgent::processAnswer( const TQString &buffer ) int end; // And now the real information - while ( ( end = mAnswerBuffer.find( "\nksysguardd> " ) ) >= 0 ) { + while ( ( end = mAnswerBuffer.tqfind( "\nksysguardd> " ) ) >= 0 ) { #if SA_TRACE kdDebug(1215) << "<= " << mAnswerBuffer.left( end ) << "(" << mInputFIFO.count() << "/" diff --git a/ksysguard/gui/ksgrd/SensorManager.cc b/ksysguard/gui/ksgrd/SensorManager.cc index 43f878cda..30bf53c43 100644 --- a/ksysguard/gui/ksgrd/SensorManager.cc +++ b/ksysguard/gui/ksgrd/SensorManager.cc @@ -162,7 +162,7 @@ bool SensorManager::engageHost( const TQString &hostName ) { bool retVal = true; - if ( hostName.isEmpty() || mAgents.find( hostName ) == 0 ) { + if ( hostName.isEmpty() || mAgents.tqfind( hostName ) == 0 ) { if(hostName == "localhost") { //There was a bug where the xml file would end up not specifying to connect to localhost. //This work around makes sure we always connect to localhost @@ -202,7 +202,7 @@ bool SensorManager::engage( const TQString &hostName, const TQString &shell, { SensorAgent *agent; - if ( ( agent = mAgents.find( hostName ) ) == 0 ) { + if ( ( agent = mAgents.tqfind( hostName ) ) == 0 ) { if ( port == -1 ) agent = new SensorShellAgent( this ); else @@ -253,7 +253,7 @@ bool SensorManager::disengage( const SensorAgent *agent ) bool SensorManager::disengage( const TQString &hostName ) { SensorAgent *agent; - if ( ( agent = mAgents.find( hostName ) ) != 0 ) { + if ( ( agent = mAgents.tqfind( hostName ) ) != 0 ) { mAgents.remove( hostName ); emit update(); return true; @@ -266,7 +266,7 @@ bool SensorManager::resynchronize( const TQString &hostName ) { SensorAgent *agent; - if ( ( agent = mAgents.find( hostName ) ) == 0 ) + if ( ( agent = mAgents.tqfind( hostName ) ) == 0 ) return false; TQString shell, command; @@ -327,11 +327,11 @@ bool SensorManager::event( TQEvent *event ) bool SensorManager::sendRequest( const TQString &hostName, const TQString &req, SensorClient *client, int id ) { - SensorAgent *agent = mAgents.find( hostName ); + SensorAgent *agent = mAgents.tqfind( hostName ); if( !agent && hostName == "localhost") { //we should always be able to reconnect to localhost engage("localhost", "", "ksysguardd", -1); - agent = mAgents.find( hostName ); + agent = mAgents.tqfind( hostName ); } if ( agent ) { agent->sendRequest( req, client, id ); @@ -358,7 +358,7 @@ bool SensorManager::hostInfo( const TQString &hostName, TQString &shell, TQString &command, int &port ) { SensorAgent *agent; - if ( ( agent = mAgents.find( hostName ) ) != 0 ) { + if ( ( agent = mAgents.tqfind( hostName ) ) != 0 ) { agent->hostInfo( shell, command, port ); return true; } @@ -395,7 +395,7 @@ TQString SensorManager::translateSensor( const TQString &sensor ) const TQString token, out; int start = 0, end = 0; for ( ; ; ) { - end = sensor.find( '/', start ); + end = sensor.tqfind( '/', start ); if ( end > 0 ) out += translateSensorPath( sensor.mid( start, end - start ) ) + "/"; else { diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc index 2be851232..19beba19d 100644 --- a/ksysguard/gui/ksysguard.cc +++ b/ksysguard/gui/ksysguard.cc @@ -76,7 +76,7 @@ TopLevel::TopLevel( const char *name ) mTimerId = -1; mSplitter = new TQSplitter( this ); - mSplitter->setOrientation( Horizontal ); + mSplitter->setOrientation( Qt::Horizontal ); mSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); setCentralWidget( mSplitter ); @@ -105,42 +105,42 @@ TopLevel::TopLevel( const char *name ) statusBar()->hide(); // create actions for menue entries - new KAction( i18n( "&New Worksheet..." ), "tab_new", 0, mWorkSpace, + new KAction( i18n( "&New Worksheet..." ), "tab_new", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" ); - new KAction( i18n( "Import Worksheet..." ), "fileopen", 0, mWorkSpace, + new KAction( i18n( "Import Worksheet..." ), "fileopen", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" ); mActionOpenRecent = new KRecentFilesAction( i18n( "&Import Recent Worksheet" ),"fileopen", 0, - mWorkSpace, TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" ); + TQT_TQOBJECT(mWorkSpace), TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" ); - new KAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, mWorkSpace, + new KAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" ); - new KAction( i18n( "&Export Worksheet..." ), "filesaveas", 0, mWorkSpace, + new KAction( i18n( "&Export Worksheet..." ), "filesaveas", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" ); - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); - new KAction( i18n( "C&onnect Host..." ), "connect_established", 0, this, + new KAction( i18n( "C&onnect Host..." ), "connect_established", 0, TQT_TQOBJECT(this), TQT_SLOT( connectHost() ), actionCollection(), "connect_host" ); - new KAction( i18n( "D&isconnect Host" ), "connect_no", 0, this, + new KAction( i18n( "D&isconnect Host" ), "connect_no", 0, TQT_TQOBJECT(this), TQT_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" ); // KStdAction::cut( mWorkSpace, TQT_SLOT( cut() ), actionCollection() ); // KStdAction::copy( mWorkSpace, TQT_SLOT( copy() ), actionCollection() ); // KStdAction::paste( mWorkSpace, TQT_SLOT( paste() ), actionCollection() ); - new KAction( i18n( "&Worksheet Properties" ), "configure", 0, mWorkSpace, + new KAction( i18n( "&Worksheet Properties" ), "configure", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( configure() ), actionCollection(), "configure_sheet" ); new KAction( i18n( "Load Standard Sheets" ), "revert", - 0, this, TQT_SLOT( resetWorkSheets() ), + 0, TQT_TQOBJECT(this), TQT_SLOT( resetWorkSheets() ), actionCollection(), "revert_all_worksheets" ); - new KAction( i18n( "Configure &Style..." ), "colorize", 0, this, + new KAction( i18n( "Configure &Style..." ), "colorize", 0, TQT_TQOBJECT(this), TQT_SLOT( editStyle() ), actionCollection(), "configure_style" ); - // TODO remove resize and fix so sizeHints() determines default size. + // TODO remove resize and fix so tqsizeHints() determines default size. if (!initialGeometrySet()) resize( 640, 480 ); setupGUI(ToolBar | Keys | StatusBar | Create); @@ -212,9 +212,9 @@ TQStringList TopLevel::listHosts() TQString TopLevel::readIntegerSensor( const TQString &sensorLocator ) { - TQString host = sensorLocator.left( sensorLocator.find( ':' ) ); + TQString host = sensorLocator.left( sensorLocator.tqfind( ':' ) ); TQString sensor = sensorLocator.right( sensorLocator.length() - - sensorLocator.find( ':' ) - 1 ); + sensorLocator.tqfind( ':' ) - 1 ); DCOPClientTransaction *dcopTransaction = kapp->dcopClient()->beginTransaction(); mDCopFIFO.prepend( dcopTransaction ); @@ -229,9 +229,9 @@ TQStringList TopLevel::readListSensor( const TQString& sensorLocator ) { TQStringList retval; - TQString host = sensorLocator.left( sensorLocator.find( ':' ) ); + TQString host = sensorLocator.left( sensorLocator.tqfind( ':' ) ); TQString sensor = sensorLocator.right( sensorLocator.length() - - sensorLocator.find( ':' ) - 1 ); + sensorLocator.tqfind( ':' ) - 1 ); DCOPClientTransaction *dcopTransaction = kapp->dcopClient()->beginTransaction(); mDCopFIFO.prepend( dcopTransaction ); diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h index f41e6afb1..f8e8c15c6 100644 --- a/ksysguard/gui/ksysguard.h +++ b/ksysguard/gui/ksysguard.h @@ -116,7 +116,7 @@ typedef unsigned long CARD32; class DCOPClientTransaction { public: - Q_INT32 id; + TQ_INT32 id; CARD32 key; TQCString senderId; }; diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp index f912c1221..3fd228a30 100644 --- a/ksystraycmd/ksystraycmd.cpp +++ b/ksystraycmd/ksystraycmd.cpp @@ -25,8 +25,8 @@ KSysTrayCmd::KSysTrayCmd() isVisible(true), lazyStart( false ), noquit( false ), quitOnHide( false ), onTop(false), ownIcon(false), win(0), client(0), kwinmodule(0), top(0), left(0) { - setAlignment( AlignCenter ); - kwinmodule = new KWinModule( this ); + tqsetAlignment( AlignCenter ); + kwinmodule = new KWinModule( TQT_TQOBJECT(this) ); refresh(); } @@ -195,7 +195,7 @@ void KSysTrayCmd::clientExited() if ( lazyStart && noquit ) refresh(); else - qApp->quit(); + tqApp->quit(); } void KSysTrayCmd::quitClient() @@ -212,11 +212,11 @@ void KSysTrayCmd::quitClient() // That's why when the application is closed we aren't informed. // So we quit now. if ( !command ) { - qApp->quit(); + tqApp->quit(); } } else { - qApp->quit(); + tqApp->quit(); } } @@ -225,7 +225,7 @@ void KSysTrayCmd::quit() if ( !isVisible ) { showWindow(); } - qApp->quit(); + tqApp->quit(); } void KSysTrayCmd::execContextMenu( const TQPoint &pos ) @@ -292,7 +292,7 @@ void KSysTrayCmd::windowChanged( WId w ) void KSysTrayCmd::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == RightButton ) + if ( e->button() == Qt::RightButton ) execContextMenu( e->globalPos() ); else if ( lazyStart && ( !hasRunningClient() ) ) { diff --git a/ksystraycmd/ksystraycmd.h b/ksystraycmd/ksystraycmd.h index 90e3bc36f..b8af38785 100644 --- a/ksystraycmd/ksystraycmd.h +++ b/ksystraycmd/ksystraycmd.h @@ -14,7 +14,7 @@ class KWinModule; * * @author Richard Moore, rich@kde.org */ -class KSysTrayCmd : public QLabel +class KSysTrayCmd : public TQLabel { Q_OBJECT public: diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp index 85fb78324..213b4189f 100644 --- a/ktip/ktipwindow.cpp +++ b/ktip/ktipwindow.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) app.dcopClient()->send("ksplash", "ksplash", "close()", TQByteArray()); // Close splash screen tipDialog->show(); - TQObject::connect(qApp, TQT_SIGNAL(lastWindowClosed()), qApp, TQT_SLOT(quit())); + TQObject::connect(tqApp, TQT_SIGNAL(lastWindowClosed()), tqApp, TQT_SLOT(quit())); app.setMainWidget(tipDialog); diff --git a/kwin/activation.cpp b/kwin/activation.cpp index 2cd836555..e964ed1b9 100644 --- a/kwin/activation.cpp +++ b/kwin/activation.cpp @@ -433,7 +433,7 @@ bool Workspace::activateNextClient( Client* c ) if( c == NULL && !(*it)->isOnScreen( activeScreen())) continue; } - if( mainwindows.contains( *it )) + if( mainwindows.tqcontains( *it )) { get_focus = *it; break; @@ -486,7 +486,7 @@ void Workspace::setCurrentScreen( int new_screen ) void Workspace::gotFocusIn( const Client* c ) { - if( should_get_focus.contains( const_cast< Client* >( c ))) + if( should_get_focus.tqcontains( const_cast< Client* >( c ))) { // remove also all sooner elements that should have got FocusIn, // but didn't for some reason (and also won't anymore, because they were sooner) while( should_get_focus.first() != c ) @@ -523,7 +523,7 @@ bool Workspace::allowClientActivation( const Client* c, Time time, bool focus_in Client* ac = mostRecentlyActivatedClient(); if( focus_in ) { - if( should_get_focus.contains( const_cast< Client* >( c ))) + if( should_get_focus.tqcontains( const_cast< Client* >( c ))) return true; // FocusIn was result of KWin's action // Before getting FocusIn, the active Client already // got FocusOut, and therefore got deactivated. diff --git a/kwin/bridge.cpp b/kwin/bridge.cpp index 49840e248..17b801475 100644 --- a/kwin/bridge.cpp +++ b/kwin/bridge.cpp @@ -160,7 +160,7 @@ TQRegion Bridge::unobscuredRegion( const TQRegion& r ) const { TQRegion reg( r ); const ClientList stacking_order = c->workspace()->stackingOrder(); - ClientList::ConstIterator it = stacking_order.find( c ); + ClientList::ConstIterator it = stacking_order.tqfind( c ); ++it; for(; it != stacking_order.end(); diff --git a/kwin/client.cpp b/kwin/client.cpp index 0d2c5cfbf..2b7794748 100644 --- a/kwin/client.cpp +++ b/kwin/client.cpp @@ -141,7 +141,7 @@ Client::Client( Workspace *ws ) deleting = false; keep_above = FALSE; keep_below = FALSE; - is_shape = FALSE; + is_tqshape = FALSE; motif_noborder = false; motif_may_move = TRUE; motif_may_resize = TRUE; @@ -286,7 +286,7 @@ void Client::destroyClient() destroyDecoration(); cleanGrouping(); workspace()->removeClient( this, Allowed ); - client = None; // invalidate + client = None; // tqinvalidate XDestroyWindow( qt_xdisplay(), wrapper ); wrapper = None; XDestroyWindow( qt_xdisplay(), frame ); @@ -307,7 +307,7 @@ void Client::updateDecoration( bool check_workspace_pos, bool force ) destroyDecoration(); if( !noBorder()) { - setMask( TQRegion()); // reset shape mask + setMask( TQRegion()); // reset tqshape mask decoration = workspace()->createDecoration( bridge ); // TODO check decoration's minimum size? decoration->init(); @@ -345,7 +345,7 @@ void Client::destroyDecoration() decoration = NULL; TQPoint grav = calculateGravitation( true ); border_left = border_right = border_top = border_bottom = 0; - setMask( TQRegion()); // reset shape mask + setMask( TQRegion()); // reset tqshape mask int save_workarea_diff_x = workarea_diff_x; int save_workarea_diff_y = workarea_diff_y; plainResize( sizeForClientSize( clientSize()), ForceGeometrySet ); @@ -502,32 +502,32 @@ void Client::setUserNoBorder( bool set ) void Client::updateShape() { - // workaround for #19644 - shaped windows shouldn't have decoration - if( shape() && !noBorder()) + // workaround for #19644 - tqshaped windows shouldn't have decoration + if( tqshape() && !noBorder()) { noborder = true; updateDecoration( true ); } updateOpacityCache(); - if ( shape() ) + if ( tqshape() ) { XShapeCombineShape(qt_xdisplay(), frameId(), ShapeBounding, clientPos().x(), clientPos().y(), window(), ShapeBounding, ShapeSet); setShapable(TRUE); } - // !shape() mask setting is done in setMask() when the decoration + // !tqshape() mask setting is done in setMask() when the decoration // calls it or when the decoration is created/destroyed - if( Shape::version() >= 0x11 ) // 1.1, has input shape support + if( Shape::version() >= 0x11 ) // 1.1, has input tqshape support { // There appears to be no way to find out if a window has input - // shape set or not, so always propagate the input shape - // (it's the same like the bounding shape by default). - // Also, build the shape using a helper window, not directly - // in the frame window, because the sequence set-shape-to-frame, - // remove-shape-of-client, add-input-shape-of-client has the problem - // that after the second step there's a hole in the input shape - // until the real shape of the client is added and that can make + // tqshape set or not, so always propagate the input tqshape + // (it's the same like the bounding tqshape by default). + // Also, build the tqshape using a helper window, not directly + // in the frame window, because the sequence set-tqshape-to-frame, + // remove-tqshape-of-client, add-input-tqshape-of-client has the problem + // that after the second step there's a hole in the input tqshape + // until the real tqshape of the client is added and that can make // the window lose focus (which is a problem with mouse focus policies) static Window helper_window = None; if( helper_window == None ) @@ -558,7 +558,7 @@ void Client::setMask( const TQRegion& reg, int mode ) reg.handle(), ShapeSet ); else { - TQMemArray< TQRect > rects = reg.rects(); + TQMemArray< TQRect > rects = reg.tqrects(); XRectangle* xrects = new XRectangle[ rects.count() ]; for( unsigned int i = 0; i < rects.count(); @@ -847,7 +847,7 @@ void Client::setShade( ShadeMode mode ) XSelectInput( qt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask ); //as we hid the unmap event, xcompmgr didn't recognize the client wid has vanished, so we'll extra inform it //done xcompmgr workaround -// FRAME repaint( FALSE ); +// FRAME tqrepaint( FALSE ); // bool wasStaticContents = testWFlags( WStaticContents ); // setWFlags( WStaticContents ); int step = QMAX( 4, QABS( h - s.height() ) / as )+1; @@ -888,7 +888,7 @@ void Client::setShade( ShadeMode mode ) resizeDecoration( TQSize( s.width(), h )); // assume a border // we do not have time to wait for X to send us paint events -// FRAME repaint( 0, h - step-5, width(), step+5, TRUE); +// FRAME tqrepaint( 0, h - step-5, width(), step+5, TRUE); TQApplication::syncX(); } while ( h < s.height() - step ); // if ( !wasStaticContents ) @@ -1051,7 +1051,7 @@ void Client::drawIntersectingShadows() { // active window has a shadow. return; - region = shapeBoundingRegion; + region = tqshapeBoundingRegion; // Generate list of Clients whose shadows need to be redrawn. That is, // those that are currently intersecting or intersected by other windows or @@ -1089,7 +1089,7 @@ void Client::drawOverlappingShadows(bool waitForMe) // active window has a shadow. return; - region = shapeBoundingRegion; + region = tqshapeBoundingRegion; stacking_order = workspace()->stackingOrder(); for (it = stacking_order.fromLast(); it != stacking_order.end(); --it) { @@ -1140,7 +1140,7 @@ void Client::drawOverlappingShadows(bool waitForMe) /*! Draw shadow after some time has elapsed, to give recently exposed windows a - chance to repaint before a shadow gradient is drawn over them. + chance to tqrepaint before a shadow gradient is drawn over them. */ void Client::drawDelayedShadow() { @@ -1163,7 +1163,7 @@ void Client::drawShadowAfter(Client *after) void Client::drawShadow() { Window shadows[2]; - XRectangle *shapes; + XRectangle *tqshapes; int i, count, ordering; // If we are waiting for another Client's shadow to be drawn, stop waiting now @@ -1179,31 +1179,31 @@ void Client::drawShadow() * this type of window. Otherwise, drawIntersectingShadows() won't update * properly when this window is moved/resized/hidden/closed. */ - shapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding, + tqshapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding, &count, &ordering); - if (!shapes) + if (!tqshapes) // XShape extension not supported - shapeBoundingRegion = TQRegion(x(), y(), width(), height()); + tqshapeBoundingRegion = TQRegion(x(), y(), width(), height()); else { - shapeBoundingRegion = TQRegion(); + tqshapeBoundingRegion = TQRegion(); for (i = 0; i < count; i++) { // Translate XShaped window into a TQRegion - TQRegion shapeRectangle(shapes[i].x, shapes[i].y, shapes[i].width, - shapes[i].height); - shapeBoundingRegion += shapeRectangle; + TQRegion tqshapeRectangle(tqshapes[i].x, tqshapes[i].y, tqshapes[i].width, + tqshapes[i].height); + tqshapeBoundingRegion += tqshapeRectangle; } if (isShade()) // Since XResize() doesn't change a window's XShape regions, ensure that - // shapeBoundingRegion is not taller than the window's shaded height, + // tqshapeBoundingRegion is not taller than the window's shaded height, // or the bottom shadow will appear to be missing - shapeBoundingRegion &= TQRegion(0, 0, width(), height()); - shapeBoundingRegion.translate(x(), y()); + tqshapeBoundingRegion &= TQRegion(0, 0, width(), height()); + tqshapeBoundingRegion.translate(x(), y()); } if (!isShadowed() || hidden || isMinimized() || maximizeMode() == MaximizeFull || !options->shadowWindowType(windowType())) { - XFree(shapes); + XFree(tqshapes); // Tell whatever Clients are listening that this Client's shadow has been drawn. // It hasn't, but there's no sense waiting for something that won't happen. @@ -1231,15 +1231,15 @@ void Client::drawShadow() shadowPixmap.resize(shadow.size()); // Create a fake drop-down shadow effect via blended Xwindows - shadowWidget = new TQWidget(0, 0, WStyle_Customize | WX11BypassWM); + shadowWidget = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WX11BypassWM)); shadowWidget->setGeometry(shadow); XSelectInput(qt_xdisplay(), shadowWidget->winId(), ButtonPressMask | ButtonReleaseMask | StructureNotifyMask); shadowWidget->installEventFilter(this); - if (!shapes) { + if (!tqshapes) { // XShape extension not supported - exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(), + exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(), shadow.y(), shadow.width(), shadow.height(), thickness, xOffset, yOffset); shadowRegion.region = exposedRegion; @@ -1247,7 +1247,7 @@ void Client::drawShadow() shadowRegions.append(shadowRegion); if (opacityCache->isNull()) - imposeRegionShadow(shadowPixmap, shapeBoundingRegion, + imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion, exposedRegion, thickness, options->shadowOpacity(isActive())); else @@ -1258,7 +1258,7 @@ void Client::drawShadow() TQMemArray<TQRect>::Iterator it, itEnd; XRectangle *shadowShapes; - exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(), + exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(), shadow.y(), shadow.width(), shadow.height(), thickness, xOffset, yOffset); shadowRegion.region = exposedRegion; @@ -1266,7 +1266,7 @@ void Client::drawShadow() shadowRegions.append(shadowRegion); // XShape the shadow - exposedRects = exposedRegion.rects(); + exposedRects = exposedRegion.tqrects(); i = 0; itEnd = exposedRects.end(); shadowShapes = new XRectangle[exposedRects.count()]; @@ -1284,14 +1284,14 @@ void Client::drawShadow() delete [] shadowShapes; if (opacityCache->isNull()) - imposeRegionShadow(shadowPixmap, shapeBoundingRegion, + imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion, exposedRegion, thickness, options->shadowOpacity(isActive())); else imposeCachedShadow(shadowPixmap, exposedRegion); } - XFree(shapes); + XFree(tqshapes); // Set the background pixmap //shadowPixmap.convertFromImage(shadowImage); @@ -1364,10 +1364,10 @@ TQRegion Client::getExposedRegion(TQRegion occludedRegion, int x, int y, int w, TQMemArray<TQRect>::Iterator it, itEnd; TQRegion shadowRegion; - occludedRects = occludedRegion.rects(); + occludedRects = occludedRegion.tqrects(); itEnd = occludedRects.end(); for (it = occludedRects.begin(); it != itEnd; ++it) { - // Expand each of the occluded region's shape rectangles to contain + // Expand each of the occluded region's tqshape rectangles to contain // where a shadow of the specified thickness will be drawn. Create // a new TQRegion that contains the expanded occluded region it->setTop(it->top() - thickness + yOffset); @@ -1398,7 +1398,7 @@ void Client::imposeCachedShadow(TQPixmap &pixmap, TQRegion exposed) Window rootWindow; int thickness, windowX, windowY, xOffset, yOffset; - rectangles = exposed.rects(); + rectangles = exposed.tqrects(); rootWindow = qt_xrootwin(); thickness = options->shadowThickness(isActive()); windowX = this->x(); @@ -1423,11 +1423,11 @@ void Client::imposeCachedShadow(TQPixmap &pixmap, TQRegion exposed) for (y = 0; y < subH; y++) { opacity = (*(opacityCache))[(zeroY + y) * w + zeroX + x]; pixel = image.pixel(x, y); - pixelRed = qRed(pixel); - pixelGreen = qGreen(pixel); - pixelBlue = qBlue(pixel); + pixelRed = tqRed(pixel); + pixelGreen = tqGreen(pixel); + pixelBlue = tqBlue(pixel); image.setPixel(x, y, - qRgb((int)(pixelRed + (red - pixelRed) * opacity), + tqRgb((int)(pixelRed + (red - pixelRed) * opacity), (int)(pixelGreen + (green - pixelGreen) * opacity), (int)(pixelBlue + (blue - pixelBlue) * opacity))); } @@ -1458,7 +1458,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, Window rootWindow; int windowX, windowY, xOffset, yOffset; - rectangles = exposed.rects(); + rectangles = exposed.tqrects(); rootWindow = qt_xrootwin(); windowX = this->x(); windowY = this->y(); @@ -1515,7 +1515,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, // irTop is not necessarily larger than irBottom and // yIncrement isn't necessarily positive for (i = irLeft; i <= irRight; i++) { - if (occluded.contains(TQPoint(i, j))) + if (occluded.tqcontains(TQPoint(i, j))) intersectCount++; } } @@ -1525,7 +1525,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, intersectCount = 0; for (i = irLeft; i <= irRight; i++) { - if (occluded.contains(TQPoint(i, irBottom))) + if (occluded.tqcontains(TQPoint(i, irBottom))) intersectCount++; } } @@ -1535,16 +1535,16 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, (*(opacityCache))[(zeroY + y) * w + zeroX + x] = opacity; pixel = image.pixel(x, y); - pixelRed = qRed(pixel); - pixelGreen = qGreen(pixel); - pixelBlue = qBlue(pixel); + pixelRed = tqRed(pixel); + pixelGreen = tqGreen(pixel); + pixelBlue = tqBlue(pixel); image.setPixel(x, y, - qRgb((int)(pixelRed + (red - pixelRed) * opacity), + tqRgb((int)(pixelRed + (red - pixelRed) * opacity), (int)(pixelGreen + (green - pixelGreen) * opacity), (int)(pixelBlue + (blue - pixelBlue) * opacity))); for (i = irLeft; i <= irRight; i++) { - if (occluded.contains(TQPoint(i, irTop))) + if (occluded.tqcontains(TQPoint(i, irTop))) intersectCount--; } @@ -1554,12 +1554,12 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, irTop += yIncrement; for (j = irTop; j != irBottom; j += yIncrement) { - if (occluded.contains(TQPoint(irLeft, j))) + if (occluded.tqcontains(TQPoint(irLeft, j))) intersectCount--; } irRight++; for (j = irTop; j != irBottom; j += yIncrement) { - if (occluded.contains(TQPoint(irRight, j))) + if (occluded.tqcontains(TQPoint(irRight, j))) intersectCount++; } @@ -2391,7 +2391,7 @@ NET::WindowType Client::windowType( bool direct, int supported_types ) const // TODO change this to rule const char* const oo_prefix = "openoffice.org"; // TQCString has no startsWith() // oo_prefix is lowercase, because resourceClass() is forced to be lowercase - if( qstrncmp( resourceClass(), oo_prefix, strlen( oo_prefix )) == 0 && wt == NET::Dialog ) + if( tqstrncmp( resourceClass(), oo_prefix, strlen( oo_prefix )) == 0 && wt == NET::Dialog ) wt = NET::Normal; // see bug #66065 if( wt == NET::Unknown ) // this is more or less suggested in NETWM spec wt = isTransient() ? NET::Dialog : NET::Normal; @@ -2399,7 +2399,7 @@ NET::WindowType Client::windowType( bool direct, int supported_types ) const } /*! - Sets an appropriate cursor shape for the logical mouse position \a m + Sets an appropriate cursor tqshape for the logical mouse position \a m */ void Client::setCursor( Position m ) @@ -2412,25 +2412,25 @@ void Client::setCursor( Position m ) { case PositionTopLeft: case PositionBottomRight: - setCursor( sizeFDiagCursor ); + setCursor( tqsizeFDiagCursor ); break; case PositionBottomLeft: case PositionTopRight: - setCursor( sizeBDiagCursor ); + setCursor( tqsizeBDiagCursor ); break; case PositionTop: case PositionBottom: - setCursor( sizeVerCursor ); + setCursor( tqsizeVerCursor ); break; case PositionLeft: case PositionRight: - setCursor( sizeHorCursor ); + setCursor( tqsizeHorCursor ); break; default: if( buttonDown && isMovable()) - setCursor( sizeAllCursor ); + setCursor( tqsizeAllCursor ); else - setCursor( arrowCursor ); + setCursor( tqarrowCursor ); break; } } diff --git a/kwin/client.h b/kwin/client.h index 1c4d45f51..52fb025f6 100644 --- a/kwin/client.h +++ b/kwin/client.h @@ -162,7 +162,7 @@ class Client : public TQObject, public KDecorationDefines void setKeepBelow( bool ); Layer layer() const; Layer belongsToLayer() const; - void invalidateLayer(); + void tqinvalidateLayer(); void setModal( bool modal ); bool isModal() const; @@ -213,8 +213,8 @@ class Client : public TQObject, public KDecorationDefines // window to be redrawn. friend void Workspace::updateOverlappingShadows(WId); - // shape extensions - bool shape() const; + // tqshape extensions + bool tqshape() const; void updateShape(); void setGeometry( int x, int y, int w, int h, ForceGeometry_t force = NormalGeometrySet ); @@ -500,7 +500,7 @@ class Client : public TQObject, public KDecorationDefines uint active :1; uint deleting : 1; // true when doing cleanup and destroying the client uint keep_above : 1; // NET::KeepAbove (was stays_on_top) - uint is_shape :1; + uint is_tqshape :1; uint skip_taskbar :1; uint original_skip_taskbar :1; // unaffected by KWin uint Pdeletewindow :1; // does the window understand the DeleteWindow protocol? @@ -569,7 +569,7 @@ class Client : public TQObject, public KDecorationDefines TQMemArray<double> activeOpacityCache; TQMemArray<double> inactiveOpacityCache; TQMemArray<double>* opacityCache; - TQRegion shapeBoundingRegion; + TQRegion tqshapeBoundingRegion; TQTimer* shadowDelayTimer; bool shadowMe; @@ -801,9 +801,9 @@ inline bool Client::keepBelow() const return keep_below; } -inline bool Client::shape() const +inline bool Client::tqshape() const { - return is_shape; + return is_tqshape; } @@ -832,7 +832,7 @@ inline pid_t Client::pid() const return info->pid(); } -inline void Client::invalidateLayer() +inline void Client::tqinvalidateLayer() { in_layer = UnknownLayer; } diff --git a/kwin/clients/b2/b2client.cpp b/kwin/clients/b2/b2client.cpp index 97d049ffb..ae010e830 100644 --- a/kwin/clients/b2/b2client.cpp +++ b/kwin/clients/b2/b2client.cpp @@ -146,7 +146,7 @@ static void drawB2Rect(KPixmap *pix, const TQColor &primary, bool down) TQColor hColor = primary.light(150); TQColor lColor = primary.dark(150); - if (down) qSwap(hColor, lColor); + if (down) tqSwap(hColor, lColor); if (TQPixmap::defaultDepth() > 8) { KPixmapEffect::gradient(*pix, hColor, lColor, @@ -355,7 +355,7 @@ void B2Client::init() // Check this early, otherwise the preview will be rendered badly. resizable = isResizable(); - createMainWidget(WResizeNoErase | WRepaintNoErase); + createMainWidget((WFlags)(WResizeNoErase | WRepaintNoErase)); widget()->installEventFilter(this); widget()->setBackgroundMode(NoBackground); @@ -418,7 +418,7 @@ void B2Client::init() titleLayout->addSpacing(3); - TQColor c = options()->colorGroup(KDecoration::ColorTitleBar, isActive()). + TQColor c = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive()). color(TQColorGroup::Button); for (int i = 0; i < BtnCount; i++) { @@ -443,7 +443,7 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], case 'M': // Menu button if (!button[BtnMenu]) { button[BtnMenu] = new B2Button(this, tb, tips[BtnMenu], - LeftButton | RightButton); + Qt::LeftButton | Qt::RightButton); button[BtnMenu]->setPixmaps(P_MENU); button[BtnMenu]->setUseMiniIcon(); connect(button[BtnMenu], TQT_SIGNAL(pressed()), @@ -483,7 +483,7 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], case 'A': // Maximize button if (isMaximizable() && (!button[BtnMax])) { button[BtnMax] = new B2Button(this, tb, tips[BtnMax], - LeftButton | MidButton | RightButton); + Qt::LeftButton | Qt::MidButton | Qt::RightButton); button[BtnMax]->setPixmaps(maximizeMode() == MaximizeFull ? P_NORMALIZE : P_MAX); connect(button[BtnMax], TQT_SIGNAL(clicked()), @@ -537,7 +537,7 @@ bool B2Client::mustDrawHandle() const void B2Client::iconChange() { if (button[BtnMenu]) - button[BtnMenu]->repaint(false); + button[BtnMenu]->tqrepaint(false); } // Gallium: New button show/hide magic for customizable @@ -586,7 +586,7 @@ void B2Client::resizeEvent(TQResizeEvent * /*e*/) titleMoveAbs(bar_x_ofs); doShape(); - widget()->repaint(); // the frame is misrendered without this + widget()->tqrepaint(); // the frame is misrendered without this } void B2Client::captionChange() @@ -595,7 +595,7 @@ void B2Client::captionChange() titleMoveAbs(bar_x_ofs); doShape(); titlebar->recalcBuffer(); - titlebar->repaint(false); + titlebar->tqrepaint(false); } void B2Client::paintEvent(TQPaintEvent* e) @@ -614,7 +614,7 @@ void B2Client::paintEvent(TQPaintEvent* e) int bb = mustDrawHandle() ? 4 : 0; int bDepth = thickness + bb; - TQColorGroup fillColor = options()->colorGroup(frameColorGroup, isActive()); + TQColorGroup fillColor = options()->tqcolorGroup(frameColorGroup, isActive()); TQBrush fillBrush(options()->color(frameColorGroup, isActive())); // outer frame rect @@ -689,7 +689,7 @@ void B2Client::paintEvent(TQPaintEvent* e) visibilitinotify events until its state changes, so we just try */ if (titlebar->isFullyObscured()) { - /* We first see, if our repaint contained the titlebar area */ + /* We first see, if our tqrepaint contained the titlebar area */ TQRegion reg(TQRect(0, 0, width(), buttonSize + 4)); reg = reg.intersect(e->region()); if (!reg.isEmpty()) @@ -794,8 +794,8 @@ void B2Client::titleMoveAbs(int new_ofs) bar_x_ofs = new_ofs; positionButtons(); doShape(); - widget()->repaint(0, 0, width(), buttonSize + 4, false); - titlebar->repaint(false); + widget()->tqrepaint(0, 0, width(), buttonSize + 4, false); + titlebar->tqrepaint(false); } } @@ -820,7 +820,7 @@ void B2Client::maximizeChange() bool m = maximizeMode() == MaximizeFull; if (button[BtnMax]) { button[BtnMax]->setPixmaps(m ? P_NORMALIZE : P_MAX); - button[BtnMax]->repaint(); + button[BtnMax]->tqrepaint(); TQToolTip::remove(button[BtnMax]); TQToolTip::add(button[BtnMax], m ? i18n("Restore") : i18n("Maximize")); @@ -830,21 +830,21 @@ void B2Client::maximizeChange() g->activate(); doShape(); - widget()->repaint(false); + widget()->tqrepaint(false); } void B2Client::activeChange() { - widget()->repaint(false); - titlebar->repaint(false); + widget()->tqrepaint(false); + titlebar->tqrepaint(false); - TQColor c = options()->colorGroup( + TQColor c = options()->tqcolorGroup( KDecoration::ColorTitleBar, isActive()).color(TQColorGroup::Button); for (int i = 0; i < BtnCount; i++) if (button[i]) { button[i]->setBg(c); - button[i]->repaint(false); + button[i]->tqrepaint(false); } } @@ -860,7 +860,7 @@ void B2Client::shadeChange() } } -TQSize B2Client::minimumSize() const +TQSize B2Client::tqminimumSize() const { int left, right, top, bottom; borders(left, right, top, bottom); @@ -939,8 +939,8 @@ void B2Client::unobscureTitlebar() static void redraw_pixmaps() { int i; - TQColorGroup aGrp = options()->colorGroup(KDecoration::ColorButtonBg, true); - TQColorGroup iGrp = options()->colorGroup(KDecoration::ColorButtonBg, false); + TQColorGroup aGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup iGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); // close drawB2Rect(PIXMAP_A(P_CLOSE), aGrp.button(), false); @@ -961,8 +961,8 @@ static void redraw_pixmaps() TQColor color = is_act ? aGrp.button() : iGrp.button(); drawB2Rect(&thinBox, color, is_down); pix->fill(Qt::black); - bitBlt(pix, 0, 0, &thinBox, - 0, 0, thinBox.width(), thinBox.height(), Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&thinBox), + 0, 0, thinBox.width(), thinBox.height(), TQt::CopyROP, true); } // maximize @@ -984,12 +984,12 @@ static void redraw_pixmaps() drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down); drawB2Rect(&largeBox, is_act ? aGrp.button() : iGrp.button(), is_down); pix->fill(options()->color(KDecoration::ColorTitleBar, is_act)); - bitBlt(pix, pix->width() - 12, pix->width() - 12, &largeBox, - 0, 0, 12, 12, Qt::CopyROP, true); - bitBlt(pix, 0, 0, &smallBox, 0, 0, 10, 10, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(pix), pix->width() - 12, pix->width() - 12, TQT_TQPAINTDEVICE(&largeBox), + 0, 0, 12, 12, TQt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true); - bitBlt(pixmap[P_ICONIFY * NumStates + i], 0, 0, - &smallBox, 0, 0, 10, 10, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(pixmap[P_ICONIFY * NumStates + i]), 0, 0, + TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true); } // resize @@ -999,8 +999,8 @@ static void redraw_pixmaps() *pixmap[P_RESIZE * NumStates + i] = *pixmap[P_CLOSE * NumStates + i]; pixmap[P_RESIZE * NumStates + i]->detach(); drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down); - bitBlt(pixmap[P_RESIZE * NumStates + i], - 0, 0, &smallBox, 0, 0, 10, 10, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(pixmap[P_RESIZE * NumStates + i]), + 0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true); } @@ -1107,7 +1107,7 @@ void B2Client::positionButtons() // Transparent bound stuff. static TQRect *visible_bound; -static TQPointArray bound_shape; +static TQPointArray bound_tqshape; bool B2Client::drawbound(const TQRect& geom, bool clear) { @@ -1132,7 +1132,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) barLeft += 2; barRight -= 2; - bound_shape.putPoints(0, 8, + bound_tqshape.putPoints(0, 8, g.left(), frameTop, barLeft, frameTop, barLeft, g.top(), @@ -1146,8 +1146,8 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) } TQPainter p(workspaceWidget()); p.setPen(TQPen(Qt::white, 5)); - p.setRasterOp(Qt::XorROP); - p.drawPolygon(bound_shape); + p.setRasterOp(TQt::XorROP); + p.drawPolygon(bound_tqshape); if (clear) { delete visible_bound; @@ -1158,26 +1158,26 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) bool B2Client::eventFilter(TQObject *o, TQEvent *e) { - if (o != widget()) + if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch (e->type()) { case TQEvent::Resize: - resizeEvent(static_cast< TQResizeEvent* >(e)); + resizeEvent(TQT_TQRESIZEEVENT(e)); return true; case TQEvent::Paint: - paintEvent(static_cast< TQPaintEvent* >(e)); + paintEvent(TQT_TQPAINTEVENT(e)); return true; case TQEvent::MouseButtonDblClick: - titlebar->mouseDoubleClickEvent(static_cast< TQMouseEvent* >(e)); + titlebar->mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::Wheel: - titlebar->wheelEvent(static_cast< TQWheelEvent* >(e)); + titlebar->wheelEvent(TQT_TQWHEELEVENT(e)); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(static_cast< TQMouseEvent* >(e)); + processMousePressEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::Show: - showEvent(static_cast< TQShowEvent* >(e)); + showEvent(TQT_TQSHOWEVENT(e)); return true; default: break; @@ -1192,7 +1192,7 @@ B2Button::B2Button(B2Client *_client, TQWidget *parent, : TQButton(parent, 0), hover(false) { setBackgroundMode(NoBackground); - setCursor(arrowCursor); + setCursor(tqarrowCursor); realizeButtons = realizeBtns; client = _client; useMiniIcon = false; @@ -1201,7 +1201,7 @@ B2Button::B2Button(B2Client *_client, TQWidget *parent, } -TQSize B2Button::sizeHint() const +TQSize B2Button::tqsizeHint() const { return TQSize(buttonSize, buttonSize); } @@ -1252,14 +1252,14 @@ void B2Button::setPixmaps(int button_id) for (int i = 0; i < NumStates; i++) { icon[i] = B2::pixmap[button_id + i]; } - repaint(false); + tqrepaint(false); } void B2Button::mousePressEvent(TQMouseEvent * e) { last_button = e->button(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button() & realizeButtons) ? LeftButton : NoButton, + (e->button() & realizeButtons) ? Qt::LeftButton : Qt::NoButton, e->state()); TQButton::mousePressEvent(&me); } @@ -1268,7 +1268,7 @@ void B2Button::mouseReleaseEvent(TQMouseEvent * e) { last_button = e->button(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button() & realizeButtons) ? LeftButton : NoButton, + (e->button() & realizeButtons) ? Qt::LeftButton : Qt::NoButton, e->state()); TQButton::mouseReleaseEvent(&me); } @@ -1276,21 +1276,21 @@ void B2Button::mouseReleaseEvent(TQMouseEvent * e) void B2Button::enterEvent(TQEvent *e) { hover = true; - repaint(false); + tqrepaint(false); TQButton::enterEvent(e); } void B2Button::leaveEvent(TQEvent *e) { hover = false; - repaint(false); + tqrepaint(false); TQButton::leaveEvent(e); } // ===================================== B2Titlebar::B2Titlebar(B2Client *parent) - : TQWidget(parent->widget(), 0, WStyle_Customize | WRepaintNoErase), + : TQWidget(parent->widget(), 0, (WFlags)(WStyle_Customize | WRepaintNoErase)), client(parent), set_x11mask(false), isfullyobscured(false), shift_move(false) { @@ -1342,7 +1342,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state) // titlebar fill const TQColorGroup cg = - options()->colorGroup(KDecoration::ColorTitleBar, state); + options()->tqcolorGroup(KDecoration::ColorTitleBar, state); TQBrush brush(cg.background()); if (gradient) brush.setPixmap(*gradient); qDrawShadeRect(&p, 1, 1, t.right() - 1, t.height() - 1, @@ -1367,15 +1367,15 @@ void B2Titlebar::recalcBuffer() void B2Titlebar::resizeEvent(TQResizeEvent *) { recalcBuffer(); - repaint(false); + tqrepaint(false); } void B2Titlebar::paintEvent(TQPaintEvent *) { if(client->isActive()) - bitBlt(this, 0, 0, &titleBuffer, 0, 0, titleBuffer.width(), - titleBuffer.height(), Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&titleBuffer), 0, 0, titleBuffer.width(), + titleBuffer.height(), TQt::CopyROP, true); else { TQPainter p(this); drawTitlebar(p, false); @@ -1384,14 +1384,14 @@ void B2Titlebar::paintEvent(TQPaintEvent *) void B2Titlebar::mouseDoubleClickEvent(TQMouseEvent *e) { - if (e->button() == LeftButton && e->y() < height()) { + if (e->button() == Qt::LeftButton && e->y() < height()) { client->titlebarDblClickOperation(); } } void B2Titlebar::wheelEvent(TQWheelEvent *e) { - if (client->isSetShade() || rect().contains(e->pos())) + if (client->isSetShade() || TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos())) client->titlebarMouseWheelOperation( e->delta()); } diff --git a/kwin/clients/b2/b2client.h b/kwin/clients/b2/b2client.h index 198dfbb9b..e7616157c 100644 --- a/kwin/clients/b2/b2client.h +++ b/kwin/clients/b2/b2client.h @@ -25,10 +25,10 @@ namespace B2 { class B2Client; -class B2Button : public QButton +class B2Button : public TQButton { public: - B2Button(B2Client *_client=0, TQWidget *parent=0, const TQString& tip=NULL, const int realizeBtns = LeftButton); + B2Button(B2Client *_client=0, TQWidget *parent=0, const TQString& tip=NULL, const int realizeBtns = Qt::LeftButton); ~B2Button() {}; void setBg(const TQColor &c){bg = c;} @@ -38,7 +38,7 @@ public: void setToggle(){setToggleType(Toggle);} void setActive(bool on){setOn(on);} void setUseMiniIcon(){useMiniIcon = true;} - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSizePolicy sizePolicy() const; protected: virtual void drawButton(TQPainter *p); @@ -61,7 +61,7 @@ public: bool hover; }; -class B2Titlebar : public QWidget +class B2Titlebar : public TQWidget { friend class B2Client; public: @@ -119,7 +119,7 @@ protected: Position mousePosition( const TQPoint& p ) const; void resize(const TQSize&); void borders(int &, int &, int &, int &) const; - TQSize minimumSize() const; + TQSize tqminimumSize() const; bool eventFilter(TQObject *, TQEvent *); private slots: void menuButtonPressed(); diff --git a/kwin/clients/b2/config/config.h b/kwin/clients/b2/config/config.h index 92c255ae6..99d664ad1 100644 --- a/kwin/clients/b2/config/config.h +++ b/kwin/clients/b2/config/config.h @@ -16,7 +16,7 @@ #include <tqcombobox.h> #include <kconfig.h> -class B2Config: public QObject +class B2Config: public TQObject { Q_OBJECT diff --git a/kwin/clients/default/config/config.h b/kwin/clients/default/config/config.h index 5857910b1..733b96141 100644 --- a/kwin/clients/default/config/config.h +++ b/kwin/clients/default/config/config.h @@ -17,7 +17,7 @@ #include <tqlabel.h> #include <tqvbox.h> -class KDEDefaultConfig: public QObject +class KDEDefaultConfig: public TQObject { Q_OBJECT diff --git a/kwin/clients/default/kdedefault.cpp b/kwin/clients/default/kdedefault.cpp index d91ccf56b..f3b8fa2ba 100644 --- a/kwin/clients/default/kdedefault.cpp +++ b/kwin/clients/default/kdedefault.cpp @@ -240,7 +240,7 @@ unsigned long KDEDefaultHandler::readConfig( bool update ) || new_useGradients != useGradients || new_titleHeight != normalTitleHeight || new_toolTitleHeight != toolTitleHeight ) - changed |= SettingColors; // just recreate the pixmaps and repaint + changed |= SettingColors; // just recreate the pixmaps and tqrepaint } showGrabBar = new_showGrabBar; @@ -328,7 +328,7 @@ void KDEDefaultHandler::createPixmaps() TQPainter p; // Active pins - g = options()->colorGroup( ColorButtonBg, true ); + g = options()->tqcolorGroup( ColorButtonBg, true ); pinUpPix = new KPixmap(); pinUpPix->resize(16, 16); p.begin( pinUpPix ); @@ -346,7 +346,7 @@ void KDEDefaultHandler::createPixmaps() pinDownPix->setMask( TQBitmap(16, 16, pindown_mask_bits, true) ); // Inactive pins - g = options()->colorGroup( ColorButtonBg, false ); + g = options()->tqcolorGroup( ColorButtonBg, false ); ipinUpPix = new KPixmap(); ipinUpPix->resize(16, 16); p.begin( ipinUpPix ); @@ -404,25 +404,25 @@ void KDEDefaultHandler::createPixmaps() irightBtnDownPix[false]->resize(toolTitleHeight, toolTitleHeight); // Draw the button state pixmaps - g = options()->colorGroup( ColorTitleBar, true ); + g = options()->tqcolorGroup( ColorTitleBar, true ); drawButtonBackground( leftBtnUpPix[true], g, false ); drawButtonBackground( leftBtnDownPix[true], g, true ); drawButtonBackground( leftBtnUpPix[false], g, false ); drawButtonBackground( leftBtnDownPix[false], g, true ); - g = options()->colorGroup( ColorButtonBg, true ); + g = options()->tqcolorGroup( ColorButtonBg, true ); drawButtonBackground( rightBtnUpPix[true], g, false ); drawButtonBackground( rightBtnDownPix[true], g, true ); drawButtonBackground( rightBtnUpPix[false], g, false ); drawButtonBackground( rightBtnDownPix[false], g, true ); - g = options()->colorGroup( ColorTitleBar, false ); + g = options()->tqcolorGroup( ColorTitleBar, false ); drawButtonBackground( ileftBtnUpPix[true], g, false ); drawButtonBackground( ileftBtnDownPix[true], g, true ); drawButtonBackground( ileftBtnUpPix[false], g, false ); drawButtonBackground( ileftBtnDownPix[false], g, true ); - g = options()->colorGroup( ColorButtonBg, false ); + g = options()->tqcolorGroup( ColorButtonBg, false ); drawButtonBackground( irightBtnUpPix[true], g, false ); drawButtonBackground( irightBtnDownPix[true], g, true ); drawButtonBackground( irightBtnUpPix[false], g, false ); @@ -676,7 +676,7 @@ void KDEDefaultButton::drawButton(TQPainter *p) // otherwise we paint a menu button (with mini icon), or a sticky button. if( deco ) { // Select the appropriate button decoration color - bool darkDeco = qGray( KDecoration::options()->color( + bool darkDeco = tqGray( KDecoration::options()->color( isLeft() ? KDecoration::ColorTitleBar : KDecoration::ColorButtonBg, active).rgb() ) > 127; @@ -708,7 +708,7 @@ void KDEDefaultButton::drawButton(TQPainter *p) // Smooth scale the pixmap for small titlebars // This is slow, but we assume this isn't done too often if ( width() < 16 ) { - btnpix.convertFromImage(btnpix.convertToImage().smoothScale(12, 12)); + btnpix.convertFromImage(TQImage(btnpix.convertToImage()).smoothScale(12, 12)); p->drawPixmap( 0, 0, btnpix ); } else @@ -720,7 +720,7 @@ void KDEDefaultButton::drawButton(TQPainter *p) void KDEDefaultButton::enterEvent(TQEvent *e) { isMouseOver=true; - repaint(false); + tqrepaint(false); TQButton::enterEvent(e); } @@ -728,7 +728,7 @@ void KDEDefaultButton::enterEvent(TQEvent *e) void KDEDefaultButton::leaveEvent(TQEvent *e) { isMouseOver=false; - repaint(false); + tqrepaint(false); TQButton::leaveEvent(e); } @@ -856,7 +856,7 @@ void KDEDefaultClient::init() void KDEDefaultClient::reset( unsigned long changed) { - widget()->repaint(); + widget()->tqrepaint(); KCommonDecoration::reset(changed); } @@ -909,7 +909,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* ) p.drawRect(x,y,w,h); // Draw part of the frame that is the titlebar color - g = options()->colorGroup(ColorTitleBar, isActive()); + g = options()->tqcolorGroup(ColorTitleBar, isActive()); p.setPen(g.light()); p.drawLine(x+1, y+1, rightOffset-1, y+1); p.drawLine(x+1, y+1, x+1, leftFrameStart+borderWidth-4); @@ -929,7 +929,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* ) p.drawLine(x+borderWidth-2, y+titleHeight+3, x+borderWidth-2, leftFrameStart-2); // Fill out the border edges - g = options()->colorGroup(ColorFrame, isActive()); + g = options()->tqcolorGroup(ColorFrame, isActive()); p.setPen(g.light()); p.drawLine(rightOffset, y+1, x2-1, y+1); p.drawLine(x+1, leftFrameStart+borderWidth-3, x+1, y2-1); diff --git a/kwin/clients/keramik/config/keramikconfig.ui b/kwin/clients/keramik/config/keramikconfig.ui index f074a00b8..f24d15952 100644 --- a/kwin/clients/keramik/config/keramikconfig.ui +++ b/kwin/clients/keramik/config/keramikconfig.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KeramikConfigUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KeramikConfigUI</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>showAppIcons</cstring> </property> @@ -33,7 +33,7 @@ <string>Check this option if you want the window icon to be displayed in the caption bubble next to the titlebar text.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>smallCaptions</cstring> </property> @@ -44,7 +44,7 @@ <string>Check this option if you want the caption bubble to have the same size on active windows that it has on inactive ones. This option is useful for laptops or low resolution displays where you want maximize the amount of space available to the window contents.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>largeGrabBars</cstring> </property> @@ -55,7 +55,7 @@ <string>Check this option if you want a grab bar to be drawn below windows. When this option is not selected only a thin border will be drawn in its place.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>useShadowedText</cstring> </property> diff --git a/kwin/clients/keramik/embedtool.cpp b/kwin/clients/keramik/embedtool.cpp index 4f5135a3f..415862842 100644 --- a/kwin/clients/keramik/embedtool.cpp +++ b/kwin/clients/keramik/embedtool.cpp @@ -1,7 +1,7 @@ /* * Keramik KWin embed tool (version 1.0) * - * Copyright (C) 2002 Fredrik Höglund <fredrik@kde.org> + * Copyright (C) 2002 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 License as published by @@ -60,13 +60,13 @@ private: KeramikEmbedder::KeramikEmbedder() { - TQDateTime date( TQDateTime::currentDateTime() ); + TQDateTime date( TQDateTime::tqcurrentDateTime() ); TQString datestring( date.toString() ); file = new TQFile( "tiles.h" ); file->open( IO_WriteOnly | IO_Truncate ); - stream.setDevice( file ); + stream.setDevice( TQT_TQIODEVICE(file) ); stream << "/*\n"; stream << " * Generated by embedtool 1.0 on " << datestring << endl; @@ -100,19 +100,19 @@ void KeramikEmbedder::embed( const char *name ) TQString codename( basename ); TQImage image( name ); - codename = codename.replace( TQRegExp("[^a-zA-Z0-9]"), "_" ); + codename = codename.tqreplace( TQRegExp("[^a-zA-Z0-9]"), "_" ); stream << "\tstatic const QRgb " << codename << "_data[] = {" << endl << "\t\t"; stream.setf( TQTextStream::hex | TQTextStream::right ); stream.fill( '0' ); int pixels = image.width() * image.height(); - Q_UINT32 *data = reinterpret_cast<Q_UINT32*>( image.bits() ); + TQ_UINT32 *data = reinterpret_cast<TQ_UINT32*>( image.bits() ); bool hasAlpha = false; for ( int i = 0, j = 0; i < pixels; i++ ) { - if ( qAlpha( *data ) && qAlpha( *data ) != 0xff ) + if ( tqAlpha( *data ) && tqAlpha( *data ) != 0xff ) hasAlpha = true; stream << "0x" << qSetW(8) << *(data++); @@ -174,12 +174,12 @@ void KeramikEmbedder::writeIndex() stream << "\tclass KeramikImageDb {\n"; stream << "\tprivate:\n"; stream << "\t\tstatic KeramikImageDb *m_inst;\n"; - stream << "\t\tQDict<TQImage> *db;\n\n"; + stream << "\t\tTQDict<TQImage> *db;\n\n"; stream << "\t\tKeramikImageDb() {\n"; stream << "\t\t\tdb = new TQDict<TQImage>( " << prime << " );\n"; stream << "\t\t\tdb->setAutoDelete( true );\n\n"; stream << "\t\t\tfor ( int i = 0; i < " << index->count() << "; i++ ) {\n"; - stream << "\t\t\t\tQImage *img = new TQImage( (uchar*)image_db[i].data,\n"; + stream << "\t\t\t\tTQImage *img = new TQImage( (uchar*)image_db[i].data,\n"; stream << "\t\t\t\t\t\timage_db[i].width, image_db[i].height,\n"; stream << "\t\t\t\t\t\t32, NULL, 0, TQImage::LittleEndian );\n\n"; stream << "\t\t\t\tif ( image_db[i].alpha )\n"; @@ -199,8 +199,8 @@ void KeramikEmbedder::writeIndex() stream << "\t\t\tif ( m_inst ) delete m_inst;\n"; stream << "\t\t\tm_inst = NULL;\n"; stream << "\t\t}\n\n"; - stream << "\t\tQImage *image( const TQString &name ) const {\n"; - stream << "\t\t\treturn db->find( name );\n"; + stream << "\t\tTQImage *image( const TQString &name ) const {\n"; + stream << "\t\t\treturn db->tqfind( name );\n"; stream << "\t\t}\n\n"; stream << "\t}; // class KeramikImageDb\n\n"; stream << "\tKeramikImageDb *KeramikImageDb::m_inst = NULL;\n\n"; diff --git a/kwin/clients/keramik/keramik.cpp b/kwin/clients/keramik/keramik.cpp index 48a187098..2d5f111c8 100644 --- a/kwin/clients/keramik/keramik.cpp +++ b/kwin/clients/keramik/keramik.cpp @@ -585,39 +585,39 @@ TQPixmap *KeramikHandler::composite( TQImage *over, TQImage *under ) int width = over->width(), height = over->height(); // Clear the destination image - Q_UINT32 *data = reinterpret_cast<Q_UINT32*>( dest.bits() ); + TQ_UINT32 *data = reinterpret_cast<TQ_UINT32*>( dest.bits() ); for (int i = 0; i < width * height; i++) *(data++) = 0; // Copy the under image (bottom aligned) to the destination image for (int y1 = height - under->height(), y2 = 0; y1 < height; y1++, y2++ ) { - register Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( dest.scanLine(y1) ); - register Q_UINT32 *src = reinterpret_cast<Q_UINT32*>( under->scanLine(y2) ); + register TQ_UINT32 *dst = reinterpret_cast<TQ_UINT32*>( dest.scanLine(y1) ); + register TQ_UINT32 *src = reinterpret_cast<TQ_UINT32*>( under->scanLine(y2) ); for ( int x = 0; x < width; x++ ) *(dst++) = *(src++); } // Blend the over image onto the destination - register Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( dest.bits() ); - register Q_UINT32 *src = reinterpret_cast<Q_UINT32*>( over->bits() ); + register TQ_UINT32 *dst = reinterpret_cast<TQ_UINT32*>( dest.bits() ); + register TQ_UINT32 *src = reinterpret_cast<TQ_UINT32*>( over->bits() ); for ( int i = 0; i < width * height; i++ ) { - int r1 = qRed( *dst ), g1 = qGreen( *dst ), b1 = qBlue( *dst ); - int r2 = qRed( *src ), g2 = qGreen( *src ), b2 = qBlue( *src ); - int a = qAlpha( *src ); + int r1 = tqRed( *dst ), g1 = tqGreen( *dst ), b1 = tqBlue( *dst ); + int r2 = tqRed( *src ), g2 = tqGreen( *src ), b2 = tqBlue( *src ); + int a = tqAlpha( *src ); if ( a == 0xff ) *dst = *src; else if ( a != 0x00 ) - *dst = qRgba( Q_UINT8( r1 + (((r2 - r1) * a) >> 8) ), - Q_UINT8( g1 + (((g2 - g1) * a) >> 8) ), - Q_UINT8( b1 + (((b2 - b1) * a) >> 8) ), + *dst = tqRgba( TQ_UINT8( r1 + (((r2 - r1) * a) >> 8) ), + TQ_UINT8( g1 + (((g2 - g1) * a) >> 8) ), + TQ_UINT8( b1 + (((b2 - b1) * a) >> 8) ), 0xff ); - else if ( qAlpha(*dst) == 0x00 ) + else if ( tqAlpha(*dst) == 0x00 ) *dst = 0; src++; dst++; @@ -758,13 +758,13 @@ TQValueList< KeramikHandler::BorderSize > KeramikHandler::borderSizes() const KeramikButton::KeramikButton( KeramikClient* c, const char *name, Button btn, const TQString &tip, const int realizeBtns ) : TQButton( c->widget(), name ), - client( c ), button( btn ), hover( false ), lastbutton( NoButton ) + client( c ), button( btn ), hover( false ), lastbutton( Qt::NoButton ) { realizeButtons = realizeBtns; TQToolTip::add( this, tip ); // FRAME setBackgroundMode( NoBackground ); - setCursor( arrowCursor ); + setCursor( tqarrowCursor ); int size = clientHandler->roundButton()->height(); setFixedSize( size, size ); @@ -783,7 +783,7 @@ void KeramikButton::enterEvent( TQEvent *e ) TQButton::enterEvent( e ); hover = true; - repaint( false ); + tqrepaint( false ); } @@ -792,14 +792,14 @@ void KeramikButton::leaveEvent( TQEvent *e ) TQButton::leaveEvent( e ); hover = false; - repaint( false ); + tqrepaint( false ); } void KeramikButton::mousePressEvent( TQMouseEvent *e ) { lastbutton = e->button(); - TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?LeftButton:NoButton, e->state() ); + TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); TQButton::mousePressEvent( &me ); } @@ -807,7 +807,7 @@ void KeramikButton::mousePressEvent( TQMouseEvent *e ) void KeramikButton::mouseReleaseEvent( TQMouseEvent *e ) { lastbutton = e->button(); - TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?LeftButton:NoButton, e->state() ); + TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); TQButton::mouseReleaseEvent( &me ); } @@ -831,14 +831,14 @@ void KeramikButton::drawButton( TQPainter *p ) if ( isDown() ) { // Pressed - p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(2*size, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(2*size, 0, size, size), pix->rect() ) ); p->translate( TQApplication::reverseLayout() ? -1 : 1, 1 ); } else if ( hover ) // Mouse over - p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(size, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(size, 0, size, size), pix->rect() ) ); else // Normal - p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(0, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(0, 0, size, size), pix->rect() ) ); // Draw the button deco on the bevel @@ -909,7 +909,7 @@ void KeramikClient::init() connect( this, TQT_SIGNAL( keepAboveChanged( bool )), TQT_SLOT( keepAboveChange( bool ))); connect( this, TQT_SIGNAL( keepBelowChanged( bool )), TQT_SLOT( keepBelowChange( bool ))); - createMainWidget( WStaticContents | WResizeNoErase | WRepaintNoErase ); + createMainWidget( (WFlags)(WStaticContents | WResizeNoErase | WRepaintNoErase) ); widget()->installEventFilter( this ); // Minimize flicker @@ -1013,13 +1013,13 @@ void KeramikClient::reset( unsigned long ) captionBufferDirty = maskDirty = true; - // Only repaint the window if it's visible + // Only tqrepaint the window if it's visible // (i.e. not minimized and on the current desktop) if ( widget()->isVisible() ) { - widget()->repaint( false ); + widget()->tqrepaint( false ); for ( int i = 0; i < NumButtons; i++ ) - if ( button[i] ) button[i]->repaint( false ); + if ( button[i] ) button[i]->tqrepaint( false ); } } @@ -1033,7 +1033,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) // Menu button case 'M' : if ( !button[MenuButton] ) { - button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), LeftButton|RightButton ); + button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), Qt::LeftButton|Qt::RightButton ); connect( button[MenuButton], TQT_SIGNAL( pressed() ), TQT_SLOT( menuButtonPressed() ) ); layout->addWidget( button[MenuButton] ); } @@ -1072,7 +1072,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) // Maximize button case 'A' : if ( !button[MaxButton] && isMaximizable() ) { - button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), LeftButton|MidButton|RightButton ); + button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton ); connect( button[MaxButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotMaximize() ) ); layout->addWidget( button[MaxButton] ); } @@ -1260,7 +1260,7 @@ void KeramikClient::updateCaptionBuffer() ( clientHandler->showAppIcons() ? 16 + iconSpacing : 0 ); int xpos = QMAX( (captionRect.width() - tw) / 3, 8 ); - TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10, + TQRect tr = TQStyle::tqvisualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10, captionRect.height() - 4), captionBuffer.rect() ); //p.setPen( Qt::red ); // debug @@ -1269,7 +1269,7 @@ void KeramikClient::updateCaptionBuffer() // Application icon if ( clientHandler->showAppIcons() ) { - TQRect iconRect = TQStyle::visualRect( TQRect(tr.x(), + TQRect iconRect = TQStyle::tqvisualRect( TQRect(tr.x(), 1 + (captionRect.height() - 4 - 16) / 2, 16, 16), tr ); TQRect r( icon->rect() ); r.moveCenter( iconRect.center() ); @@ -1304,7 +1304,7 @@ void KeramikClient::updateCaptionBuffer() { p.translate( TQApplication::reverseLayout() ? -1 : 1, 1 ); //p.setPen( options()->color(ColorTitleBar, active).dark() ); - if (qGray(options()->color(ColorFont, active).rgb()) < 100) + if (tqGray(options()->color(ColorFont, active).rgb()) < 100) p.setPen( TQColor(200,200,200) ); else p.setPen( black ); @@ -1329,7 +1329,7 @@ void KeramikClient::calculateCaptionRect() cw += 16 + 4; // icon width + space cw = QMIN( cw, titlebar->geometry().width() ); - captionRect = TQStyle::visualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY), + captionRect = TQStyle::tqvisualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY), cw, clientHandler->titleBarHeight(largeCaption) ), titlebar->geometry() ); } @@ -1345,7 +1345,7 @@ void KeramikClient::captionChange() captionBufferDirty = true; - widget()->repaint( r | captionRect, false ); + widget()->tqrepaint( r | captionRect, false ); } @@ -1361,7 +1361,7 @@ void KeramikClient::iconChange() activeIcon = inactiveIcon = NULL; captionBufferDirty = true; - widget()->repaint( captionRect, false ); + widget()->tqrepaint( captionRect, false ); } } @@ -1380,10 +1380,10 @@ void KeramikClient::activeChange() captionBufferDirty = true; - widget()->repaint( false ); + widget()->tqrepaint( false ); for ( int i=0; i < NumButtons; i++ ) - if ( button[i] ) button[i]->repaint( false ); + if ( button[i] ) button[i]->tqrepaint( false ); } @@ -1400,7 +1400,7 @@ void KeramikClient::maximizeChange() captionBufferDirty = maskDirty = true; widget()->layout()->activate(); - widget()->repaint( false ); + widget()->tqrepaint( false ); } else if (( maximizeMode() & MaximizeVertical ) == 0 && !largeTitlebar ) { // We've been restored - enlarge the titlebar by 3 pixels topSpacer->changeSize( 10, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); @@ -1410,14 +1410,14 @@ void KeramikClient::maximizeChange() captionBufferDirty = maskDirty = true; widget()->layout()->activate(); - widget()->repaint( false ); + widget()->tqrepaint( false ); } } if ( button[ MaxButton ] ) { TQToolTip::remove( button[ MaxButton ] ); TQToolTip::add( button[ MaxButton ], maximizeMode() == MaximizeFull ? i18n("Restore") : i18n("Maximize") ); - button[ MaxButton ]->repaint(); + button[ MaxButton ]->tqrepaint(); } } @@ -1426,7 +1426,7 @@ void KeramikClient::desktopChange() { if ( button[ OnAllDesktopsButton ] ) { - button[ OnAllDesktopsButton ]->repaint( true ); + button[ OnAllDesktopsButton ]->tqrepaint( true ); TQToolTip::remove( button[ OnAllDesktopsButton ] ); TQToolTip::add( button[ OnAllDesktopsButton ], isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops") ); } @@ -1437,7 +1437,7 @@ void KeramikClient::shadeChange() { if ( button[ ShadeButton ] ) { - button[ ShadeButton ]->repaint( true ); + button[ ShadeButton ]->tqrepaint( true ); TQToolTip::remove( button[ ShadeButton ] ); TQToolTip::add( button[ ShadeButton ], isSetShade() ? i18n("Unshade") : i18n("Shade") ); } @@ -1447,14 +1447,14 @@ void KeramikClient::shadeChange() void KeramikClient::keepAboveChange( bool ) { if ( button[ AboveButton ] ) - button[ AboveButton ]->repaint( true ); + button[ AboveButton ]->tqrepaint( true ); } void KeramikClient::keepBelowChange( bool ) { if ( button[ BelowButton ] ) - button[ BelowButton ]->repaint( true ); + button[ BelowButton ]->tqrepaint( true ); } @@ -1482,21 +1482,21 @@ void KeramikClient::slotMaximize() void KeramikClient::slotAbove() { setKeepAbove( !keepAbove()); - button[ AboveButton ]->repaint( true ); + button[ AboveButton ]->tqrepaint( true ); } void KeramikClient::slotBelow() { setKeepBelow( !keepBelow()); - button[ BelowButton ]->repaint( true ); + button[ BelowButton ]->tqrepaint( true ); } void KeramikClient::slotShade() { setShade( !isSetShade()); - button[ ShadeButton ]->repaint( true ); + button[ ShadeButton ]->tqrepaint( true ); } @@ -1656,15 +1656,15 @@ void KeramikClient::resizeEvent( TQResizeEvent *e ) void KeramikClient::mouseDoubleClickEvent( TQMouseEvent *e ) { - if ( e->button() == LeftButton - && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton + && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).tqcontains( e->pos() ) ) titlebarDblClickOperation(); } void KeramikClient::wheelEvent( TQWheelEvent *e ) { if (isSetShade() - || TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) ) + || TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).tqcontains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } @@ -1774,37 +1774,37 @@ void KeramikClient::borders( int& left, int& right, int& top, int& bottom ) cons } -TQSize KeramikClient::minimumSize() const +TQSize KeramikClient::tqminimumSize() const { - return widget()->minimumSize(); + return widget()->tqminimumSize(); } bool KeramikClient::eventFilter( TQObject* o, TQEvent* e ) { - if ( o != widget() ) + if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()) ) return false; switch ( e->type() ) { case TQEvent::Resize: - resizeEvent( static_cast< TQResizeEvent* >( e ) ); + resizeEvent( TQT_TQRESIZEEVENT( e ) ); return true; case TQEvent::Paint: - paintEvent( static_cast< TQPaintEvent* >( e ) ); + paintEvent( TQT_TQPAINTEVENT( e ) ); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent( static_cast< TQMouseEvent* >( e ) ); + mouseDoubleClickEvent( TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::MouseButtonPress: - processMousePressEvent( static_cast< TQMouseEvent* >( e ) ); + processMousePressEvent( TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; default: diff --git a/kwin/clients/keramik/keramik.h b/kwin/clients/keramik/keramik.h index c90d3509f..e4b1df5f5 100644 --- a/kwin/clients/keramik/keramik.h +++ b/kwin/clients/keramik/keramik.h @@ -2,7 +2,7 @@ * * Keramik KWin client (version 0.8) * - * Copyright (C) 2002 Fredrik Höglund <fredrik@kde.org> + * Copyright (C) 2002 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 License as published by @@ -111,10 +111,10 @@ namespace Keramik { }; // class KeramikHandler class KeramikClient; - class KeramikButton : public QButton + class KeramikButton : public TQButton { public: - KeramikButton( KeramikClient *, const char *, Button, const TQString &, const int realizeBtns = LeftButton ); + KeramikButton( KeramikClient *, const char *, Button, const TQString &, const int realizeBtns = Qt::LeftButton ); ~KeramikButton(); ButtonState lastButton() const { return lastbutton; } @@ -148,7 +148,7 @@ namespace Keramik { virtual Position mousePosition( const TQPoint& p ) const; virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void resize( const TQSize& s ); - virtual TQSize minimumSize() const; + virtual TQSize tqminimumSize() const; virtual bool eventFilter( TQObject* o, TQEvent* e ); virtual void activeChange(); virtual void captionChange(); diff --git a/kwin/clients/kwmtheme/cli_installer/main.cpp b/kwin/clients/kwmtheme/cli_installer/main.cpp index abf2bad3d..56de8c9fe 100644 --- a/kwin/clients/kwmtheme/cli_installer/main.cpp +++ b/kwin/clients/kwmtheme/cli_installer/main.cpp @@ -73,36 +73,36 @@ int main(int argc, char **argv) input.setGroup("Window Border"); output->setGroup("General"); - tmpStr = input.readEntry("shapePixmapTop"); + tmpStr = input.readEntry("tqshapePixmapTop"); if(!tmpStr.isEmpty()){ copy(srcStr+tmpStr, localDirStr+tmpStr); } output->writeEntry("wm_top", tmpStr, true, true); - tmpStr = input.readEntry("shapePixmapBottom"); + tmpStr = input.readEntry("tqshapePixmapBottom"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottom", tmpStr, true, true); - tmpStr = input.readEntry("shapePixmapLeft"); + tmpStr = input.readEntry("tqshapePixmapLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_left", tmpStr, true, true); - tmpStr = input.readEntry("shapePixmapRight"); + tmpStr = input.readEntry("tqshapePixmapRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_right", tmpStr, true, true); - tmpStr = input.readEntry("shapePixmapTopLeft"); + tmpStr = input.readEntry("tqshapePixmapTopLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_topleft", tmpStr, true, true); - tmpStr = input.readEntry("shapePixmapTopRight"); + tmpStr = input.readEntry("tqshapePixmapTopRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_topright", tmpStr, true, true); - tmpStr = input.readEntry("shapePixmapBottomLeft"); + tmpStr = input.readEntry("tqshapePixmapBottomLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottomleft", tmpStr, true, true); - tmpStr = input.readEntry("shapePixmapBottomRight"); + tmpStr = input.readEntry("tqshapePixmapBottomRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottomright", tmpStr, true, true); diff --git a/kwin/clients/kwmtheme/kwmthemeclient.cpp b/kwin/clients/kwmtheme/kwmthemeclient.cpp index 89dc6a564..0293d47c4 100644 --- a/kwin/clients/kwmtheme/kwmthemeclient.cpp +++ b/kwin/clients/kwmtheme/kwmthemeclient.cpp @@ -231,7 +231,7 @@ void MyButton::drawButtonLabel(TQPainter *p) int offset = (isDown() && ((pixmap()->width() >= width()) || (pixmap()->height() >= height()))) ? 1 : 0; style().drawItem(p, TQRect( offset, offset, width(), height() ), - AlignCenter, colorGroup(), + AlignCenter, tqcolorGroup(), true, pixmap(), TQString::null); } } @@ -364,7 +364,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest) p.begin(&buffer); if(titleSunken){ - qDrawShadeRect(&p, r, options()->colorGroup(KDecorationOptions::ColorFrame, isActive()), + qDrawShadeRect(&p, r, options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()), true, 1, 0); r.setRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2); } @@ -384,7 +384,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest) p.drawTiledPixmap(r, *fill); } else{ - p.fillRect(r, options()->colorGroup(KDecorationOptions::ColorTitleBar, isActive()). + p.fillRect(r, options()->tqcolorGroup(KDecorationOptions::ColorTitleBar, isActive()). brush(TQColorGroup::Button)); } p.setFont(options()->font(isActive())); @@ -402,12 +402,12 @@ void KWMThemeClient::drawTitle(TQPainter &dest) void KWMThemeClient::resizeEvent( TQResizeEvent* ) { doShape(); - widget()->repaint(); + widget()->tqrepaint(); } void KWMThemeClient::captionChange() { - widget()->repaint( titlebar->geometry(), false ); + widget()->tqrepaint( titlebar->geometry(), false ); } void KWMThemeClient::paintEvent( TQPaintEvent *) @@ -557,7 +557,7 @@ void KWMThemeClient::paintEvent( TQPaintEvent *) } drawTitle(p); - TQColor c = widget()->colorGroup().background(); + TQColor c = widget()->tqcolorGroup().background(); // KWM evidently had a 1 pixel border around the client window. We // emulate it here, but should be removed at some point in order to @@ -576,10 +576,10 @@ void KWMThemeClient::paintEvent( TQPaintEvent *) void KWMThemeClient::doShape() { - TQBitmap shapemask(width(), height()); - shapemask.fill(color0); + TQBitmap tqshapemask(width(), height()); + tqshapemask.fill(color0); TQPainter p; - p.begin(&shapemask); + p.begin(&tqshapemask); p.setBrush(color1); p.setPen(color1); int x,y; @@ -740,19 +740,19 @@ void KWMThemeClient::doShape() } } p.fillRect(maxExtent-1, maxExtent-1, width()-2*maxExtent+2, height()-2*maxExtent+2, color1); - setMask(shapemask); + setMask(tqshapemask); } void KWMThemeClient::showEvent(TQShowEvent *) { doShape(); - widget()->repaint(false); + widget()->tqrepaint(false); } void KWMThemeClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if (e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) ) + if (e->button() == LeftButton && titlebar->geometry().tqcontains( e->pos() ) ) titlebarDblClickOperation(); } @@ -868,9 +868,9 @@ bool KWMThemeClient::eventFilter( TQObject* o, TQEvent* e ) } } -TQSize KWMThemeClient::minimumSize() const +TQSize KWMThemeClient::tqminimumSize() const { - return widget()->minimumSize().expandedTo( TQSize( 100, 50 )); + return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 )); } void KWMThemeClient::resize( const TQSize& s ) diff --git a/kwin/clients/kwmtheme/kwmthemeclient.h b/kwin/clients/kwmtheme/kwmthemeclient.h index 13914b2f6..e51bfe6d1 100644 --- a/kwin/clients/kwmtheme/kwmthemeclient.h +++ b/kwin/clients/kwmtheme/kwmthemeclient.h @@ -13,7 +13,7 @@ class TQGridLayout; namespace KWMTheme { -class MyButton : public QToolButton +class MyButton : public TQToolButton { public: MyButton(TQWidget *parent=0, const char *name=0) @@ -30,7 +30,7 @@ public: ~KWMThemeClient(){;} void init(); void resize( const TQSize& s ); - TQSize minimumSize() const; + TQSize tqminimumSize() const; void borders( int& left, int& right, int& top, int& bottom ) const; protected: void doShape(); diff --git a/kwin/clients/laptop/laptopclient.cpp b/kwin/clients/laptop/laptopclient.cpp index db91cf15d..db37feae6 100644 --- a/kwin/clients/laptop/laptopclient.cpp +++ b/kwin/clients/laptop/laptopclient.cpp @@ -157,7 +157,7 @@ static void create_pixmaps() KPixmapEffect::VerticalGradient); } // buttons (active/inactive, sunken/unsunken, 2 sizes each) - TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); TQColor c = g.background(); btnPix1 = new KPixmap; btnPix1->resize(btnWidth1, titleHeight); @@ -184,7 +184,7 @@ static void create_pixmaps() KPixmapEffect::DiagonalGradient); KPixmapEffect::gradient(*btnDownPix2, c.dark(130), c.light(120), KPixmapEffect::DiagonalGradient); - g = options()->colorGroup(KDecoration::ColorButtonBg, false); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); c = g.background(); KPixmapEffect::gradient(*iBtnPix1, c.light(120), c.dark(130), KPixmapEffect::DiagonalGradient); @@ -200,27 +200,27 @@ static void create_pixmaps() btnDownPix1->fill(c.rgb()); btnPix2->fill(c.rgb()); btnDownPix2->fill(c.rgb()); - g = options()->colorGroup(KDecoration::ColorButtonBg, false); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); c = g.background(); iBtnPix1->fill(c.rgb()); iBtnDownPix1->fill(c.rgb()); iBtnPix2->fill(c.rgb()); iBtnDownPix2->fill(c.rgb()); } - g = options()->colorGroup(KDecoration::ColorButtonBg, true); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); c = g.background(); drawButtonFrame(btnPix1, g, false); drawButtonFrame(btnDownPix1, g, true); drawButtonFrame(btnPix2, g, false); drawButtonFrame(btnDownPix2, g, true); - g = options()->colorGroup(KDecoration::ColorButtonBg, false); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); c = g.background(); drawButtonFrame(iBtnPix1, g, false); drawButtonFrame(iBtnDownPix1, g, true); drawButtonFrame(iBtnPix2, g, false); drawButtonFrame(iBtnDownPix2, g, true); - if(qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128) + if(tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128) btnForeground = Qt::black; else btnForeground = Qt::white; @@ -293,7 +293,7 @@ void LaptopButton::setBitmap(const unsigned char *bitmap) deco.fill(Qt::color0); } deco.setMask(deco); - repaint(); + tqrepaint(); } void LaptopButton::drawButton(TQPainter *p) @@ -314,7 +314,7 @@ void LaptopButton::drawButton(TQPainter *p) } } else{ - TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, decoration()->isActive()); + TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, decoration()->isActive()); int w = width(); int h = height(); p->fillRect(1, 1, w-2, h-2, isDown() ? g.mid() : g.button()); @@ -469,7 +469,7 @@ void LaptopClient::captionChange() void LaptopClient::paintEvent( TQPaintEvent* ) { TQPainter p(widget()); - TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive()); + TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive()); TQRect r(widget()->rect()); p.setPen(Qt::black); @@ -546,7 +546,7 @@ void LaptopClient::paintEvent( TQPaintEvent* ) p.setFont(options()->font(false, isToolWindow() )); TQFontMetrics fm(options()->font(false)); - g = options()->colorGroup(KDecoration::ColorTitleBar, false); + g = options()->tqcolorGroup(KDecoration::ColorTitleBar, false); if(iUpperGradient) p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4, r.y(), fm.width(caption())+8, r.height()-1, @@ -564,7 +564,7 @@ void LaptopClient::paintEvent( TQPaintEvent* ) p.setPen(options()->color(KDecoration::ColorFont, false)); p.drawText(r.x(), r.y(), r.width(), r.height()-1, AlignCenter, caption() ); - g = options()->colorGroup(KDecoration::ColorFrame, true); + g = options()->tqcolorGroup(KDecoration::ColorFrame, true); p.setPen(g.background()); p.drawPoint(r.x(), r.y()); p.drawPoint(r.right(), r.y()); @@ -629,7 +629,7 @@ void LaptopClient::updateActiveBuffer( ) p.setFont(options()->font(true, isToolWindow() )); TQFontMetrics fm(options()->font(true)); - TQColorGroup g = options()->colorGroup(KDecoration::ColorTitleBar, true); + TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorTitleBar, true); if(aUpperGradient) p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4, r.y(), fm.width(caption())+8, r.height()-1, @@ -647,7 +647,7 @@ void LaptopClient::updateActiveBuffer( ) p.setPen(options()->color(KDecoration::ColorFont, true)); p.drawText(r.x(), r.y(), r.width(), r.height()-1, AlignCenter, caption() ); - g = options()->colorGroup(KDecoration::ColorFrame, true); + g = options()->tqcolorGroup(KDecoration::ColorFrame, true); p.setPen(g.background()); p.drawPoint(r.x(), r.y()); p.drawPoint(r.right(), r.y()); diff --git a/kwin/clients/modernsystem/config/config.cpp b/kwin/clients/modernsystem/config/config.cpp index 8a94c1748..f5260ba7d 100644 --- a/kwin/clients/modernsystem/config/config.cpp +++ b/kwin/clients/modernsystem/config/config.cpp @@ -47,7 +47,7 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(par connect(cbShowHandle, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged())); sliderBox = new TQVBox(handleBox); - handleSizeSlider = new TQSlider(0, 4, 1, 0, TQSlider::Horizontal, sliderBox); + handleSizeSlider = new TQSlider(0, 4, 1, 0, Qt::Horizontal, sliderBox); TQWhatsThis::add(handleSizeSlider, i18n("Here you can change the size of the resize handle.")); handleSizeSlider->setTickInterval(1); @@ -59,11 +59,11 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(par bool rtl = kapp->reverseLayout(); label1 = new TQLabel(i18n("Small"), hbox); - label1->setAlignment(rtl ? AlignRight : AlignLeft); + label1->tqsetAlignment(rtl ? AlignRight : AlignLeft); label2 = new TQLabel(i18n("Medium"), hbox); - label2->setAlignment(AlignHCenter); + label2->tqsetAlignment(AlignHCenter); label3 = new TQLabel(i18n("Large"), hbox); - label3->setAlignment(rtl ? AlignLeft : AlignRight); + label3->tqsetAlignment(rtl ? AlignLeft : AlignRight); vbox->addWidget(handleBox); vbox->addStretch(1); @@ -104,7 +104,7 @@ void ModernSysConfig::load(KConfig* /*conf*/) handleSizeSlider->setEnabled(i); handleWidth = clientrc->readUnsignedNumEntry("HandleWidth", 6); handleSize = clientrc->readUnsignedNumEntry("HandleSize", 30); - handleSizeSlider->setValue(QMIN((handleWidth - 6) / 2, 4)); + handleSizeSlider->setValue(TQMIN((handleWidth - 6) / 2, 4)); } diff --git a/kwin/clients/modernsystem/config/config.h b/kwin/clients/modernsystem/config/config.h index dcf4a588f..3a04573cf 100644 --- a/kwin/clients/modernsystem/config/config.h +++ b/kwin/clients/modernsystem/config/config.h @@ -8,7 +8,7 @@ #include <tqslider.h> #include <tqlabel.h> -class ModernSysConfig : public QObject +class ModernSysConfig : public TQObject { Q_OBJECT @@ -30,16 +30,16 @@ class ModernSysConfig : public QObject private: KConfig *clientrc; - QWidget *mainw; - QVBoxLayout *vbox; + TQWidget *mainw; + TQVBoxLayout *vbox; TQWidget *handleBox; TQCheckBox *cbShowHandle; - QVBox *sliderBox; - QSlider *handleSizeSlider; - QHBox *hbox; - QLabel *label1; - QLabel *label2; - QLabel *label3; + TQVBox *sliderBox; + TQSlider *handleSizeSlider; + TQHBox *hbox; + TQLabel *label1; + TQLabel *label2; + TQLabel *label3; unsigned handleWidth; unsigned handleSize; diff --git a/kwin/clients/modernsystem/modernsys.cpp b/kwin/clients/modernsystem/modernsys.cpp index ce7545cdf..30344d75c 100644 --- a/kwin/clients/modernsystem/modernsys.cpp +++ b/kwin/clients/modernsystem/modernsys.cpp @@ -171,20 +171,20 @@ static void create_pixmaps() KPixmapEffect::VerticalGradient); } // buttons - TQColorGroup btnColor(options()->colorGroup(KDecoration::ColorButtonBg, true)); + TQColorGroup btnColor(options()->tqcolorGroup(KDecoration::ColorButtonBg, true)); buttonPix = new TQPixmap(14, 15); make_button_fx(btnColor, buttonPix); buttonPixDown = new TQPixmap(14, 15); make_button_fx(btnColor, buttonPixDown, true); - btnColor = options()->colorGroup(KDecoration::ColorButtonBg, false); + btnColor = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); iButtonPix = new TQPixmap(14, 15); make_button_fx(btnColor, iButtonPix); iButtonPixDown = new TQPixmap(14, 15); make_button_fx(btnColor, iButtonPixDown, true); - if(qGray(btnColor.background().rgb()) < 150) + if(tqGray(btnColor.background().rgb()) < 150) buttonFg = new TQColor(Qt::white); else buttonFg = new TQColor(Qt::black); @@ -515,7 +515,7 @@ void ModernSys::recalcTitleBuffer() p.drawTiledPixmap(0, 0, width(), title_height+2, *aUpperGradient); else p.fillRect(0, 0, width(), title_height+2, - options()->colorGroup(ColorTitleBar, true). + options()->tqcolorGroup(ColorTitleBar, true). brush(TQColorGroup::Button)); TQRect t = titleRect(); // titlebar->geometry(); @@ -554,7 +554,7 @@ void ModernSys::updateCaption() void ModernSys::drawRoundFrame(TQPainter &p, int x, int y, int w, int h) { kDrawRoundButton(&p, x, y, w, h, - options()->colorGroup(ColorFrame, isActive()), false); + options()->tqcolorGroup(ColorFrame, isActive()), false); } @@ -570,9 +570,9 @@ void ModernSys::paintEvent( TQPaintEvent* ) TQPainter p( widget() ); TQRect t = titleRect(); // titlebar->geometry(); - TQBrush fillBrush(widget()->colorGroup().brush(TQColorGroup::Background).pixmap() ? - widget()->colorGroup().brush(TQColorGroup::Background) : - options()->colorGroup(ColorFrame, isActive()). + TQBrush fillBrush(widget()->tqcolorGroup().tqbrush(TQColorGroup::Background).pixmap() ? + widget()->tqcolorGroup().brush(TQColorGroup::Background) : + options()->tqcolorGroup(ColorFrame, isActive()). brush(TQColorGroup::Button)); p.fillRect(1, title_height+3, width()-2, height()-(title_height+3), fillBrush); @@ -586,7 +586,7 @@ void ModernSys::paintEvent( TQPaintEvent* ) int h = height() - hw; // titlebar - TQColorGroup g = options()->colorGroup(ColorTitleBar, isActive()); + TQColorGroup g = options()->tqcolorGroup(ColorTitleBar, isActive()); if(isActive()){ p.drawPixmap(1, 1, titleBuffer, 0, 0, w-2, title_height+2); } @@ -609,7 +609,7 @@ void ModernSys::paintEvent( TQPaintEvent* ) p.drawLine(0, title_height+2, w-2, title_height+2); // frame - g = options()->colorGroup(ColorFrame, isActive()); + g = options()->tqcolorGroup(ColorFrame, isActive()); p.setPen(g.light()); p.drawLine(1, title_height+3, 1, h-2); p.setPen(g.dark()); diff --git a/kwin/clients/plastik/config/config.h b/kwin/clients/plastik/config/config.h index f288c58ea..d06bd30b8 100644 --- a/kwin/clients/plastik/config/config.h +++ b/kwin/clients/plastik/config/config.h @@ -30,7 +30,7 @@ class TQGroupBox; class KConfig; class ConfigDialog; -class PlastikConfig : public QObject +class PlastikConfig : public TQObject { Q_OBJECT public: diff --git a/kwin/clients/plastik/config/configdialog.ui b/kwin/clients/plastik/config/configdialog.ui index 642891b31..f751d8024 100644 --- a/kwin/clients/plastik/config/configdialog.ui +++ b/kwin/clients/plastik/config/configdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConfigDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConfigDialog</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>titleAlign</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>AlignLeft</cstring> </property> @@ -41,7 +41,7 @@ <string>Left</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>AlignHCenter</cstring> </property> @@ -49,7 +49,7 @@ <string>Center</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>AlignRight</cstring> </property> @@ -59,7 +59,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>coloredBorder</cstring> </property> @@ -73,7 +73,7 @@ <string>Check this option if the window border should be painted in the titlebar color. Otherwise it will be painted in the background color.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>titleShadow</cstring> </property> @@ -84,7 +84,7 @@ <string>Check this option if you want the titlebar text to have a 3D look with a shadow behind it.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>animateButtons</cstring> </property> @@ -95,7 +95,7 @@ <string>Check this option if you want the buttons to fade in when the mouse pointer hovers over them and fade out again when it moves away.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>menuClose</cstring> </property> diff --git a/kwin/clients/plastik/misc.cpp b/kwin/clients/plastik/misc.cpp index 43786fe46..1b259d383 100644 --- a/kwin/clients/plastik/misc.cpp +++ b/kwin/clients/plastik/misc.cpp @@ -61,9 +61,9 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i if(alpha<0) alpha = 0; int inv_alpha = 255 - alpha; - TQColor result = TQColor( qRgb(qRed(rgb_b)*inv_alpha/255 + qRed(rgb)*alpha/255, - qGreen(rgb_b)*inv_alpha/255 + qGreen(rgb)*alpha/255, - qBlue(rgb_b)*inv_alpha/255 + qBlue(rgb)*alpha/255) ); + TQColor result = TQColor( tqRgb(tqRed(rgb_b)*inv_alpha/255 + tqRed(rgb)*alpha/255, + tqGreen(rgb_b)*inv_alpha/255 + tqGreen(rgb)*alpha/255, + tqBlue(rgb_b)*inv_alpha/255 + tqBlue(rgb)*alpha/255) ); return result; } @@ -73,10 +73,10 @@ TQImage recolorImage(TQImage *img, TQColor color) { destImg.setAlphaBuffer(true); for (int x = 0; x < img->width(); x++) { for (int y = 0; y < img->height(); y++) { - if(img->pixel(x,y) == qRgb(0,0,255) ) { + if(img->pixel(x,y) == tqRgb(0,0,255) ) { destImg.setPixel(x,y,color.rgb() ); // set to the new color } else { - destImg.setPixel(x,y,qRgba(0,0,0,0) ); // set transparent... + destImg.setPixel(x,y,tqRgba(0,0,0,0) ); // set transparent... } } } diff --git a/kwin/clients/plastik/plastik.cpp b/kwin/clients/plastik/plastik.cpp index a6313cd1c..3f0ceab85 100644 --- a/kwin/clients/plastik/plastik.cpp +++ b/kwin/clients/plastik/plastik.cpp @@ -290,7 +290,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo } else { pm = new TQPixmap(1, titleBarTileHeight); painter.begin(pm); - painter.drawPixmap(0, 0, gradient, 0,2); + painter.tqdrawPixmap(0, 0, gradient, 0,2); if (m_coloredBorder) { painter.setPen(getColor(TitleGradient3, active).dark(110) ); } else { diff --git a/kwin/clients/plastik/plastik.h b/kwin/clients/plastik/plastik.h index 974df622b..a4c1bc5b7 100644 --- a/kwin/clients/plastik/plastik.h +++ b/kwin/clients/plastik/plastik.h @@ -93,7 +93,7 @@ public: int borderSize() { return m_borderSize; } bool animateButtons() { return m_animateButtons; } bool menuClose() { return m_menuClose; } - Qt::AlignmentFlags titleAlign() { return m_titleAlign; } + TQ_Alignment titleAlign() { return m_titleAlign; } bool reverseLayout() { return m_reverse; } TQColor getColor(KWinPlastik::ColorType type, const bool active = true); @@ -113,7 +113,7 @@ private: int m_titleHeightTool; TQFont m_titleFont; TQFont m_titleFontTool; - Qt::AlignmentFlags m_titleAlign; + TQ_Alignment m_titleAlign; // pixmap cache TQPixmap *m_pixmaps[2][2][NumPixmaps]; // button pixmaps have normal+pressed state... diff --git a/kwin/clients/plastik/plastikbutton.cpp b/kwin/clients/plastik/plastikbutton.cpp index 27a3eb127..795a384d2 100644 --- a/kwin/clients/plastik/plastikbutton.cpp +++ b/kwin/clients/plastik/plastikbutton.cpp @@ -140,7 +140,7 @@ void PlastikButton::animate() } } - repaint(false); + tqrepaint(false); } void PlastikButton::enterEvent(TQEvent *e) @@ -253,7 +253,7 @@ void PlastikButton::drawButton(TQPainter *painter) { TQPixmap menuIcon(m_client->icon().pixmap( TQIconSet::Small, TQIconSet::Normal)); if (width() < menuIcon.width() || height() < menuIcon.height() ) { - menuIcon.convertFromImage( menuIcon.convertToImage().smoothScale(width(), height())); + menuIcon.convertFromImage( TQImage(menuIcon.convertToImage()).smoothScale(width(), height())); } bP.drawPixmap((width()-menuIcon.width())/2, (height()-menuIcon.height())/2, menuIcon); } @@ -269,7 +269,7 @@ void PlastikButton::drawButton(TQPainter *painter) if(!isDown() && Handler()->titleShadow() ) { TQColor shadowColor; - if (qGray(Handler()->getColor(TitleFont,active).rgb()) < 100) + if (tqGray(Handler()->getColor(TitleFont,active).rgb()) < 100) shadowColor = TQColor(255, 255, 255); else shadowColor = TQColor(0,0,0); diff --git a/kwin/clients/plastik/plastikclient.cpp b/kwin/clients/plastik/plastikclient.cpp index 604c66641..61dfdaba7 100644 --- a/kwin/clients/plastik/plastikclient.cpp +++ b/kwin/clients/plastik/plastikclient.cpp @@ -280,7 +280,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(titleEdgeTop > 0) { tempRect.setRect(r_x+2, r_y, r_w-2*2, titleEdgeTop ); - if (tempRect.isValid() && region.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarTileTop, active, toolWindow) ); } } @@ -291,7 +291,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(titleEdgeLeft > 0) { tempRect.setRect(r_x, r_y, borderLeft, titleEdgeTop+titleHeight+titleEdgeBottom); - if (tempRect.isValid() && region.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarLeft, active, toolWindow) ); titleMarginLeft = borderLeft; } @@ -301,7 +301,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(titleEdgeRight > 0) { tempRect.setRect(borderRightLeft, r_y, borderRight, titleEdgeTop+titleHeight+titleEdgeBottom); - if (tempRect.isValid() && region.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarRight, active, toolWindow) ); titleMarginRight = borderRight; } @@ -312,7 +312,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(Rtitle.width() > 0) { m_captionRect = captionRect(); // also update m_captionRect! - if (m_captionRect.isValid() && region.contains(m_captionRect) ) + if (m_captionRect.isValid() && region.tqcontains(m_captionRect) ) { painter.drawTiledPixmap(m_captionRect, caption); } @@ -320,14 +320,14 @@ void PlastikClient::paintEvent(TQPaintEvent *e) // left to the title tempRect.setRect(r_x+titleMarginLeft, m_captionRect.top(), m_captionRect.left() - (r_x+titleMarginLeft), m_captionRect.height() ); - if (tempRect.isValid() && region.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarTile, active, toolWindow) ); } // right to the title tempRect.setRect(m_captionRect.right()+1, m_captionRect.top(), (r_x2-titleMarginRight) - m_captionRect.right(), m_captionRect.height() ); - if (tempRect.isValid() && region.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarTile, active, toolWindow) ); } @@ -337,7 +337,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(borderLeft > 0 && sideHeight > 0) { tempRect.setCoords(r_x, titleEdgeBottomBottom+1, borderLeftRight, borderBottomTop-1); - if (tempRect.isValid() && region.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderLeftTile, active, toolWindow) ); } } @@ -346,7 +346,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(borderRight > 0 && sideHeight > 0) { tempRect.setCoords(borderRightLeft, titleEdgeBottomBottom+1, r_x2, borderBottomTop-1); - if (tempRect.isValid() && region.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderRightTile, active, toolWindow) ); } } @@ -358,19 +358,19 @@ void PlastikClient::paintEvent(TQPaintEvent *e) int r = r_x2; tempRect.setRect(r_x, borderBottomTop, borderLeft, borderBottom); - if (tempRect.isValid() && region.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomLeft, active, toolWindow) ); l = tempRect.right()+1; } tempRect.setRect(borderRightLeft, borderBottomTop, borderLeft, borderBottom); - if (tempRect.isValid() && region.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomRight, active, toolWindow) ); r = tempRect.left()-1; } tempRect.setCoords(l, borderBottomTop, r, r_y2); - if (tempRect.isValid() && region.contains(tempRect) ) { + if (tempRect.isValid() && region.tqcontains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomTile, active, toolWindow) ); } } @@ -394,7 +394,7 @@ TQRect PlastikClient::captionRect() const buttonsLeftWidth() - buttonsRightWidth() - marginLeft - marginRight; - Qt::AlignmentFlags a = Handler()->titleAlign(); + TQ_Alignment a = Handler()->titleAlign(); int tX, tW; // position/width of the title buffer if (caption.width() > titleWidth) { @@ -435,7 +435,7 @@ void PlastikClient::reset( unsigned long changed ) { if (changed & SettingColors) { - // repaint the whole thing + // tqrepaint the whole thing clearCaptionPixmaps(); widget()->update(); updateButtons(); @@ -445,7 +445,7 @@ void PlastikClient::reset( unsigned long changed ) updateLayout(); - // then repaint + // then tqrepaint clearCaptionPixmaps(); widget()->update(); } @@ -496,7 +496,7 @@ const TQPixmap &PlastikClient::captionPixmap() const if(Handler()->titleShadow()) { TQColor shadowColor; - if (qGray(Handler()->getColor(TitleFont,active).rgb()) < 100) + if (tqGray(Handler()->getColor(TitleFont,active).rgb()) < 100) shadowColor = TQColor(255, 255, 255); else shadowColor = TQColor(0,0,0); diff --git a/kwin/clients/quartz/config/config.h b/kwin/clients/quartz/config/config.h index 0a952c4e9..6bd1ba384 100644 --- a/kwin/clients/quartz/config/config.h +++ b/kwin/clients/quartz/config/config.h @@ -14,7 +14,7 @@ #include <tqvbox.h> #include <kconfig.h> -class QuartzConfig: public QObject +class QuartzConfig: public TQObject { Q_OBJECT diff --git a/kwin/clients/quartz/quartz.cpp b/kwin/clients/quartz/quartz.cpp index 82caabb45..4c4a883b6 100644 --- a/kwin/clients/quartz/quartz.cpp +++ b/kwin/clients/quartz/quartz.cpp @@ -207,7 +207,7 @@ void QuartzHandler::readConfig() extraSlim = conf.readBoolEntry( "UseQuartzExtraSlim", false ); // A small hack to make the on all desktops button look nicer - onAllDesktopsButtonOnLeft = KDecoration::options()->titleButtonsLeft().contains( 'S' ); + onAllDesktopsButtonOnLeft = KDecoration::options()->titleButtonsLeft().tqcontains( 'S' ); if ( TQApplication::reverseLayout() ) onAllDesktopsButtonOnLeft = !onAllDesktopsButtonOnLeft; switch(options()->preferredBorderSize(this)) { @@ -291,18 +291,18 @@ void QuartzHandler::drawBlocks( KPixmap *pi, KPixmap &p, const TQColor &c1, cons void QuartzHandler::createPixmaps() { // Obtain titlebar blend colours, and create the block stuff on pixmaps. - TQColorGroup g2 = options()->colorGroup(ColorTitleBlend, true); + TQColorGroup g2 = options()->tqcolorGroup(ColorTitleBlend, true); TQColor c2 = g2.background(); - g2 = options()->colorGroup(ColorTitleBar, true ); + g2 = options()->tqcolorGroup(ColorTitleBar, true ); TQColor c = g2.background().light(130); titleBlocks = new KPixmap(); titleBlocks->resize( normalTitleHeight*25/18, normalTitleHeight ); drawBlocks( titleBlocks, *titleBlocks, c, c2 ); - g2 = options()->colorGroup(ColorTitleBlend, false); + g2 = options()->tqcolorGroup(ColorTitleBlend, false); c2 = g2.background(); - g2 = options()->colorGroup(ColorTitleBar, false ); + g2 = options()->tqcolorGroup(ColorTitleBar, false ); c = g2.background().light(130); ititleBlocks = new KPixmap(); @@ -313,9 +313,9 @@ void QuartzHandler::createPixmaps() TQColorGroup g; TQPainter p; - g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true ); - c = onAllDesktopsButtonOnLeft ? g.background().light(130) : g.background(); - g2 = options()->colorGroup( ColorButtonBg, true ); + g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true ); + c = onAllDesktopsButtonOnLeft ? TQColor(g.background().light(130)) : g.background(); + g2 = options()->tqcolorGroup( ColorButtonBg, true ); pinUpPix = new KPixmap(); pinUpPix->resize(16, 16); @@ -335,9 +335,9 @@ void QuartzHandler::createPixmaps() // Inactive pins - g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false ); - c = onAllDesktopsButtonOnLeft ? g.background().light(130) : g.background(); - g2 = options()->colorGroup( ColorButtonBg, false ); + g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false ); + c = onAllDesktopsButtonOnLeft ? TQColor(g.background().light(130)) : g.background(); + g2 = options()->tqcolorGroup( ColorButtonBg, false ); ipinUpPix = new KPixmap(); ipinUpPix->resize(16, 16); @@ -437,7 +437,7 @@ void QuartzButton::setBitmap(const unsigned char *bitmap) if (bitmap) { deco = new TQBitmap(10, 10, bitmap, true); deco->setMask( *deco ); - repaint( false ); + tqrepaint( false ); } } @@ -492,7 +492,7 @@ void QuartzButton::drawButton(TQPainter *p) TQPixmap tmpPix; // Smooth scale the image - tmpPix.convertFromImage( btnpix.convertToImage().smoothScale(height(), height())); + tmpPix.convertFromImage( TQImage(btnpix.convertToImage()).smoothScale(height(), height())); p->drawPixmap( 0, 0, tmpPix ); } else { Offset += (height() - 16)/2; @@ -643,8 +643,8 @@ void QuartzClient::reset( unsigned long changed ) { if (changed & SettingColors || changed & SettingFont) { - // repaint the whole thing - widget()->repaint(false); + // tqrepaint the whole thing + widget()->tqrepaint(false); } KCommonDecoration::reset(changed); @@ -675,9 +675,9 @@ void QuartzClient::paintEvent( TQPaintEvent* ) // Draw part of the frame that is the title color if( coloredFrame ) - g = options()->colorGroup(ColorTitleBar, isActive()); + g = options()->tqcolorGroup(ColorTitleBar, isActive()); else - g = options()->colorGroup(ColorFrame, isActive()); + g = options()->tqcolorGroup(ColorFrame, isActive()); // Draw outer highlights and lowlights p.setPen( g.light().light(120) ); @@ -723,7 +723,7 @@ void QuartzClient::paintEvent( TQPaintEvent* ) // Draw the title bar. // =================== int r_x, r_y, r_x2, r_y2; - widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2); + TQT_TQRECT_OBJECT(widget()->rect()).coords(&r_x, &r_y, &r_x2, &r_y2); const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); diff --git a/kwin/clients/redmond/redmond.cpp b/kwin/clients/redmond/redmond.cpp index 7f74479ed..b6161d9ce 100644 --- a/kwin/clients/redmond/redmond.cpp +++ b/kwin/clients/redmond/redmond.cpp @@ -108,7 +108,7 @@ static void drawButtonFrame( KPixmap *pix, const TQColorGroup &g, bool sunken ) p.begin(pix); // titlebar button frame - p.setPen( sunken ? g.dark().dark(155) : g.light()); + p.setPen( sunken ? TQColor(g.dark().dark(155)) : g.light()); p.drawLine(0, 0, x2-1, 0); p.drawLine(0, 0, 0, y2-1); @@ -119,11 +119,11 @@ static void drawButtonFrame( KPixmap *pix, const TQColorGroup &g, bool sunken ) p.drawLine(1, 1, 1, y2-2); } - p.setPen( sunken ? g.light() : g.mid().dark(135)); + p.setPen( sunken ? g.light() : TQColor(g.mid().dark(135))); p.drawLine(1, y2-1, x2-1, y2-1); p.drawLine(x2-1, 1, x2-1, y2-1); - p.setPen( sunken ? g.light() : g.dark().dark(155)); + p.setPen( sunken ? g.light() : TQColor(g.dark().dark(155))); p.drawLine(0, y2, x2, y2); p.drawLine(x2, 0, x2, y2); } @@ -149,7 +149,7 @@ static void create_pixmaps () defaultMenuPix = new TQPixmap(kdelogo); // buttons (active/inactive, sunken/unsunken) - TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); TQColor c = g.background(); btnPix1->resize(normalTitleHeight, normalTitleHeight-2); btnDownPix1->resize(normalTitleHeight, normalTitleHeight-2); @@ -172,7 +172,7 @@ static void create_pixmaps () KPixmapEffect::gradient(*miniBtnDownPix1, c.dark(130), c.light(130), KPixmapEffect::VerticalGradient); - g = options()->colorGroup(KDecoration::ColorButtonBg, false); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); c = g.background(); KPixmapEffect::gradient(*iBtnPix1, c.light(130), c.dark(130), KPixmapEffect::VerticalGradient); @@ -188,7 +188,7 @@ static void create_pixmaps () miniBtnPix1->fill(c.rgb()); miniBtnDownPix1->fill(c.rgb()); - g = options()->colorGroup(KDecoration::ColorButtonBg, false); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); c = g.background(); iBtnPix1->fill(c.rgb()); iBtnDownPix1->fill(c.rgb()); @@ -196,20 +196,20 @@ static void create_pixmaps () iMiniBtnDownPix1->fill(c.rgb()); } - g = options()->colorGroup(KDecoration::ColorButtonBg, true); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); drawButtonFrame(btnPix1, g, false); drawButtonFrame(btnDownPix1, g, true); drawButtonFrame(miniBtnPix1, g, false); drawButtonFrame(miniBtnDownPix1, g, true); - g = options()->colorGroup(KDecoration::ColorButtonBg, false); + g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); drawButtonFrame(iBtnPix1, g, false); drawButtonFrame(iBtnDownPix1, g, true); drawButtonFrame(iMiniBtnPix1, g, false); drawButtonFrame(iMiniBtnDownPix1, g, true); // Make sure button pixmaps contrast with the current colour scheme. - if (qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127) + if (tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127) btnForeground = new TQColor(Qt::black); else btnForeground = new TQColor(Qt::white); @@ -294,7 +294,7 @@ void RedmondButton::setPixmap( const TQPixmap &p ) deco.resize(0, 0); pix = p; - repaint(false); + tqrepaint(false); } @@ -331,7 +331,7 @@ void RedmondButton::drawButton(TQPainter *p) // Smooth scale the menu button pixmap tmpPix.convertFromImage( - pix.convertToImage().smoothScale(height(), height() )); + TQImage(pix.convertToImage()).smoothScale(height(), height() )); p->drawPixmap( 0, 0, tmpPix ); } else { @@ -485,7 +485,7 @@ void RedmondDeco::paintEvent( TQPaintEvent* ) // Draw part of the frame that is the frame color // ============================================== - TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive()); + TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive()); p.setPen( g.background() ); p.drawLine( x, y, x2-1, y ); p.drawLine( x, y, x, y2-1 ); diff --git a/kwin/clients/test/test.cpp b/kwin/clients/test/test.cpp index a04437067..02fd5b1d3 100644 --- a/kwin/clients/test/test.cpp +++ b/kwin/clients/test/test.cpp @@ -22,7 +22,7 @@ void Decoration::init() { button = new TQPushButton( widget()); button->show(); - button->setCursor( arrowCursor ); + button->setCursor( tqarrowCursor ); button->move( 0, 0 ); connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( closeWindow())); TQToolTip::add( button, "Zelva Mana" ); @@ -93,20 +93,20 @@ void Decoration::resize( const TQSize& s ) widget()->resize( s ); } -TQSize Decoration::minimumSize() const +TQSize Decoration::tqminimumSize() const { return TQSize( 100, 50 ); } bool Decoration::eventFilter( TQObject* o, TQEvent* e ) { - if( o == widget()) + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(widget())) { switch( e->type()) { case TQEvent::MouseButtonPress: { // FRAME - processMousePressEvent( static_cast< TQMouseEvent* >( e )); + processMousePressEvent( TQT_TQMOUSEEVENT( e )); return true; } case TQEvent::Show: @@ -144,7 +144,7 @@ bool Decoration::animateMinimize(bool iconify) // Go away quick. helperShowHide( false ); - qApp->syncX(); + tqApp->syncX(); TQRect r = iconGeometry(); @@ -179,7 +179,7 @@ bool Decoration::animateMinimize(bool iconify) double delta = finalAngle / steps; TQPainter p( workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); for (double angle = 0; ; angle += delta) { @@ -213,7 +213,7 @@ bool Decoration::animateMinimize(bool iconify) ungrabXServer(); -// FRAME qApp->processEvents(); // FRAME ??? +// FRAME tqApp->processEvents(); // FRAME ??? cx += xstep; cy += ystep; @@ -236,7 +236,7 @@ bool Decoration::animateMinimize(bool iconify) // Go away quick. helperShowHide( false ); - qApp->syncX(); + tqApp->syncX(); int stepCount = 12; @@ -246,7 +246,7 @@ bool Decoration::animateMinimize(bool iconify) int dy = r.height() / (stepCount * 2); TQPainter p( workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); for (int step = 0; step < stepCount; step++) { @@ -263,7 +263,7 @@ bool Decoration::animateMinimize(bool iconify) ungrabXServer(); -// FRAME qApp->processEvents(); +// FRAME tqApp->processEvents(); } } break; @@ -280,7 +280,7 @@ bool Decoration::animateMinimize(bool iconify) TQPainter p( workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); #if 0 if (iconify) @@ -298,7 +298,7 @@ bool Decoration::animateMinimize(bool iconify) p.flush(); - qApp->syncX(); + tqApp->syncX(); usleep(30000); diff --git a/kwin/clients/test/test.h b/kwin/clients/test/test.h index bfe36fa7c..e1d3d51a6 100644 --- a/kwin/clients/test/test.h +++ b/kwin/clients/test/test.h @@ -22,7 +22,7 @@ class Decoration virtual MousePosition mousePosition( const TQPoint& p ) const; virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void resize( const TQSize& s ); - virtual TQSize minimumSize() const; + virtual TQSize tqminimumSize() const; virtual void activeChange() {}; virtual void captionChange() {}; virtual void maximizeChange() {}; diff --git a/kwin/clients/web/Web.cpp b/kwin/clients/web/Web.cpp index 43d1b9f42..9b5e434da 100644 --- a/kwin/clients/web/Web.cpp +++ b/kwin/clients/web/Web.cpp @@ -120,31 +120,31 @@ KCommonDecorationButton *WebClient::createButton(ButtonType type) { switch (type) { case MenuButton: - return new WebButton(MenuButton, this, "menu", shape_); + return new WebButton(MenuButton, this, "menu", tqshape_); case OnAllDesktopsButton: - return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", shape_); + return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", tqshape_); case HelpButton: - return new WebButton(HelpButton, this, "help", shape_); + return new WebButton(HelpButton, this, "help", tqshape_); case MinButton: - return new WebButton(MinButton, this, "minimize", shape_); + return new WebButton(MinButton, this, "minimize", tqshape_); case MaxButton: - return new WebButton(MaxButton, this, "maximize", shape_); + return new WebButton(MaxButton, this, "maximize", tqshape_); case CloseButton: - return new WebButton(CloseButton, this, "close", shape_); + return new WebButton(CloseButton, this, "close", tqshape_); case AboveButton: - return new WebButton(AboveButton, this, "above", shape_); + return new WebButton(AboveButton, this, "above", tqshape_); case BelowButton: - return new WebButton(BelowButton, this, "below", shape_); + return new WebButton(BelowButton, this, "below", tqshape_); case ShadeButton: - return new WebButton(ShadeButton, this, "shade", shape_); + return new WebButton(ShadeButton, this, "shade", tqshape_); default: return 0; @@ -185,7 +185,7 @@ WebClient::init() KConfig c("kwinwebrc"); c.setGroup("General"); - shape_ = c.readBoolEntry("Shape", true); + tqshape_ = c.readBoolEntry("Shape", true); KCommonDecoration::init(); } @@ -195,8 +195,8 @@ WebClient::reset( unsigned long changed ) { if (changed & SettingColors) { - // repaint the whole thing - widget()->repaint(false); + // tqrepaint the whole thing + widget()->tqrepaint(false); } else if (changed & SettingFont) { // font has changed -- update title height // title height @@ -206,7 +206,7 @@ WebClient::reset( unsigned long changed ) if (0 != titleHeight_ % 2) titleHeight_ += 1; - widget()->repaint(false); + widget()->tqrepaint(false); } KCommonDecoration::reset(changed); @@ -216,7 +216,7 @@ WebClient::reset( unsigned long changed ) WebClient::paintEvent(TQPaintEvent * pe) { int r_x, r_y, r_x2, r_y2; - widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2); + TQT_TQRECT_OBJECT(widget()->rect()).coords(&r_x, &r_y, &r_x2, &r_y2); const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); @@ -231,7 +231,7 @@ WebClient::paintEvent(TQPaintEvent * pe) TQPainter p(widget()); p.setPen(Qt::black); - p.setBrush(options()->colorGroup(ColorFrame, isActive()).background()); + p.setBrush(options()->tqcolorGroup(ColorFrame, isActive()).background()); p.setClipRegion(pe->region() - titleRect); @@ -241,7 +241,7 @@ WebClient::paintEvent(TQPaintEvent * pe) p.fillRect(titleRect, options()->color(ColorTitleBar, isActive())); - if (shape_) + if (tqshape_) { int r(width()); int b(height()); @@ -288,7 +288,7 @@ WebClient::paintEvent(TQPaintEvent * pe) void WebClient::updateWindowShape() { - if (!shape_) + if (!tqshape_) return; TQRegion mask(0, 0, width(), height()); diff --git a/kwin/clients/web/Web.h b/kwin/clients/web/Web.h index c8a8fa2db..565fe8125 100644 --- a/kwin/clients/web/Web.h +++ b/kwin/clients/web/Web.h @@ -62,7 +62,7 @@ namespace Web int titleHeight_, borderSize_; - bool shape_; + bool tqshape_; TQBitmap _buttonBitmap(ButtonType t) const; }; diff --git a/kwin/clients/web/WebButton.cpp b/kwin/clients/web/WebButton.cpp index 61811accc..c58a7e75d 100644 --- a/kwin/clients/web/WebButton.cpp +++ b/kwin/clients/web/WebButton.cpp @@ -69,10 +69,10 @@ namespace Web { 0xff, 0x81, 0x81, 0xff, 0x81, 0xff, 0x81, 0xff }; -WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool shape) +WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape) : KCommonDecorationButton (type, parent, name), mouseOver_ (false), - shape_ (shape), + tqshape_ (tqshape), deco_ (parent) { setBackgroundMode(NoBackground); @@ -127,7 +127,7 @@ void WebButton::reset(unsigned long changed) WebButton::enterEvent(TQEvent * e) { mouseOver_ = true; - repaint(); + tqrepaint(); TQButton::enterEvent(e); } @@ -135,7 +135,7 @@ WebButton::enterEvent(TQEvent * e) WebButton::leaveEvent(TQEvent * e) { mouseOver_ = false; - repaint(); + tqrepaint(); TQButton::leaveEvent(e); } @@ -145,17 +145,17 @@ WebButton::drawButton(TQPainter *p) TQPen highlightPen; if (isDown() ) - highlightPen = TQPen(colorGroup().light()); + highlightPen = TQPen(tqcolorGroup().light()); else { if (mouseOver_) - highlightPen = TQPen(colorGroup().highlight()); + highlightPen = TQPen(tqcolorGroup().highlight()); else highlightPen = TQPen(NoPen); } - p->fillRect(rect(), colorGroup().background()); + p->fillRect(rect(), tqcolorGroup().background()); Position position_; if (0 == mapToParent(rect().topLeft() ).x() ) @@ -174,7 +174,7 @@ WebButton::drawButton(TQPainter *p) p->drawLine(0, 0, width(), 0); p->drawLine(0, 1, 0, height() - 1); - if (shape_) + if (tqshape_) { p->drawPoint(3, 1); p->drawPoint(4, 1); @@ -187,11 +187,11 @@ WebButton::drawButton(TQPainter *p) p->setBrush(NoBrush); p->setPen(highlightPen); - if (shape_) + if (tqshape_) p->setClipRegion(TQRegion(rect()) - TQRect(0, 0, 6, 6)); p->drawRect(2, 2, width() - 4, height() - 4); - if (shape_) + if (tqshape_) { p->setClipRect(rect()); p->drawPoint(4, 3); @@ -210,7 +210,7 @@ WebButton::drawButton(TQPainter *p) p->setPen(Qt::black); p->drawLine(0, 0, width(), 0); p->drawLine(width() - 1, 1, width() - 1, height() - 1); - if (shape_) + if (tqshape_) { p->drawPoint(width() - 5, 1); p->drawPoint(width() - 4, 1); @@ -223,11 +223,11 @@ WebButton::drawButton(TQPainter *p) p->setBrush(NoBrush); p->setPen(highlightPen); - if (shape_) + if (tqshape_) p->setClipRegion(TQRegion(rect()) - TQRect(width() - 6, 0, 6, 6)); p->drawRect(2, 2, width() - 4, height() - 4); - if (shape_) + if (tqshape_) { p->setClipRect(rect()); p->drawPoint(width() - 5, 3); diff --git a/kwin/clients/web/WebButton.h b/kwin/clients/web/WebButton.h index da94ea3f7..b24136868 100644 --- a/kwin/clients/web/WebButton.h +++ b/kwin/clients/web/WebButton.h @@ -41,7 +41,7 @@ namespace Web Left, Mid, Right }; - WebButton(ButtonType type, WebClient *parent, const char *name, bool shape); + WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape); virtual ~WebButton(); @@ -59,7 +59,7 @@ namespace Web bool mouseOver_; - bool shape_; + bool tqshape_; WebClient* deco_; }; } diff --git a/kwin/data/update_default_rules.cpp b/kwin/data/update_default_rules.cpp index e43323ec9..a949d6980 100644 --- a/kwin/data/update_default_rules.cpp +++ b/kwin/data/update_default_rules.cpp @@ -52,5 +52,5 @@ int main( int argc, char* argv[] ) dest_cfg.sync(); DCOPClient client; client.attach(); - client.send("kwin*", "", "reconfigure()", ""); + client.send("kwin*", "", "reconfigure()", TQString("")); } diff --git a/kwin/data/update_window_settings.cpp b/kwin/data/update_window_settings.cpp index 0a39850d7..4c2414568 100644 --- a/kwin/data/update_window_settings.cpp +++ b/kwin/data/update_window_settings.cpp @@ -164,5 +164,5 @@ int main() dest_cfg.sync(); DCOPClient client; client.attach(); - client.send("kwin*", "", "reconfigure()", ""); + client.send("kwin*", "", "reconfigure()", TQString("")); } diff --git a/kwin/events.cpp b/kwin/events.cpp index a30e915e1..74563d3fb 100644 --- a/kwin/events.cpp +++ b/kwin/events.cpp @@ -384,7 +384,7 @@ bool Workspace::workspaceEvent( XEvent * e ) { if ( TQWhatsThis::inWhatsThisMode() ) { - TQWidget* w = TQWidget::find( e->xcrossing.window ); + TQWidget* w = TQWidget::tqfind( e->xcrossing.window ); if ( w ) TQWhatsThis::leaveWhatsThisMode(); } @@ -625,9 +625,9 @@ bool Client::windowEvent( XEvent* e ) default: if( e->xany.window == window()) { - if( e->type == Shape::shapeEvent() ) + if( e->type == Shape::tqshapeEvent() ) { - is_shape = Shape::hasShape( window()); // workaround for #19644 + is_tqshape = Shape::hasShape( window()); // workaround for #19644 updateShape(); } } @@ -923,9 +923,9 @@ void Client::leaveNotifyEvent( XCrossingEvent* e ) if ( !buttonDown ) { mode = PositionCenter; - setCursor( arrowCursor ); + setCursor( tqarrowCursor ); } - bool lostMouse = !rect().contains( TQPoint( e->x, e->y ) ); + bool lostMouse = !rect().tqcontains( TQPoint( e->x, e->y ) ); // 'lostMouse' wouldn't work with e.g. B2 or Keramik, which have non-rectangular decorations // (i.e. the LeaveNotify event comes before leaving the rect and no LeaveNotify event // comes after leaving the rect) - so lets check if the pointer is really outside the window @@ -1043,7 +1043,7 @@ void Client::updateMouseGrab() } } -int qtToX11Button( Qt::ButtonState button ) +int qtToX11Button( TQt::ButtonState button ) { if( button == Qt::LeftButton ) return Button1; @@ -1054,7 +1054,7 @@ int qtToX11Button( Qt::ButtonState button ) return AnyButton; } -int qtToX11State( Qt::ButtonState state ) +int qtToX11State( TQt::ButtonState state ) { int ret = 0; if( state & Qt::LeftButton ) @@ -1063,13 +1063,13 @@ int qtToX11State( Qt::ButtonState state ) ret |= Button2Mask; if( state & Qt::RightButton ) ret |= Button3Mask; - if( state & Qt::ShiftButton ) + if( state & TQt::ShiftButton ) ret |= ShiftMask; - if( state & Qt::ControlButton ) + if( state & TQt::ControlButton ) ret |= ControlMask; - if( state & Qt::AltButton ) + if( state & TQt::AltButton ) ret |= KKeyNative::modX(KKey::ALT); - if( state & Qt::MetaButton ) + if( state & TQt::MetaButton ) ret |= KKeyNative::modX(KKey::WIN); return ret; } @@ -1078,7 +1078,7 @@ int qtToX11State( Qt::ButtonState state ) // for the decoration window cannot be (easily) intercepted as X11 events bool Client::eventFilter( TQObject* o, TQEvent* e ) { - if (o == shadowWidget) + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(shadowWidget)) { if (e->type() == TQEvent::MouseButtonRelease) { @@ -1290,29 +1290,29 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) } } if( decoration == NULL - || o != decoration->widget()) + || TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(decoration->widget())) return false; if( e->type() == TQEvent::MouseButtonPress ) { - TQMouseEvent* ev = static_cast< TQMouseEvent* >( e ); + TQMouseEvent* ev = TQT_TQMOUSEEVENT( e ); return buttonPressEvent( decorationId(), qtToX11Button( ev->button()), qtToX11State( ev->state()), ev->x(), ev->y(), ev->globalX(), ev->globalY() ); } if( e->type() == TQEvent::MouseButtonRelease ) { - TQMouseEvent* ev = static_cast< TQMouseEvent* >( e ); + TQMouseEvent* ev = TQT_TQMOUSEEVENT( e ); return buttonReleaseEvent( decorationId(), qtToX11Button( ev->button()), qtToX11State( ev->state()), ev->x(), ev->y(), ev->globalX(), ev->globalY() ); } if( e->type() == TQEvent::MouseMove ) // FRAME i fake z enter/leave? { - TQMouseEvent* ev = static_cast< TQMouseEvent* >( e ); + TQMouseEvent* ev = TQT_TQMOUSEEVENT( e ); return motionNotifyEvent( decorationId(), qtToX11State( ev->state()), ev->x(), ev->y(), ev->globalX(), ev->globalY() ); } if( e->type() == TQEvent::Wheel ) { - TQWheelEvent* ev = static_cast< TQWheelEvent* >( e ); + TQWheelEvent* ev = TQT_TQWHEELEVENT( e ); bool r = buttonPressEvent( decorationId(), ev->delta() > 0 ? Button4 : Button5, qtToX11State( ev->state()), ev->x(), ev->y(), ev->globalX(), ev->globalY() ); r = r || buttonReleaseEvent( decorationId(), ev->delta() > 0 ? Button4 : Button5, qtToX11State( ev->state()), @@ -1321,7 +1321,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) } if( e->type() == TQEvent::Resize ) { - TQResizeEvent* ev = static_cast< TQResizeEvent* >( e ); + TQResizeEvent* ev = TQT_TQRESIZEEVENT( e ); // Filter out resize events that inform about size different than frame size. // This will ensure that decoration->width() etc. and decoration->widget()->width() will be in sync. // These events only seem to be delayed events from initial resizing before show() was called @@ -1479,13 +1479,13 @@ void Client::processMousePressEvent( TQMouseEvent* e ) int button; switch( e->button()) { - case LeftButton: + case Qt::LeftButton: button = Button1; break; - case MidButton: + case Qt::MidButton: button = Button2; break; - case RightButton: + case Qt::RightButton: button = Button3; break; default: diff --git a/kwin/geometry.cpp b/kwin/geometry.cpp index 3fd278360..e69b630a2 100644 --- a/kwin/geometry.cpp +++ b/kwin/geometry.cpp @@ -87,7 +87,7 @@ void Workspace::updateClientArea( bool force ) TQDesktopWidget *desktopwidget = KApplication::desktop(); int nscreens = desktopwidget -> numScreens (); // kdDebug () << "screens: " << nscreens << endl; - TQRect* new_wareas = new QRect[ numberOfDesktops() + 1 ]; + TQRect* new_wareas = new TQRect[ numberOfDesktops() + 1 ]; TQRect** new_sareas = new TQRect*[ numberOfDesktops() + 1]; TQRect* screens = new TQRect [ nscreens ]; TQRect desktopArea = desktopwidget -> geometry (); @@ -728,7 +728,7 @@ void Client::keepInArea( TQRect area, bool partial ) move( area.right() - width(), y() ); if ( geometry().bottom() > area.bottom() && height() < area.height() ) move( x(), area.bottom() - height() ); - if( !area.contains( geometry().topLeft() )) + if( !area.tqcontains( geometry().topLeft() )) { int tx = x(); int ty = y(); @@ -1122,7 +1122,7 @@ TQSize Client::sizeForClientSize( const TQSize& wsize, Sizemode mode, bool nofra TQSize max_size = maxSize(); if( decoration != NULL ) { - TQSize decominsize = decoration->minimumSize(); + TQSize decominsize = decoration->tqminimumSize(); TQSize border_size( border_left + border_right, border_top + border_bottom ); if( border_size.width() > decominsize.width()) // just in case decominsize.setWidth( border_size.width()); @@ -1348,10 +1348,10 @@ void Client::getWmNormalHints() // try to keep the window in its xinerama screen if possible, // if that fails at least keep it visible somewhere TQRect area = workspace()->clientArea( MovementArea, this ); - if( area.contains( orig_geometry )) + if( area.tqcontains( orig_geometry )) keepInArea( area ); area = workspace()->clientArea( WorkArea, this ); - if( area.contains( orig_geometry )) + if( area.tqcontains( orig_geometry )) keepInArea( area ); } } @@ -1502,7 +1502,7 @@ void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, i updateFullScreenHack( TQRect( new_pos, TQSize( nw, nh ))); TQRect area = workspace()->clientArea( WorkArea, this ); if( !from_tool && ( !isSpecialWindow() || isToolbar()) && !isFullScreen() - && area.contains( orig_geometry )) + && area.tqcontains( orig_geometry )) keepInArea( area ); // this is part of the kicker-xinerama-hack... it should be @@ -1539,10 +1539,10 @@ void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, i // try to keep the window in its xinerama screen if possible, // if that fails at least keep it visible somewhere TQRect area = workspace()->clientArea( MovementArea, this ); - if( area.contains( orig_geometry )) + if( area.tqcontains( orig_geometry )) keepInArea( area ); area = workspace()->clientArea( WorkArea, this ); - if( area.contains( orig_geometry )) + if( area.tqcontains( orig_geometry )) keepInArea( area ); } } @@ -2248,7 +2248,7 @@ void Client::doDrawbound( const TQRect& geom, bool clear ) return; // done by decoration TQPainter p ( workspace()->desktopWidget() ); p.setPen( TQPen( Qt::white, 5 ) ); - p.setRasterOp( Qt::XorROP ); + p.setRasterOp( TQt::XorROP ); // the line is 5 pixel thick, so compensate for the extra two pixels // on outside (#88657) TQRect g = geom; @@ -2296,7 +2296,7 @@ class EatAllPaintEvents { protected: virtual bool eventFilter( TQObject* o, TQEvent* e ) - { return e->type() == TQEvent::Paint && o != geometryTip; } + { return e->type() == TQEvent::Paint && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(geometryTip); } }; static EatAllPaintEvents* eater = 0; @@ -2637,7 +2637,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root ) ( isResize() ? options->resizeMode : options->moveMode ) == Options::Transparent ) { clearbound(); // it's necessary to move the geometry tip when there's no outline - positionGeometryTip(); // shown, otherwise it would cause repaint problems in case + positionGeometryTip(); // shown, otherwise it would cause tqrepaint problems in case drawbound( moveResizeGeom ); // they overlap; the paint event will come after this, } // so the geometry tip will be painted above the outline } diff --git a/kwin/geometrytip.cpp b/kwin/geometrytip.cpp index 8577abfbc..e0d1b865c 100644 --- a/kwin/geometrytip.cpp +++ b/kwin/geometrytip.cpp @@ -20,8 +20,8 @@ GeometryTip::GeometryTip( const XSizeHints* xSizeHints, bool save_under ): setIndent(0); setLineWidth(1); setFrameStyle( TQFrame::Raised | TQFrame::StyledPanel ); - setAlignment( AlignCenter | AlignTop ); - sizeHints = xSizeHints; + tqsetAlignment( AlignCenter | AlignTop ); + tqsizeHints = xSizeHints; if( save_under ) { XSetWindowAttributes attr; @@ -39,12 +39,12 @@ void GeometryTip::setGeometry( const TQRect& geom ) int w = geom.width(); int h = geom.height(); - if (sizeHints) + if (tqsizeHints) { - if (sizeHints->flags & PResizeInc) + if (tqsizeHints->flags & PResizeInc) { - w = ( w - sizeHints->base_width ) / sizeHints->width_inc; - h = ( h - sizeHints->base_height ) / sizeHints->height_inc; + w = ( w - tqsizeHints->base_width ) / tqsizeHints->width_inc; + h = ( h - tqsizeHints->base_height ) / tqsizeHints->height_inc; } } diff --git a/kwin/geometrytip.h b/kwin/geometrytip.h index 6dac49f2f..8e8dc531a 100644 --- a/kwin/geometrytip.h +++ b/kwin/geometrytip.h @@ -17,7 +17,7 @@ License. See the file "COPYING" for the exact licensing terms. namespace KWinInternal { -class GeometryTip: public QLabel +class GeometryTip: public TQLabel { Q_OBJECT public: @@ -26,7 +26,7 @@ class GeometryTip: public QLabel void setGeometry( const TQRect& geom ); private: - const XSizeHints* sizeHints; + const XSizeHints* tqsizeHints; }; } // namespace diff --git a/kwin/group.cpp b/kwin/group.cpp index 0d543dc4a..e4fd46e2a 100644 --- a/kwin/group.cpp +++ b/kwin/group.cpp @@ -64,7 +64,7 @@ bool performTransiencyCheck() kdDebug() << "TC: " << *it1 << " in not in a group" << endl; ret = false; } - else if( !(*it1)->in_group->members().contains( *it1 )) + else if( !(*it1)->in_group->members().tqcontains( *it1 )) { kdDebug() << "TC: " << *it1 << " has a group " << (*it1)->in_group << " but group does not contain it" << endl; ret = false; @@ -85,15 +85,15 @@ bool performTransiencyCheck() ++it2 ) { if( transiencyCheckNonExistent - && !Workspace::self()->clients.contains( *it2 ) - && !Workspace::self()->desktops.contains( *it2 )) + && !Workspace::self()->clients.tqcontains( *it2 ) + && !Workspace::self()->desktops.tqcontains( *it2 )) { kdDebug() << "TC:" << *it1 << " has non-existent main client " << endl; kdDebug() << "TC2:" << *it2 << endl; // this may crash ret = false; continue; } - if( !(*it2)->transients_list.contains( *it1 )) + if( !(*it2)->transients_list.tqcontains( *it1 )) { kdDebug() << "TC:" << *it1 << " has main client " << *it2 << " but main client does not have it as a transient" << endl; ret = false; @@ -106,15 +106,15 @@ bool performTransiencyCheck() ++it2 ) { if( transiencyCheckNonExistent - && !Workspace::self()->clients.contains( *it2 ) - && !Workspace::self()->desktops.contains( *it2 )) + && !Workspace::self()->clients.tqcontains( *it2 ) + && !Workspace::self()->desktops.tqcontains( *it2 )) { kdDebug() << "TC:" << *it1 << " has non-existent transient " << endl; kdDebug() << "TC2:" << *it2 << endl; // this may crash ret = false; continue; } - if( !(*it2)->mainClients().contains( *it1 )) + if( !(*it2)->mainClients().tqcontains( *it1 )) { kdDebug() << "TC:" << *it1 << " has transient " << *it2 << " but transient does not have it as a main client" << endl; ret = false; @@ -259,7 +259,7 @@ void Group::removeMember( Client* member_P ) TRANSIENCY_CHECK( member_P ); // kdDebug() << "GROUPREMOVE:" << this << ":" << member_P << endl; // kdDebug() << kdBacktrace() << endl; - Q_ASSERT( _members.contains( member_P )); + Q_ASSERT( _members.tqcontains( member_P )); _members.remove( member_P ); // there are cases when automatic deleting of groups must be delayed, // e.g. when removing a member and doing some operation on the possibly @@ -294,7 +294,7 @@ void Group::gotLeader( Client* leader_P ) void Group::lostLeader() { - assert( !_members.contains( leader_client )); + assert( !_members.tqcontains( leader_client )); leader_client = NULL; if( _members.isEmpty()) { @@ -430,8 +430,8 @@ void Workspace::checkTransients( Window w ) bool Client::resourceMatch( const Client* c1, const Client* c2 ) { // xv has "xv" as resource name, and different strings starting with "XV" as resource class - if( qstrncmp( c1->resourceClass(), "xv", 2 ) == 0 && c1->resourceName() == "xv" ) - return qstrncmp( c2->resourceClass(), "xv", 2 ) == 0 && c2->resourceName() == "xv"; + if( tqstrncmp( c1->resourceClass(), "xv", 2 ) == 0 && c1->resourceName() == "xv" ) + return tqstrncmp( c2->resourceClass(), "xv", 2 ) == 0 && c2->resourceName() == "xv"; // Mozilla has "Mozilla" as resource name, and different strings as resource class if( c1->resourceName() == "mozilla" ) return c2->resourceName() == "mozilla"; @@ -512,8 +512,8 @@ bool Client::sameAppWindowRoleMatch( const Client* c1, const Client* c2, bool ac || c1->group()->leaderClient() == c1 || c2->group()->leaderClient() == c2; #endif } - int pos1 = c1->windowRole().find( '#' ); - int pos2 = c2->windowRole().find( '#' ); + int pos1 = c1->windowRole().tqfind( '#' ); + int pos2 = c2->windowRole().tqfind( '#' ); if(( pos1 >= 0 && pos2 >= 0 ) || // hacks here @@ -835,7 +835,7 @@ Window Client::verifyTransientFor( Window new_transient_for, bool defined ) void Client::addTransient( Client* cl ) { TRANSIENCY_CHECK( this ); - assert( !transients_list.contains( cl )); + assert( !transients_list.tqcontains( cl )); // assert( !cl->hasTransient( this, true )); will be fixed in checkGroupTransients() assert( cl != this ); transients_list.append( cl ); @@ -893,7 +893,7 @@ bool Client::hasTransientInternal( const Client* cl, bool indirect, ConstClientL return true; if( !indirect ) return false; - if( set.contains( cl )) + if( set.tqcontains( cl )) return false; set.append( cl ); return hasTransientInternal( cl->transientFor(), indirect, set ); @@ -903,11 +903,11 @@ bool Client::hasTransientInternal( const Client* cl, bool indirect, ConstClientL if( group() != cl->group()) return false; // cl is group transient, search from top - if( transients().contains( const_cast< Client* >( cl ))) + if( transients().tqcontains( const_cast< Client* >( cl ))) return true; if( !indirect ) return false; - if( set.contains( this )) + if( set.tqcontains( this )) return false; set.append( this ); for( ClientList::ConstIterator it = transients().begin(); diff --git a/kwin/kcmkwin/kwindecoration/buttons.cpp b/kwin/kcmkwin/kwindecoration/buttons.cpp index 5d1d96d85..67f197fd9 100644 --- a/kwin/kcmkwin/kwindecoration/buttons.cpp +++ b/kwin/kcmkwin/kwindecoration/buttons.cpp @@ -54,7 +54,7 @@ ButtonDrag::ButtonDrag( Button btn, TQWidget* parent, const char* name) TQDataStream stream(data, IO_WriteOnly); stream << btn.name; stream << btn.icon; - stream << btn.type.unicode(); + stream << btn.type.tqunicode(); stream << (int) btn.duplicate; stream << (int) btn.supported; setEncodedData( data ); @@ -123,7 +123,7 @@ TQPixmap bitmapPixmap(const TQBitmap& bm, const TQColor& color) ButtonSource::ButtonSource(TQWidget *parent, const char* name) : KListView(parent, name) { - setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); setResizeMode(TQListView::AllColumns); setDragEnabled(true); @@ -140,19 +140,19 @@ ButtonSource::~ButtonSource() { } -TQSize ButtonSource::sizeHint() const +TQSize ButtonSource::tqsizeHint() const { - // make the sizeHint height a bit smaller than the one of TQListView... + // make the tqsizeHint height a bit smaller than the one of TQListView... if ( cachedSizeHint().isValid() ) return cachedSizeHint(); constPolish(); - TQSize s( header()->sizeHint() ); + TQSize s( header()->tqsizeHint() ); if ( verticalScrollBar()->isVisible() ) - s.setWidth( s.width() + style().pixelMetric(TQStyle::PM_ScrollBarExtent) ); + s.setWidth( s.width() + tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) ); s += TQSize(frameWidth()*2,frameWidth()*2); // size hint: 4 lines of text... @@ -218,7 +218,7 @@ TQDragObject *ButtonSource::dragObject() if (i) { ButtonDrag *bd = new ButtonDrag(i->button(), viewport(), "button_drag"); - bd->setPixmap(bitmapPixmap(i->button().icon, colorGroup().foreground() )); + bd->setPixmap(bitmapPixmap(i->button().icon, tqcolorGroup().foreground() )); return bd; } @@ -306,15 +306,15 @@ void ButtonDropSite::clearRight() void ButtonDropSite::dragMoveEvent( TQDragMoveEvent* e ) { TQPoint p = e->pos(); - if (leftDropArea().contains(p) || rightDropArea().contains(p) || buttonAt(p) ) { + if (leftDropArea().tqcontains(p) || rightDropArea().tqcontains(p) || buttonAt(p) ) { e->accept(); // 2 pixel wide drop visualizer... TQRect r = contentsRect(); int x = -1; - if (leftDropArea().contains(p) ) { + if (leftDropArea().tqcontains(p) ) { x = leftDropArea().left(); - } else if (rightDropArea().contains(p) ) { + } else if (rightDropArea().tqcontains(p) ) { x = rightDropArea().right()+1; } else { ButtonDropSiteItem *item = buttonAt(p); @@ -373,10 +373,10 @@ void ButtonDropSite::dropEvent( TQDropEvent* e ) ButtonList *buttonList = 0; ButtonList::iterator buttonPosition; - if (leftDropArea().contains(p) ) { + if (leftDropArea().tqcontains(p) ) { buttonList = &buttonsLeft; buttonPosition = buttonsLeft.end(); - } else if (rightDropArea().contains(p) ) { + } else if (rightDropArea().tqcontains(p) ) { buttonList = &buttonsRight; buttonPosition = buttonsRight.begin(); } else { @@ -446,9 +446,9 @@ bool ButtonDropSite::getItemIterator(ButtonDropSiteItem *item, ButtonList* &list if (!item) return false; - ButtonList::iterator it = buttonsLeft.find(item); // try the left list first... + ButtonList::iterator it = buttonsLeft.tqfind(item); // try the left list first... if (it == buttonsLeft.end() ) { - it = buttonsRight.find(item); // try the right list... + it = buttonsRight.tqfind(item); // try the right list... if (it == buttonsRight.end() ) { return false; // item hasn't been found in one of the list, return... } else { @@ -487,7 +487,7 @@ void ButtonDropSite::mousePressEvent( TQMouseEvent* e ) m_selected = buttonAt(e->pos() ); if (m_selected) { ButtonDrag *bd = new ButtonDrag(m_selected->button(), this); - bd->setPixmap(bitmapPixmap(m_selected->button().icon, colorGroup().foreground() ) ); + bd->setPixmap(bitmapPixmap(m_selected->button().icon, tqcolorGroup().foreground() ) ); bd->dragMove(); } } @@ -521,14 +521,14 @@ void ButtonDropSite::recalcItemGeometry() ButtonDropSiteItem *ButtonDropSite::buttonAt(TQPoint p) { // try to find the item in the left button list for (ButtonList::const_iterator it = buttonsLeft.begin(); it != buttonsLeft.end(); ++it) { - if ( (*it)->rect.contains(p) ) { + if ( (*it)->rect.tqcontains(p) ) { return *it; } } // try to find the item in the right button list for (ButtonList::const_iterator it = buttonsRight.begin(); it != buttonsRight.end(); ++it) { - if ( (*it)->rect.contains(p) ) { + if ( (*it)->rect.tqcontains(p) ) { return *it; } } @@ -572,7 +572,7 @@ bool ButtonDropSite::removeSelectedButton() delete m_selected; m_selected = 0; recalcItemGeometry(); - update(); // repaint... + update(); // tqrepaint... } return succ; @@ -581,9 +581,9 @@ bool ButtonDropSite::removeSelectedButton() void ButtonDropSite::drawButtonList(TQPainter *p, const ButtonList& btns, int offset) { for (ButtonList::const_iterator it = btns.begin(); it != btns.end(); ++it) { - TQRect itemRect = (*it)->rect; - if (itemRect.isValid() ) { - (*it)->draw(p, colorGroup(), itemRect); + TQRect tqitemRect = (*it)->rect; + if (tqitemRect.isValid() ) { + (*it)->draw(p, tqcolorGroup(), tqitemRect); } offset += (*it)->width(); } @@ -675,11 +675,11 @@ ButtonPositionWidget::ButtonPositionWidget(TQWidget *parent, const char* name) m_factory(0) { TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); - setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); + tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); TQLabel* label = new TQLabel( this ); m_dropSite = new ButtonDropSite( this ); - label->setAlignment( int( TQLabel::WordBreak ) ); + label->tqsetAlignment( int( TQLabel::WordBreak ) ); label->setText( i18n( "To add or remove titlebar buttons, simply <i>drag</i> items " "between the available item list and the titlebar preview. Similarly, " "drag items within the titlebar preview to re-position them.") ); @@ -761,7 +761,7 @@ void ButtonPositionWidget::setDecorationFactory(KDecorationFactory *factory) ButtonSourceItem *i = dynamic_cast<ButtonSourceItem*>(it.current() ); if (i) { Button b = i->button(); - b.supported = m_supportedButtons.contains(b.type); + b.supported = m_supportedButtons.tqcontains(b.type); i->setButton(b); } ++it; @@ -777,47 +777,47 @@ Button ButtonPositionWidget::getButton(TQChar type, bool& success) { if (type == 'R') { TQBitmap bmp(resize_width, resize_height, resize_bits, true); bmp.setMask(bmp); - return Button(i18n("Resize"), bmp, 'R', false, m_supportedButtons.contains('R') ); + return Button(i18n("Resize"), bmp, 'R', false, m_supportedButtons.tqcontains('R') ); } else if (type == 'L') { TQBitmap bmp(shade_width, shade_height, shade_bits, true); bmp.setMask(bmp); - return Button(i18n("Shade"), bmp, 'L', false, m_supportedButtons.contains('L') ); + return Button(i18n("Shade"), bmp, 'L', false, m_supportedButtons.tqcontains('L') ); } else if (type == 'B') { TQBitmap bmp(keepbelowothers_width, keepbelowothers_height, keepbelowothers_bits, true); bmp.setMask(bmp); - return Button(i18n("Keep Below Others"), bmp, 'B', false, m_supportedButtons.contains('B') ); + return Button(i18n("Keep Below Others"), bmp, 'B', false, m_supportedButtons.tqcontains('B') ); } else if (type == 'F') { TQBitmap bmp(keepaboveothers_width, keepaboveothers_height, keepaboveothers_bits, true); bmp.setMask(bmp); - return Button(i18n("Keep Above Others"), bmp, 'F', false, m_supportedButtons.contains('F') ); + return Button(i18n("Keep Above Others"), bmp, 'F', false, m_supportedButtons.tqcontains('F') ); } else if (type == 'X') { TQBitmap bmp(close_width, close_height, close_bits, true); bmp.setMask(bmp); - return Button(i18n("Close"), bmp, 'X', false, m_supportedButtons.contains('X') ); + return Button(i18n("Close"), bmp, 'X', false, m_supportedButtons.tqcontains('X') ); } else if (type == 'A') { TQBitmap bmp(maximize_width, maximize_height, maximize_bits, true); bmp.setMask(bmp); - return Button(i18n("Maximize"), bmp, 'A', false, m_supportedButtons.contains('A') ); + return Button(i18n("Maximize"), bmp, 'A', false, m_supportedButtons.tqcontains('A') ); } else if (type == 'I') { TQBitmap bmp(minimize_width, minimize_height, minimize_bits, true); bmp.setMask(bmp); - return Button(i18n("Minimize"), bmp, 'I', false, m_supportedButtons.contains('I') ); + return Button(i18n("Minimize"), bmp, 'I', false, m_supportedButtons.tqcontains('I') ); } else if (type == 'H') { TQBitmap bmp(help_width, help_height, help_bits, true); bmp.setMask(bmp); - return Button(i18n("Help"), bmp, 'H', false, m_supportedButtons.contains('H') ); + return Button(i18n("Help"), bmp, 'H', false, m_supportedButtons.tqcontains('H') ); } else if (type == 'S') { TQBitmap bmp(onalldesktops_width, onalldesktops_height, onalldesktops_bits, true); bmp.setMask(bmp); - return Button(i18n("On All Desktops"), bmp, 'S', false, m_supportedButtons.contains('S') ); + return Button(i18n("On All Desktops"), bmp, 'S', false, m_supportedButtons.tqcontains('S') ); } else if (type == 'M') { TQBitmap bmp(menu_width, menu_height, menu_bits, true); bmp.setMask(bmp); - return Button(i18n("Menu"), bmp, 'M', false, m_supportedButtons.contains('M') ); + return Button(i18n("Menu"), bmp, 'M', false, m_supportedButtons.tqcontains('M') ); } else if (type == '_') { TQBitmap bmp(spacer_width, spacer_height, spacer_bits, true); bmp.setMask(bmp); - return Button(i18n("--- spacer ---"), bmp, '_', true, m_supportedButtons.contains('_') ); + return Button(i18n("--- spacer ---"), bmp, '_', true, m_supportedButtons.tqcontains('_') ); } else { success = false; return Button(); diff --git a/kwin/kcmkwin/kwindecoration/buttons.h b/kwin/kcmkwin/kwindecoration/buttons.h index 0fcbff085..909adfe87 100644 --- a/kwin/kcmkwin/kwindecoration/buttons.h +++ b/kwin/kcmkwin/kwindecoration/buttons.h @@ -57,7 +57,7 @@ class Button bool supported; }; -class ButtonDrag : public QStoredDrag +class ButtonDrag : public TQStoredDrag { public: ButtonDrag( Button btn, TQWidget* parent, const char* name=0 ); @@ -91,7 +91,7 @@ class ButtonDropSiteItem /** * This is plugged into ButtonSource */ -class ButtonSourceItem : public QListViewItem +class ButtonSourceItem : public TQListViewItem { public: ButtonSourceItem(TQListView * parent, const Button& btn); @@ -117,7 +117,7 @@ class ButtonSource : public KListView ButtonSource(TQWidget *parent = 0, const char* name = 0); virtual ~ButtonSource(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void hideAllButtons(); void showAllButtons(); @@ -136,7 +136,7 @@ typedef TQValueList<ButtonDropSiteItem*> ButtonList; /** * This class renders and handles the demo titlebar dropsite */ -class ButtonDropSite: public QFrame +class ButtonDropSite: public TQFrame { Q_OBJECT @@ -189,7 +189,7 @@ class ButtonDropSite: public QFrame ButtonDropSiteItem *m_selected; }; -class ButtonPositionWidget : public QWidget +class ButtonPositionWidget : public TQWidget { Q_OBJECT diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp index 193450086..65c951893 100644 --- a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp @@ -97,7 +97,7 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c pluginLayout->addWidget(decorationList); TQGroupBox *pluginSettingsGrp = new TQGroupBox( i18n("Decoration Options"), pluginPage ); - pluginSettingsGrp->setColumnLayout( 0, Vertical ); + pluginSettingsGrp->setColumnLayout( 0, Qt::Vertical ); pluginSettingsGrp->setFlat( true ); pluginSettingsGrp->layout()->setMargin( 0 ); pluginSettingsGrp->layout()->setSpacing( KDialog::spacingHint() ); @@ -112,13 +112,13 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c TQWhatsThis::add( cBorder, i18n( "Use this combobox to change the border size of the decoration." )); lBorder->hide(); cBorder->hide(); - TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->layout() ); + TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->tqlayout() ); borderSizeLayout->addWidget(lBorder); borderSizeLayout->addWidget(cBorder); borderSizeLayout->addStretch(); pluginConfigWidget = new TQVBox(pluginSettingsGrp); - pluginSettingsGrp->layout()->add( pluginConfigWidget ); + pluginSettingsGrp->tqlayout()->add( pluginConfigWidget ); // Page 2 (Button Selector) TQWidget* buttonPage = new TQWidget( tabWidget ); @@ -154,8 +154,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c preview = new KDecorationPreview( this ); previewLayout->addWidget(preview); - preview->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); - tabWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); + preview->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + tabWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); // Page 3 (Window Shadows) TQHBox *inactiveShadowColourHBox, *shadowColourHBox; @@ -374,7 +374,7 @@ void KWinDecorationModule::findDecorations() { TQDir d(*it); if (d.exists()) - for (QFileInfoListIterator it(*d.entryInfoList()); it.current(); ++it) + for (TQFileInfoListIterator it(*d.entryInfoList()); it.current(); ++it) { TQString filename(it.current()->absFilePath()); if (KDesktopFile::isDesktopFile(filename)) @@ -640,7 +640,7 @@ void KWinDecorationModule::readConfig( KConfig* conf ) activeShadowSettings->setEnabled(shadowEnabled); inactiveShadowSettings->setEnabled(shadowEnabled); whichShadowSettings->setEnabled(shadowEnabled); - shadowColourButton->setColor(conf->readColorEntry("ShadowColour", &Qt::black)); + shadowColourButton->setColor(conf->readColorEntry("ShadowColour", &TQt::black)); shadowOpacitySlider->setValue((int)ceil(conf->readDoubleNumEntry("ShadowOpacity", 0.70) * 100)); shadowXOffsetSpinBox->setValue(conf->readNumEntry("ShadowXOffset", 0)); shadowYOffsetSpinBox->setValue(conf->readNumEntry("ShadowYOffset", 10)); @@ -649,7 +649,7 @@ void KWinDecorationModule::readConfig( KConfig* conf ) cbShadowTopMenus->setChecked(conf->readBoolEntry("ShadowTopMenus", false)); shadowThicknessSpinBox->setValue(conf->readNumEntry("ShadowThickness", 10)); cbInactiveShadow->setChecked(conf->readBoolEntry("InactiveShadowEnabled", false)); - inactiveShadowColourButton->setColor(conf->readColorEntry("InactiveShadowColour", &Qt::black)); + inactiveShadowColourButton->setColor(conf->readColorEntry("InactiveShadowColour", &TQt::black)); inactiveShadowOpacitySlider->setValue((int)ceil(conf->readDoubleNumEntry("InactiveShadowOpacity", 0.70) * 100)); inactiveShadowXOffsetSpinBox->setValue(conf->readNumEntry("InactiveShadowXOffset", 0)); inactiveShadowYOffsetSpinBox->setValue(conf->readNumEntry("InactiveShadowYOffset", 5)); diff --git a/kwin/kcmkwin/kwindecoration/preview.cpp b/kwin/kcmkwin/kwindecoration/preview.cpp index c9a0174f4..ea894ecbc 100644 --- a/kwin/kcmkwin/kwindecoration/preview.cpp +++ b/kwin/kcmkwin/kwindecoration/preview.cpp @@ -49,7 +49,7 @@ KDecorationPreview::KDecorationPreview( TQWidget* parent, const char* name ) "Most probably there\n" "was a problem loading the plugin." ), this ); - no_preview->setAlignment( AlignCenter ); + no_preview->tqsetAlignment( AlignCenter ); setMinimumSize( 100, 100 ); no_preview->resize( size()); @@ -127,15 +127,15 @@ void KDecorationPreview::positionPreviews() // Resize the active window size = TQSize( width() - xoffset, height() - titleBarHeight ) - .expandedTo( deco[Active]->minimumSize() ); + .expandedTo( deco[Active]->tqminimumSize() ); geometry = TQRect( TQPoint( 0, titleBarHeight ), size ); - deco[Active]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) ); + deco[Active]->widget()->setGeometry( TQStyle::tqvisualRect( geometry, this ) ); // Resize the inactive window size = TQSize( width() - xoffset, height() - titleBarHeight ) - .expandedTo( deco[Inactive]->minimumSize() ); + .expandedTo( deco[Inactive]->tqminimumSize() ); geometry = TQRect( TQPoint( xoffset, 0 ), size ); - deco[Inactive]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) ); + deco[Inactive]->widget()->setGeometry( TQStyle::tqvisualRect( geometry, this ) ); } void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool active ) @@ -150,7 +150,7 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool act } else { - TQMemArray< TQRect > rects = reg.rects(); + TQMemArray< TQRect > rects = reg.tqrects(); XRectangle* xrects = new XRectangle[ rects.count() ]; for( unsigned int i = 0; i < rects.count(); @@ -166,7 +166,7 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool act delete[] xrects; } if( active ) - mask = reg; // keep shape of the active window for unobscuredRegion() + mask = reg; // keep tqshape of the active window for unobscuredRegion() } TQRect KDecorationPreview::windowGeometry( bool active ) const diff --git a/kwin/kcmkwin/kwindecoration/preview.h b/kwin/kcmkwin/kwindecoration/preview.h index 5604df587..2a753db69 100644 --- a/kwin/kcmkwin/kwindecoration/preview.h +++ b/kwin/kcmkwin/kwindecoration/preview.h @@ -30,7 +30,7 @@ class KDecorationPreviewBridge; class KDecorationPreviewOptions; class KDecorationPreview - : public QWidget + : public TQWidget { Q_OBJECT public: diff --git a/kwin/kcmkwin/kwinoptions/main.cpp b/kwin/kcmkwin/kwinoptions/main.cpp index ac19a5d30..8c8a283f2 100644 --- a/kwin/kcmkwin/kwinoptions/main.cpp +++ b/kwin/kcmkwin/kwinoptions/main.cpp @@ -171,7 +171,7 @@ void KWinOptions::save() mConfig->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } @@ -244,7 +244,7 @@ void KActionsOptions::save() mConfig->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } diff --git a/kwin/kcmkwin/kwinoptions/mouse.cpp b/kwin/kcmkwin/kwinoptions/mouse.cpp index 6adba1f89..30c18383c 100644 --- a/kwin/kcmkwin/kwinoptions/mouse.cpp +++ b/kwin/kcmkwin/kwinoptions/mouse.cpp @@ -163,7 +163,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf combo->insertItem(i18n("Lower")); combo->insertItem(i18n("On All Desktops")); combo->insertItem(i18n("Nothing")); - combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + combo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); hlayout->addWidget(combo); coTiDbl = combo; @@ -188,7 +188,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf comboW->insertItem(i18n("Move to Previous/Next Desktop")); comboW->insertItem(i18n("Change Opacity")); comboW->insertItem(i18n("Nothing")); - comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + comboW->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); hlayoutW->addWidget(comboW); coTiAct4 = comboW; @@ -219,8 +219,8 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf if ( leftHandedMouse ) { - qSwap(strMouseButton1, strMouseButton3); - qSwap(txtButton1, txtButton3); + tqSwap(strMouseButton1, strMouseButton3); + tqSwap(txtButton1, txtButton3); } label = new TQLabel(strMouseButton1, grid); @@ -235,7 +235,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf label = new TQLabel(i18n("Active"), grid); - label->setAlignment(AlignCenter); + label->tqsetAlignment(AlignCenter); TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" " or the frame of an active window.") ); @@ -256,7 +256,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf "<em>active</em> window."); // Be nice to left handed users - if ( leftHandedMouse ) qSwap(txtButton1, txtButton3); + if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3); TQWhatsThis::add(combo, txtButton1); @@ -289,10 +289,10 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf "<em>inactive</em> window."); // Be nice to left handed users - if ( leftHandedMouse ) qSwap(txtButton1, txtButton3); + if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3); label = new TQLabel(i18n("Inactive"), grid); - label->setAlignment(AlignCenter); + label->tqsetAlignment(AlignCenter); TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" " or the frame of an inactive window.") ); @@ -345,8 +345,8 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf if ( leftHandedMouse ) // Be nice to lefties { - qSwap(strMouseButton[0], strMouseButton[2]); - qSwap(txtButton[0], txtButton[2]); + tqSwap(strMouseButton[0], strMouseButton[2]); + tqSwap(txtButton[0], txtButton[2]); } createMaxButtonPixmaps(); @@ -356,14 +356,14 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf TQLabel * label = new TQLabel(strMouseButton[b], box); TQWhatsThis::add( label, txtButton[b] ); - label ->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); + label ->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); coMax[b] = new ToolTipComboBox(box, tbl_Max); for (int t = 0; t < 3; ++t) coMax[b]->insertItem(maxButtonPixmaps[t]); connect(coMax[b], TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); connect(coMax[b], TQT_SIGNAL(activated(int)), coMax[b], TQT_SLOT(changed())); TQWhatsThis::add( coMax[b], txtButton[b] ); - coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); + coMax[b]->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); } connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); @@ -565,7 +565,7 @@ void KTitleBarActionsConfig::save() config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } } @@ -618,8 +618,8 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, if ( leftHandedMouse ) { - qSwap(strMouseButton1, strMouseButton3); - qSwap(txtButton1, txtButton3); + tqSwap(strMouseButton1, strMouseButton3); + tqSwap(txtButton1, txtButton3); } strWin1 = i18n("In this row you can customize left click behavior when clicking into" @@ -629,7 +629,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, " an inactive inner window ('inner' means: not titlebar, not frame)."); // Be nice to lefties - if ( leftHandedMouse ) qSwap(strWin1, strWin3); + if ( leftHandedMouse ) tqSwap(strWin1, strWin3); label = new TQLabel(strMouseButton1, grid); TQWhatsThis::add( label, strWin1 ); @@ -696,8 +696,8 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, if ( leftHandedMouse ) { - qSwap(strMouseButton1, strMouseButton3); - qSwap(strAll1, strAll3); + tqSwap(strMouseButton1, strMouseButton3); + tqSwap(strAll1, strAll3); } label = new TQLabel(strMouseButton1, grid); @@ -839,7 +839,7 @@ void KWindowActionsConfig::save() config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } } diff --git a/kwin/kcmkwin/kwinoptions/mouse.h b/kwin/kcmkwin/kwinoptions/mouse.h index b28437511..49591e5d8 100644 --- a/kwin/kcmkwin/kwinoptions/mouse.h +++ b/kwin/kcmkwin/kwinoptions/mouse.h @@ -30,7 +30,7 @@ class KConfig; #include <tqtooltip.h> -class ToolTipComboBox: public QComboBox +class ToolTipComboBox: public TQComboBox { Q_OBJECT diff --git a/kwin/kcmkwin/kwinoptions/windows.cpp b/kwin/kcmkwin/kwinoptions/windows.cpp index cc8643af9..0f5939c6e 100644 --- a/kwin/kcmkwin/kwinoptions/windows.cpp +++ b/kwin/kcmkwin/kwinoptions/windows.cpp @@ -110,7 +110,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); - //iTLabel->setAlignment(AlignTop|AlignHCenter); + //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); @@ -124,7 +124,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren fcsBox = new TQButtonGroup(i18n("Focus"),this); fcsBox->setColumnLayout( 0, Qt::Horizontal ); - TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(), + TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->tqlayout(), KDialog::spacingHint()); TQBoxLayout *cLay = new TQHBoxLayout(fLay); @@ -192,8 +192,8 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool))); fLay->addWidget(clickRaiseOn); -// fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(), -// clickRaiseOn->sizeHint().width()) + 15); +// fLay->addColSpacing(0,QMAX(autoRaiseOn->tqsizeHint().width(), +// clickRaiseOn->tqsizeHint().width()) + 15); TQWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically" " come to the front when the mouse pointer has been over it for some time.") ); @@ -236,7 +236,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren kbdBox = new TQButtonGroup(i18n("Navigation"), this); kbdBox->setColumnLayout( 0, Qt::Horizontal ); - TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), KDialog::spacingHint()); + TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->tqlayout(), KDialog::spacingHint()); altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox ); kLay->addWidget( altTabPopup ); @@ -535,7 +535,7 @@ void KFocusConfig::save( void ) config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } emit KCModule::changed(false); } @@ -573,7 +573,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, TQWidget * //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); - //iTLabel->setAlignment(AlignTop|AlignHCenter); + //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); @@ -762,7 +762,7 @@ void KAdvancedConfig::save( void ) config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } emit KCModule::changed(false); } @@ -831,7 +831,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare windowsBox = new TQButtonGroup(i18n("Windows"), this); windowsBox->setColumnLayout( 0, Qt::Horizontal ); - TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint()); + TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->tqlayout(), KDialog::spacingHint()); TQBoxLayout *bLay = new TQVBoxLayout; wLay->addLayout(bLay); @@ -856,7 +856,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare " its size.")); TQGridLayout *rLay = new TQGridLayout(2,3); - bLay->addLayout(rLay); + bLay->addLayout(TQT_TQLAYOUT(rLay)); rLay->setColStretch(0,0); rLay->setColStretch(1,1); @@ -866,7 +866,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare " windows are minimized or restored." ) ); rLay->addWidget(minimizeAnimOn,0,0); - minimizeAnimSlider = new TQSlider(0,10,10,0,TQSlider::Horizontal, windowsBox); + minimizeAnimSlider = new TQSlider(0,10,10,0,Qt::Horizontal, windowsBox); minimizeAnimSlider->setSteps(1, 1); // TQSlider::Below clashes with a X11/X.h #define #undef Below @@ -877,11 +877,11 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int))); minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox); - minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft); + minimizeAnimSlowLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignLeft); rLay->addWidget(minimizeAnimSlowLabel,1,1); minimizeAnimFastLabel= new TQLabel(i18n("Fast"),windowsBox); - minimizeAnimFastLabel->setAlignment(Qt::AlignTop|Qt::AlignRight); + minimizeAnimFastLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignRight); rLay->addWidget(minimizeAnimFastLabel,1,2); wtstr = i18n("Here you can set the speed of the animation shown when windows are" @@ -940,7 +940,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); - //iTLabel->setAlignment(AlignTop|AlignHCenter); + //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); @@ -1114,7 +1114,7 @@ void KMovingConfig::load( void ) //CT 13mar98 interactive placement // if( key.left(11) == "interactive") { // setPlacement(INTERACTIVE_PLACEMENT); -// int comma_pos = key.find(','); +// int comma_pos = key.tqfind(','); // if (comma_pos < 0) // interactiveTrigger->setValue(0); // else @@ -1219,7 +1219,7 @@ void KMovingConfig::save( void ) config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } emit KCModule::changed(false); } @@ -1614,7 +1614,7 @@ void KTranslucencyConfig::save( void ) config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } emit KCModule::changed(false); } diff --git a/kwin/kcmkwin/kwinrules/detectwidget.cpp b/kwin/kcmkwin/kwinrules/detectwidget.cpp index 1a497c8bc..c30ae24ff 100644 --- a/kwin/kcmkwin/kwinrules/detectwidget.cpp +++ b/kwin/kcmkwin/kwinrules/detectwidget.cpp @@ -161,22 +161,22 @@ void DetectDialog::selectWindow() // use a dialog, so that all user input is blocked // use WX11BypassWM and moving away so that it's not actually visible // grab only mouse, so that keyboard can be used e.g. for switching windows - grabber = new TQDialog( NULL, NULL, true, WX11BypassWM ); + grabber = new TQDialog( NULL, NULL, true, (WFlags)WX11BypassWM ); grabber->move( -1000, -1000 ); grabber->show(); - grabber->grabMouse( crossCursor ); + grabber->grabMouse( tqcrossCursor ); grabber->installEventFilter( this ); } bool DetectDialog::eventFilter( TQObject* o, TQEvent* e ) { - if( o != grabber ) + if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(grabber) ) return false; if( e->type() != TQEvent::MouseButtonRelease ) return false; delete grabber; grabber = NULL; - if( static_cast< TQMouseEvent* >( e )->button() != LeftButton ) + if( TQT_TQMOUSEEVENT( e )->button() != Qt::LeftButton ) { emit detectionDone( false ); return true; diff --git a/kwin/kcmkwin/kwinrules/detectwidgetbase.ui b/kwin/kcmkwin/kwinrules/detectwidgetbase.ui index 31cae3ef3..af4ca9670 100644 --- a/kwin/kcmkwin/kwinrules/detectwidgetbase.ui +++ b/kwin/kcmkwin/kwinrules/detectwidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KWinInternal::DetectWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form3</cstring> </property> @@ -29,14 +29,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -44,7 +44,7 @@ <string>Extra role:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -52,7 +52,7 @@ <string>Class:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -60,7 +60,7 @@ <string>Role:</string> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>type_label</cstring> </property> @@ -68,7 +68,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -76,7 +76,7 @@ <string>Title:</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>class_label</cstring> </property> @@ -84,7 +84,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>role_label</cstring> </property> @@ -92,7 +92,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>title_label</cstring> </property> @@ -100,7 +100,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="7" column="1"> + <widget class="TQLabel" row="7" column="1"> <property name="name"> <cstring>machine_label</cstring> </property> @@ -108,7 +108,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -116,7 +116,7 @@ <string>Type:</string> </property> </widget> - <widget class="QLabel" row="6" column="1"> + <widget class="TQLabel" row="6" column="1"> <property name="name"> <cstring>extrarole_label</cstring> </property> @@ -124,7 +124,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class="TQLabel" row="7" column="0"> <property name="name"> <cstring>textLabel13</cstring> </property> @@ -146,7 +146,7 @@ <enum>Horizontal</enum> </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>textLabel9</cstring> </property> @@ -154,7 +154,7 @@ <string>Information About Selected Window</string> </property> </widget> - <widget class="QButtonGroup" row="8" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="8" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -165,7 +165,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>use_class</cstring> </property> @@ -179,7 +179,7 @@ <string>For selecting all windows belonging to a specific application, selecting only window class should usually work.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>use_role</cstring> </property> @@ -190,7 +190,7 @@ <string>For selecting a specific window in an application, both window class and window role should be selected. Window class will determine the application, and window role the specific window in the application; many applications do not provide useful window roles though.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>use_whole_class</cstring> </property> @@ -201,7 +201,7 @@ <string>With some (non-KDE) applications whole window class can be sufficient for selecting a specific window in an application, as they set whole window class to contain both application and window role.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>match_title</cstring> </property> diff --git a/kwin/kcmkwin/kwinrules/editshortcutbase.ui b/kwin/kcmkwin/kwinrules/editshortcutbase.ui index 3813ae589..7f03bb946 100644 --- a/kwin/kcmkwin/kwinrules/editshortcutbase.ui +++ b/kwin/kcmkwin/kwinrules/editshortcutbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>EditShortcutBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EditShortcutBase</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -48,7 +48,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <cstring>shortcut</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -66,14 +66,14 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <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>pushButton1</cstring> </property> @@ -91,14 +91,14 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <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>pushButton2</cstring> </property> @@ -116,7 +116,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kwin/kcmkwin/kwinrules/kcm.cpp b/kwin/kcmkwin/kwinrules/kcm.cpp index 19b714311..90802c41d 100644 --- a/kwin/kcmkwin/kwinrules/kcm.cpp +++ b/kwin/kcmkwin/kwinrules/kcm.cpp @@ -44,7 +44,7 @@ KCMRules::KCMRules( TQWidget *parent, const char *name ) { TQVBoxLayout *layout = new TQVBoxLayout( this ); widget = new KCMRulesList( this ); - layout->addWidget( widget ); + layout->addWidget( TQT_TQWIDGET(widget) ); connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool ))); KAboutData *about = new KAboutData(I18N_NOOP( "kcmkwinrules" ), I18N_NOOP( "Window-Specific Settings Configuration Module" ), @@ -68,7 +68,7 @@ void KCMRules::save() config.sync(); if( !kapp->dcopClient()->isAttached()) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } void KCMRules::defaults() diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp index b58c96239..1663d88af 100644 --- a/kwin/kcmkwin/kwinrules/main.cpp +++ b/kwin/kcmkwin/kwinrules/main.cpp @@ -151,7 +151,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who Rules* ret = new Rules; if( whole_app ) { - ret->description = i18n( "Application settings for %1" ).arg( wmclass_class ); + ret->description = i18n( "Application settings for %1" ).tqarg( static_cast<const char *>(wmclass_class) ); // TODO maybe exclude some types? If yes, then also exclude them above // when searching. ret->types = NET::AllTypesMask; @@ -175,7 +175,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who } return ret; } - ret->description = i18n( "Window settings for %1" ).arg( wmclass_class ); + ret->description = i18n( "Window settings for %1" ).tqarg( static_cast<const char *>(wmclass_class) ); if( type == NET::Unknown ) ret->types = NET::NormalMask; else @@ -248,7 +248,7 @@ static int edit( Window wid, bool whole_app ) } else if( edited_rule != orig_rule ) { - TQValueList< Rules* >::Iterator pos = rules.find( orig_rule ); + TQValueList< Rules* >::Iterator pos = rules.tqfind( orig_rule ); if( pos != rules.end()) *pos = edited_rule; else @@ -258,7 +258,7 @@ static int edit( Window wid, bool whole_app ) saveRules( rules ); if( !kapp->dcopClient()->isAttached()) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); return 0; } diff --git a/kwin/kcmkwin/kwinrules/ruleslistbase.ui b/kwin/kcmkwin/kwinrules/ruleslistbase.ui index c2abdaa9d..5fc5fd6ed 100644 --- a/kwin/kcmkwin/kwinrules/ruleslistbase.ui +++ b/kwin/kcmkwin/kwinrules/ruleslistbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KWinInternal::KCMRulesListBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>294</height> diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.cpp b/kwin/kcmkwin/kwinrules/ruleswidget.cpp index 2525644d9..7a82a8149 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidget.cpp +++ b/kwin/kcmkwin/kwinrules/ruleswidget.cpp @@ -661,7 +661,7 @@ bool RulesWidget::finalCheck() all_types = false; if( wmclass_match->currentItem() == Rules::UnimportantMatch && all_types ) { - if( KMessageBox::warningContinueCancel( topLevelWidget(), + if( KMessageBox::warningContinueCancel( tqtopLevelWidget(), i18n( "You have specified the window class as unimportant.\n" "This means the settings will possibly apply to windows from all applications. " "If you really want to create a generic setting, it is recommended you at least " @@ -680,7 +680,7 @@ void RulesWidget::prepareWindowSpecific( WId window ) void RulesWidget::shortcutEditClicked() { - EditShortcutDialog dlg( topLevelWidget()); + EditShortcutDialog dlg( tqtopLevelWidget()); dlg.setShortcut( shortcut->text()); if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut()); @@ -735,7 +735,7 @@ EditShortcut::EditShortcut( TQWidget* parent, const char* name ) void EditShortcut::editShortcut() { - ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget()); + ShortcutDialog dlg( KShortcut( shortcut->text()), tqtopLevelWidget()); if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut().toString()); } diff --git a/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui index 01c1b9918..dbcdbb374 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui +++ b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KWinInternal::RulesWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form2</cstring> </property> @@ -19,11 +19,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabs</cstring> </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="QLabel" row="0" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -50,7 +50,7 @@ <cstring>description</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -61,7 +61,7 @@ <cstring>wmclass</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>212</width> <height>20</height> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>211</width> <height>20</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>212</width> <height>20</height> @@ -230,7 +230,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>211</width> <height>20</height> @@ -242,7 +242,7 @@ <cstring>wmclass</cstring> </property> </widget> - <widget class="QCheckBox" row="3" column="4"> + <widget class="TQCheckBox" row="3" column="4"> <property name="name"> <cstring>whole_wmclass</cstring> </property> @@ -250,7 +250,7 @@ <string>Match w&hole window class</string> </property> </widget> - <widget class="QGroupBox" row="8" column="0" rowspan="1" colspan="5"> + <widget class="TQGroupBox" row="8" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -271,7 +271,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>270</width> <height>20</height> @@ -296,7 +296,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>269</width> <height>20</height> @@ -307,7 +307,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -318,7 +318,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -387,7 +387,7 @@ <enum>Multi</enum> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -403,7 +403,7 @@ <cstring>title</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -419,7 +419,7 @@ <cstring>extra</cstring> </property> </widget> - <widget class="QLabel" row="8" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -470,7 +470,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>199</width> <height>20</height> @@ -501,7 +501,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>199</width> <height>20</height> @@ -543,7 +543,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>199</width> <height>20</height> @@ -574,7 +574,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>199</width> <height>20</height> @@ -616,7 +616,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>199</width> <height>20</height> @@ -647,7 +647,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>199</width> <height>20</height> @@ -656,7 +656,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -716,7 +716,7 @@ <string>0123456789-+,xX:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>enable_size</cstring> </property> @@ -724,7 +724,7 @@ <string>&Size</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>enable_position</cstring> </property> @@ -781,7 +781,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="2"> + <widget class="TQCheckBox" row="3" column="2"> <property name="name"> <cstring>maximizevert</cstring> </property> @@ -830,7 +830,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="4" column="2"> + <widget class="TQCheckBox" row="4" column="2"> <property name="name"> <cstring>fullscreen</cstring> </property> @@ -841,7 +841,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>enable_maximizehoriz</cstring> </property> @@ -849,7 +849,7 @@ <string>Maximized &horizontally</string> </property> </widget> - <widget class="QCheckBox" row="2" column="2"> + <widget class="TQCheckBox" row="2" column="2"> <property name="name"> <cstring>maximizehoriz</cstring> </property> @@ -898,7 +898,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>enable_fullscreen</cstring> </property> @@ -944,7 +944,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>enable_maximizevert</cstring> </property> @@ -998,7 +998,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="5" column="0"> + <widget class="TQCheckBox" row="5" column="0"> <property name="name"> <cstring>enable_desktop</cstring> </property> @@ -1006,7 +1006,7 @@ <string>&Desktop</string> </property> </widget> - <widget class="QCheckBox" row="7" column="0"> + <widget class="TQCheckBox" row="7" column="0"> <property name="name"> <cstring>enable_shade</cstring> </property> @@ -1014,7 +1014,7 @@ <string>Sh&aded</string> </property> </widget> - <widget class="QCheckBox" row="7" column="2"> + <widget class="TQCheckBox" row="7" column="2"> <property name="name"> <cstring>shade</cstring> </property> @@ -1063,7 +1063,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="6" column="2"> + <widget class="TQCheckBox" row="6" column="2"> <property name="name"> <cstring>minimize</cstring> </property> @@ -1074,7 +1074,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="6" column="0"> + <widget class="TQCheckBox" row="6" column="0"> <property name="name"> <cstring>enable_minimize</cstring> </property> @@ -1163,7 +1163,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="8" column="0"> + <widget class="TQCheckBox" row="8" column="0"> <property name="name"> <cstring>enable_placement</cstring> </property> @@ -1181,7 +1181,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -1228,7 +1228,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1239,7 +1239,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>enable_above</cstring> </property> @@ -1247,7 +1247,7 @@ <string>Keep &above</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>enable_below</cstring> </property> @@ -1255,7 +1255,7 @@ <string>Keep &below</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>enable_skippager</cstring> </property> @@ -1263,7 +1263,7 @@ <string>Skip pa&ger</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>enable_skiptaskbar</cstring> </property> @@ -1271,7 +1271,7 @@ <string>Skip &taskbar</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>enable_noborder</cstring> </property> @@ -1279,7 +1279,7 @@ <string>&No border</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0"> + <widget class="TQCheckBox" row="5" column="0"> <property name="name"> <cstring>enable_acceptfocus</cstring> </property> @@ -1287,7 +1287,7 @@ <string>Accept &focus</string> </property> </widget> - <widget class="QCheckBox" row="6" column="0"> + <widget class="TQCheckBox" row="6" column="0"> <property name="name"> <cstring>enable_closeable</cstring> </property> @@ -1295,7 +1295,7 @@ <string>&Closeable</string> </property> </widget> - <widget class="QCheckBox" row="7" column="0"> + <widget class="TQCheckBox" row="7" column="0"> <property name="name"> <cstring>enable_opacityactive</cstring> </property> @@ -1347,7 +1347,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>171</width> <height>20</height> @@ -1364,7 +1364,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>290</width> <height>20</height> @@ -1381,7 +1381,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>290</width> <height>20</height> @@ -1398,7 +1398,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>290</width> <height>20</height> @@ -1415,7 +1415,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>290</width> <height>20</height> @@ -1432,7 +1432,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>290</width> <height>20</height> @@ -1449,7 +1449,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>290</width> <height>20</height> @@ -1466,14 +1466,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>290</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>above</cstring> </property> @@ -1484,7 +1484,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="1" column="2"> + <widget class="TQCheckBox" row="1" column="2"> <property name="name"> <cstring>below</cstring> </property> @@ -1495,7 +1495,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="2" column="2"> + <widget class="TQCheckBox" row="2" column="2"> <property name="name"> <cstring>noborder</cstring> </property> @@ -1506,7 +1506,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="3" column="2"> + <widget class="TQCheckBox" row="3" column="2"> <property name="name"> <cstring>skiptaskbar</cstring> </property> @@ -1517,7 +1517,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="4" column="2"> + <widget class="TQCheckBox" row="4" column="2"> <property name="name"> <cstring>skippager</cstring> </property> @@ -1528,7 +1528,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="5" column="2"> + <widget class="TQCheckBox" row="5" column="2"> <property name="name"> <cstring>acceptfocus</cstring> </property> @@ -1539,7 +1539,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="6" column="2"> + <widget class="TQCheckBox" row="6" column="2"> <property name="name"> <cstring>closeable</cstring> </property> @@ -1796,7 +1796,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>80</height> @@ -1847,14 +1847,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>181</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="8" column="0"> + <widget class="TQCheckBox" row="8" column="0"> <property name="name"> <cstring>enable_opacityinactive</cstring> </property> @@ -1862,7 +1862,7 @@ <string>I&nactive opacity in %</string> </property> </widget> - <widget class="QCheckBox" row="9" column="0"> + <widget class="TQCheckBox" row="9" column="0"> <property name="name"> <cstring>enable_shortcut</cstring> </property> @@ -1911,7 +1911,7 @@ <bool>false</bool> </property> </widget> - <widget class="QPushButton" row="9" column="5"> + <widget class="TQPushButton" row="9" column="5"> <property name="name"> <cstring>shortcut_edit</cstring> </property> @@ -1929,7 +1929,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1940,7 +1940,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>enable_fsplevel</cstring> </property> @@ -2047,7 +2047,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>enable_type</cstring> </property> @@ -2055,7 +2055,7 @@ <string>Window &type</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>enable_moveresizemode</cstring> </property> @@ -2153,7 +2153,7 @@ <string>0123456789-+,xX:</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>enable_minsize</cstring> </property> @@ -2184,7 +2184,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="5" column="0"> + <widget class="TQCheckBox" row="5" column="0"> <property name="name"> <cstring>enable_maxsize</cstring> </property> @@ -2226,7 +2226,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>enable_ignoreposition</cstring> </property> @@ -2257,7 +2257,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="3"> + <widget class="TQCheckBox" row="3" column="3"> <property name="name"> <cstring>ignoreposition</cstring> </property> @@ -2278,14 +2278,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>160</height> </size> </property> </spacer> - <widget class="QCheckBox" row="6" column="0"> + <widget class="TQCheckBox" row="6" column="0"> <property name="name"> <cstring>enable_strictgeometry</cstring> </property> @@ -2319,7 +2319,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="6" column="3"> + <widget class="TQCheckBox" row="6" column="3"> <property name="name"> <cstring>strictgeometry</cstring> </property> @@ -2330,7 +2330,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="7" column="3"> + <widget class="TQCheckBox" row="7" column="3"> <property name="name"> <cstring>disableglobalshortcuts</cstring> </property> @@ -2341,7 +2341,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="7" column="0"> + <widget class="TQCheckBox" row="7" column="0"> <property name="name"> <cstring>enable_disableglobalshortcuts</cstring> </property> diff --git a/kwin/killer/killer.cpp b/kwin/killer/killer.cpp index ae31fc3e0..d348e48ff 100644 --- a/kwin/killer/killer.cpp +++ b/kwin/killer/killer.cpp @@ -55,7 +55,7 @@ int main( int argc, char* argv[] ) bool pid_ok = false; pid_t pid = args->getOption( "pid" ).toULong( &pid_ok ); TQString caption = TQString::fromUtf8( args->getOption( "windowname" )); - TQString appname = TQString::fromLatin1( args->getOption( "applicationname" )); + TQString appname = TQString::tqfromLatin1( args->getOption( "applicationname" )); bool id_ok = false; Window id = args->getOption( "wid" ).toULong( &id_ok ); bool time_ok = false; @@ -71,7 +71,7 @@ int main( int argc, char* argv[] ) "<qt>Window with title \"<b>%2</b>\" is not responding. " "This window belongs to application <b>%1</b> (PID=%3, hostname=%4).<p>" "Do you wish to terminate this application? (All unsaved data in this application will be lost.)</qt>" ) - .arg( appname ).arg( caption ).arg( pid ).arg( hostname ); + .tqarg( appname ).tqarg( caption ).tqarg( pid ).tqarg( static_cast<const char *>(hostname) ); app.updateUserTimestamp( timestamp ); if( KMessageBox::warningYesNoWId( id, question, TQString::null, i18n("Terminate"), i18n("Keep Running") ) == KMessageBox::Yes ) { diff --git a/kwin/kompmgr/kompmgr.c b/kwin/kompmgr/kompmgr.c index 713752ee1..f65586be4 100644 --- a/kwin/kompmgr/kompmgr.c +++ b/kwin/kompmgr/kompmgr.c @@ -99,7 +99,7 @@ typedef struct _win { unsigned int shadowSize; Atom windowType; unsigned long damage_sequence; /* sequence when damage was created */ - Bool shapable; /* this will allow window managers to exclude windows if just the deco is shaped*/ + Bool shapable; /* this will allow window managers to exclude windows if just the deco is tqshaped*/ unsigned int decoHash; Picture dimPicture; @@ -151,7 +151,7 @@ Bool synchronize; int composite_opcode; Bool disable_argb = False; -int shapeEvent; +int tqshapeEvent; /* find these once and be done with it */ Atom opacityAtom; @@ -1679,10 +1679,10 @@ get_opacity_percent(Display *dpy, win *w, double def) } #if 0 static void -damage_shape(Display *dpy, win *w, XRectangle *shape_damage) +damage_tqshape(Display *dpy, win *w, XRectangle *tqshape_damage) { set_ignore (dpy, NextRequest (dpy)); - XserverRegion region = XFixesCreateRegion (dpy, shape_damage, 1); + XserverRegion region = XFixesCreateRegion (dpy, tqshape_damage, 1); set_ignore (dpy, NextRequest (dpy)); XserverRegion tmpRegion; add_damage(dpy, region); @@ -2707,7 +2707,7 @@ main (int argc, char **argv) VisibilityChangeMask); /*shaping stuff*/ - XShapeQueryExtension(dpy, &shapeEvent, &dummy); + XShapeQueryExtension(dpy, &tqshapeEvent, &dummy); XQueryTree (dpy, root, &root_return, &parent_return, &children, &nchildren); for (i = 0; i < nchildren; i++) @@ -2947,7 +2947,7 @@ main (int argc, char **argv) /* printf("damaging win: %u\n",ev.xany.window);*/ damage_win (dpy, (XDamageNotifyEvent *) &ev); } - else if (ev.type == shapeEvent) + else if (ev.type == tqshapeEvent) { win * w = find_win(dpy, ev.xany.window); #if 1 @@ -2963,7 +2963,7 @@ main (int argc, char **argv) rect.y = ((XShapeEvent*)&ev)->y; rect.width = ((XShapeEvent*)&ev)->width; rect.height = ((XShapeEvent*)&ev)->height; - damage_shape(dpy, w, &rect); + damage_tqshape(dpy, w, &rect); #endif #if 0 if (w->shadowSize != 0) @@ -2978,7 +2978,7 @@ main (int argc, char **argv) } #endif /*this is hardly efficient, but a current workaraound - shaping support isn't that good so far (e.g. we lack shaped shadows) + shaping support isn't that good so far (e.g. we lack tqshaped shadows) IDEA: use XRender to scale/shift a copy of the window and then blurr it*/ #if 1 if (w->picture) diff --git a/kwin/layers.cpp b/kwin/layers.cpp index fcb6d8383..3151b22e5 100644 --- a/kwin/layers.cpp +++ b/kwin/layers.cpp @@ -89,7 +89,7 @@ void Workspace::updateClientLayer( Client* c ) if( c->layer() == c->belongsToLayer()) return; StackingUpdatesBlocker blocker( this ); - c->invalidateLayer(); // invalidate, will be updated when doing restacking + c->tqinvalidateLayer(); // tqinvalidate, will be updated when doing restacking for( ClientList::ConstIterator it = c->transients().begin(); it != c->transients().end(); ++it ) @@ -306,7 +306,7 @@ void Workspace::raiseOrLowerClient( Client *c) if (!c) return; Client* topmost = NULL; // TODO Q_ASSERT( block_stacking_updates == 0 ); - if ( most_recently_raised && stacking_order.contains( most_recently_raised ) && + if ( most_recently_raised && stacking_order.tqcontains( most_recently_raised ) && most_recently_raised->isShown( true ) && c->isOnCurrentDesktop()) topmost = most_recently_raised; else @@ -471,11 +471,11 @@ void Workspace::restackClientUnderActive( Client* c ) return; } - assert( unconstrained_stacking_order.contains( active_client )); + assert( unconstrained_stacking_order.tqcontains( active_client )); if( Client::belongToSameApplication( active_client, c )) { // put it below the active window if it's the same app unconstrained_stacking_order.remove( c ); - unconstrained_stacking_order.insert( unconstrained_stacking_order.find( active_client ), c ); + unconstrained_stacking_order.insert( unconstrained_stacking_order.tqfind( active_client ), c ); } else { // put in the stacking order below _all_ windows belonging to the active application @@ -494,17 +494,17 @@ void Workspace::restackClientUnderActive( Client* c ) } } } - assert( unconstrained_stacking_order.contains( c )); + assert( unconstrained_stacking_order.tqcontains( c )); for( int desktop = 1; desktop <= numberOfDesktops(); ++desktop ) { // do for every virtual desktop to handle the case of onalldesktop windows - if( c->wantsTabFocus() && c->isOnDesktop( desktop ) && focus_chain[ desktop ].contains( active_client )) + if( c->wantsTabFocus() && c->isOnDesktop( desktop ) && focus_chain[ desktop ].tqcontains( active_client )) { if( Client::belongToSameApplication( active_client, c )) { // put it after the active window if it's the same app focus_chain[ desktop ].remove( c ); - focus_chain[ desktop ].insert( focus_chain[ desktop ].find( active_client ), c ); + focus_chain[ desktop ].insert( focus_chain[ desktop ].tqfind( active_client ), c ); } else { // put it in focus_chain[currentDesktop()] after all windows belonging to the active applicationa @@ -523,12 +523,12 @@ void Workspace::restackClientUnderActive( Client* c ) } } // the same for global_focus_chain - if( c->wantsTabFocus() && global_focus_chain.contains( active_client )) + if( c->wantsTabFocus() && global_focus_chain.tqcontains( active_client )) { if( Client::belongToSameApplication( active_client, c )) { global_focus_chain.remove( c ); - global_focus_chain.insert( global_focus_chain.find( active_client ), c ); + global_focus_chain.insert( global_focus_chain.tqfind( active_client ), c ); } else { @@ -583,7 +583,7 @@ ClientList Workspace::constrainedStackingOrder() // If a window is raised above some other window in the same window group // which is in the ActiveLayer (i.e. it's fulscreened), make sure it stays // above that window (see #95731). - if( minimum_layer.contains( (*it)->group()) + if( minimum_layer.tqcontains( (*it)->group()) && minimum_layer[ (*it)->group() ] == ActiveLayer && ( l == NormalLayer || l == AboveLayer )) { diff --git a/kwin/lib/kcommondecoration.cpp b/kwin/lib/kcommondecoration.cpp index 87541ad60..eabcc16b5 100644 --- a/kwin/lib/kcommondecoration.cpp +++ b/kwin/lib/kcommondecoration.cpp @@ -199,7 +199,7 @@ void KCommonDecoration::updateLayout() const if (*it) { if (!(*it)->isHidden() ) { moveWidget(x,y, *it); - x += layoutMetric(LM_ButtonWidth, true, ::qt_cast<KCommonDecorationButton*>(*it) ); + x += layoutMetric(LM_ButtonWidth, true, ::tqqt_cast<KCommonDecorationButton*>(*it) ); elementLayouted = true; } } else { @@ -221,7 +221,7 @@ void KCommonDecoration::updateLayout() const if (*it) { if (!(*it)->isHidden() ) { moveWidget(x,y, *it); - x += layoutMetric(LM_ButtonWidth, true, ::qt_cast<KCommonDecorationButton*>(*it) );; + x += layoutMetric(LM_ButtonWidth, true, ::tqqt_cast<KCommonDecorationButton*>(*it) );; elementLayouted = true; } } else { @@ -327,7 +327,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn = createButton(MenuButton); if (!btn) break; btn->setTipText(i18n("Menu") ); - btn->setRealizeButtons(LeftButton|RightButton); + btn->setRealizeButtons(Qt::LeftButton|Qt::RightButton); connect(btn, TQT_SIGNAL(pressed()), TQT_SLOT(menuButtonPressed())); connect(btn, TQT_SIGNAL(released()), this, TQT_SLOT(menuButtonReleased())); @@ -371,7 +371,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString if ((!m_button[MaxButton]) && isMaximizable()){ btn = createButton(MaxButton); if (!btn) break; - btn->setRealizeButtons(LeftButton|MidButton|RightButton); + btn->setRealizeButtons(Qt::LeftButton|Qt::MidButton|Qt::RightButton); const bool max = maximizeMode()==MaximizeFull; btn->setTipText(max?i18n("Restore"):i18n("Maximize") ); btn->setToggleButton(true); @@ -497,7 +497,7 @@ void KCommonDecoration::resize( const TQSize& s ) widget()->resize( s ); } -TQSize KCommonDecoration::minimumSize() const +TQSize KCommonDecoration::tqminimumSize() const { const int minWidth = QMAX(layoutMetric(LM_TitleEdgeLeft), layoutMetric(LM_BorderLeft)) +QMAX(layoutMetric(LM_TitleEdgeRight), layoutMetric(LM_BorderRight)) @@ -659,7 +659,7 @@ void KCommonDecoration::resizeEvent(TQResizeEvent */*e*/) updateWindowShape(); // FIXME: don't update() here! this would result in two paintEvent()s - // because there is already "something" else triggering the repaint... + // because there is already "something" else triggering the tqrepaint... // widget()->update(); } @@ -685,7 +685,7 @@ void KCommonDecoration::resizeWidget(int w, int h, TQWidget *widget) const void KCommonDecoration::mouseDoubleClickEvent(TQMouseEvent *e) { - if( e->button() != LeftButton ) + if( e->button() != Qt::LeftButton ) return; int tb = layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeBottom); @@ -819,24 +819,24 @@ void KCommonDecoration::updateWindowShape() bool KCommonDecoration::eventFilter( TQObject* o, TQEvent* e ) { - if( o != widget()) + if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch( e->type()) { case TQEvent::Resize: - resizeEvent(static_cast<TQResizeEvent*>(e) ); + resizeEvent(TQT_TQRESIZEEVENT(e) ); return true; case TQEvent::Paint: - paintEvent( static_cast< TQPaintEvent* >( e )); + paintEvent(TQT_TQPAINTEVENT( e )); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent( static_cast< TQMouseEvent* >( e )); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT( e )); return true; case TQEvent::MouseButtonPress: - processMousePressEvent( static_cast< TQMouseEvent* >( e )); + processMousePressEvent(TQT_TQMOUSEEVENT( e )); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent(TQT_TQWHEELEVENT( e )); return true; default: return false; @@ -856,7 +856,7 @@ bool KCommonDecoration::isToolWindow() const TQRect KCommonDecoration::titleRect() const { int r_x, r_y, r_x2, r_y2; - widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2); + TQT_TQRECT_OBJECT(widget()->rect()).coords(&r_x, &r_y, &r_x2, &r_y2); const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); @@ -875,8 +875,8 @@ KCommonDecorationButton::KCommonDecorationButton(ButtonType type, KCommonDecorat : TQButton(parent->widget(), name), m_decoration(parent), m_type(type), - m_realizeButtons(LeftButton), - m_lastMouse(NoButton), + m_realizeButtons(Qt::LeftButton), + m_lastMouse(Qt::NoButton), m_isLeft(true) { setCursor(ArrowCursor); @@ -921,7 +921,7 @@ void KCommonDecorationButton::setSize(const TQSize &s) } } -TQSize KCommonDecorationButton::sizeHint() const +TQSize KCommonDecorationButton::tqsizeHint() const { return m_size; } @@ -950,7 +950,7 @@ void KCommonDecorationButton::mousePressEvent(TQMouseEvent* e) m_lastMouse = e->button(); // pass on event after changing button to LeftButton TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button()&m_realizeButtons)?LeftButton:NoButton, e->state()); + (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state()); TQButton::mousePressEvent(&me); } @@ -960,7 +960,7 @@ void KCommonDecorationButton::mouseReleaseEvent(TQMouseEvent* e) m_lastMouse = e->button(); // pass on event after changing button to LeftButton TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button()&m_realizeButtons)?LeftButton:NoButton, e->state()); + (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state()); TQButton::mouseReleaseEvent(&me); } diff --git a/kwin/lib/kcommondecoration.h b/kwin/lib/kcommondecoration.h index f515a7da7..4dcaf51fb 100644 --- a/kwin/lib/kcommondecoration.h +++ b/kwin/lib/kcommondecoration.h @@ -177,7 +177,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration /** * This updates the window mask using the information provided by * cornerShape(). Edges which are aligned to screen corners are not - * shaped for better usability (remember to paint these areas in paintEvent(), too). + * tqshaped for better usability (remember to paint these areas in paintEvent(), too). * You normally don't want/need to reimplement updateWindowShape(). * @see cornerShape() */ @@ -202,7 +202,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration */ void updateLayout() const; /** - * Makes sure all buttons are repainted. + * Makes sure all buttons are tqrepainted. */ void updateButtons() const; /** @@ -233,7 +233,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void show(); virtual void resize(const TQSize& s); - virtual TQSize minimumSize() const; + virtual TQSize tqminimumSize() const; virtual void maximizeChange(); virtual void desktopChange(); virtual void shadeChange(); @@ -287,10 +287,13 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration /** * Title bar buttons of KCommonDecoration need to inherit this class. */ -class KWIN_EXPORT KCommonDecorationButton : public QButton +class KWIN_EXPORT KCommonDecorationButton : public TQButton { friend class KCommonDecoration; + Q_OBJECT + TQ_OBJECT + public: KCommonDecorationButton(ButtonType type, KCommonDecoration *parent, const char *name); virtual ~KCommonDecorationButton(); @@ -343,7 +346,7 @@ class KWIN_EXPORT KCommonDecorationButton : public QButton */ ButtonState lastMousePress() const { return m_lastMouse; } - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: void setToggleButton(bool toggle); diff --git a/kwin/lib/kdecoration.cpp b/kwin/lib/kdecoration.cpp index 97c8965e9..a8b78bee5 100644 --- a/kwin/lib/kdecoration.cpp +++ b/kwin/lib/kdecoration.cpp @@ -388,14 +388,14 @@ const TQFont& KDecorationOptions::font(bool active, bool small) const return(active ? d->activeFont : d->inactiveFont); } -const TQColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active) const +const TQColorGroup& KDecorationOptions::tqcolorGroup(ColorType type, bool active) const { int idx = type + (active ? 0 : NUM_COLORS); if(d->cg[idx]) return(*d->cg[idx]); d->cg[idx] = new TQColorGroup(Qt::black, d->colors[idx], d->colors[idx].light(150), d->colors[idx].dark(), d->colors[idx].dark(120), - Qt::black, TQApplication::palette().active(). + Qt::black, TQApplication::tqpalette().active(). base()); return(*d->cg[idx]); } @@ -434,7 +434,7 @@ bool KDecorationOptions::moveResizeMaximizedWindows() const return d->move_resize_maximized_windows; } -KDecorationDefines::WindowOperation KDecorationOptions::operationMaxButtonClick( Qt::ButtonState button ) const +KDecorationDefines::WindowOperation KDecorationOptions::operationMaxButtonClick( TQt::ButtonState button ) const { return button == Qt::RightButton? d->OpMaxButtonRightClick : button == Qt::MidButton? d->OpMaxButtonMiddleClick : diff --git a/kwin/lib/kdecoration.h b/kwin/lib/kdecoration.h index f41f19041..7ce588142 100644 --- a/kwin/lib/kdecoration.h +++ b/kwin/lib/kdecoration.h @@ -205,7 +205,7 @@ public: * @param type The requested color type. * @param active Whether to return the color for active or inactive windows. */ - const TQColorGroup& colorGroup(ColorType type, bool active=true) const; + const TQColorGroup& tqcolorGroup(ColorType type, bool active=true) const; /** * Returns the active or inactive decoration font. * The changed flags for this setting is SettingFont. @@ -286,7 +286,7 @@ public: /** * @internal */ - WindowOperation operationMaxButtonClick( Qt::ButtonState button ) const; + WindowOperation operationMaxButtonClick( TQt::ButtonState button ) const; /** * @internal @@ -481,15 +481,15 @@ class KWIN_EXPORT KDecoration void performWindowOperation( WindowOperation op ); /** * If the decoration is non-rectangular, this function needs to be called - * to set the shape of the decoration. + * to set the tqshape of the decoration. * - * @param reg The shape of the decoration. + * @param reg The tqshape of the decoration. * @param mode The X11 values Unsorted, YSorted, YXSorted and YXBanded that specify * the sorting of the rectangles, default value is Unsorted. */ void setMask( const TQRegion& reg, int mode = 0 ); /** - * This convenience function resets the shape mask. + * This convenience function resets the tqshape mask. */ void clearMask(); // convenience /** @@ -573,13 +573,13 @@ class KWIN_EXPORT KDecoration * whether it's shaded. Decorations often turn off their bottom border when the * window is shaded, and turn off their left/right/bottom borders when * the window is maximized and moving and resizing of maximized windows is disabled. - * This function mustn't do any repaints or resizes. Also, if the sizes returned + * This function mustn't do any tqrepaints or resizes. Also, if the sizes returned * by this function don't match the real values, this may result in drawing errors * or other problems. * * @see KDecorationOptions::moveResizeMaximizedWindows() */ - // mustn't do any repaints, resizes or anything like that + // mustn't do any tqrepaints, resizes or anything like that virtual void borders( int& left, int& right, int& top, int& bottom ) const = 0; /** * This method is called by kwin when the style should resize the decoration window. @@ -594,7 +594,7 @@ class KWIN_EXPORT KDecoration * Note that the returned size shouldn't be too large, because it will be * used to keep the decorated window at least as large. */ - virtual TQSize minimumSize() const = 0; + virtual TQSize tqminimumSize() const = 0; /** * This function is called whenever the window either becomes or stops being active. * Use isActive() to find out the current state. diff --git a/kwin/lib/kdecoration_plugins_p.cpp b/kwin/lib/kdecoration_plugins_p.cpp index 0490e4755..2e870eaf4 100644 --- a/kwin/lib/kdecoration_plugins_p.cpp +++ b/kwin/lib/kdecoration_plugins_p.cpp @@ -167,7 +167,7 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr ) // For clients in kdeartwork TQString catalogue = nameStr; - catalogue.replace( "kwin3_", "kwin_" ); + catalogue.tqreplace( "kwin3_", "kwin_" ); KGlobal::locale()->insertCatalogue( catalogue ); // For KCommonDecoration based clients KGlobal::locale()->insertCatalogue( "kwin_lib" ); diff --git a/kwin/lib/kdecorationfactory.cpp b/kwin/lib/kdecorationfactory.cpp index 7ad1aefbe..65fde37bc 100644 --- a/kwin/lib/kdecorationfactory.cpp +++ b/kwin/lib/kdecorationfactory.cpp @@ -58,7 +58,7 @@ TQValueList< KDecorationDefines::BorderSize > KDecorationFactory::borderSizes() bool KDecorationFactory::exists( const KDecoration* deco ) const { - return _decorations.contains( const_cast< KDecoration* >( deco )); + return _decorations.tqcontains( const_cast< KDecoration* >( deco )); } void KDecorationFactory::addDecoration( KDecoration* deco ) diff --git a/kwin/lib/kdecorationfactory.h b/kwin/lib/kdecorationfactory.h index 7396ad987..fb560c492 100644 --- a/kwin/lib/kdecorationfactory.h +++ b/kwin/lib/kdecorationfactory.h @@ -56,7 +56,7 @@ class KWIN_EXPORT KDecorationFactory * The argument specifies what has changed, using the SettingXXX masks. * It should be determined whether the decorations need to be completely * remade, in which case true should be returned, or whether only e.g. - * a repaint will be sufficient, in which case false should be returned, + * a tqrepaint will be sufficient, in which case false should be returned, * and resetDecorations() can be called to reset all decoration objects. * Note that true should be returned only when really necessary. */ diff --git a/kwin/main.cpp b/kwin/main.cpp index edceeb6bf..96cb793ba 100644 --- a/kwin/main.cpp +++ b/kwin/main.cpp @@ -225,7 +225,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) XCloseDisplay( dpy ); dpy = 0; - if ((pos = display_name.findRev('.')) != -1 ) + if ((pos = display_name.tqfindRev('.')) != -1 ) display_name.remove(pos,10); // 10 is enough to be sure we removed ".s" TQCString envir; diff --git a/kwin/manage.cpp b/kwin/manage.cpp index df385867a..dc05e5e2c 100644 --- a/kwin/manage.cpp +++ b/kwin/manage.cpp @@ -266,7 +266,7 @@ bool Client::manage( Window w, bool isMapped ) usePosition = true; if( !rules()->checkIgnoreGeometry( !usePosition )) { - bool ignorePPosition = ( options->ignorePositionClasses.contains(TQString::fromLatin1(resourceClass()))); + bool ignorePPosition = ( options->ignorePositionClasses.tqcontains(TQString::tqfromLatin1(resourceClass()))); if ( ( (xSizeHint.flags & PPosition) && !ignorePPosition ) || (xSizeHint.flags & USPosition) ) @@ -321,7 +321,7 @@ bool Client::manage( Window w, bool isMapped ) keepInArea( area, partial_keep_in_area ); XShapeSelectInput( qt_xdisplay(), window(), ShapeNotifyMask ); - is_shape = Shape::hasShape( window()); + is_tqshape = Shape::hasShape( window()); updateShape(); //CT extra check for stupid jdk 1.3.1. But should make sense in general @@ -573,9 +573,9 @@ void Client::embedClient( Window w, const XWindowAttributes &attr ) attr.depth, InputOutput, attr.visual, CWColormap | CWBackPixmap | CWBorderPixel, &swa ); - XDefineCursor( qt_xdisplay(), frame, arrowCursor.handle()); + XDefineCursor( qt_xdisplay(), frame, TQCursor(tqarrowCursor).handle()); // some apps are stupid and don't define their own cursor - set the arrow one for them - XDefineCursor( qt_xdisplay(), wrapper, arrowCursor.handle()); + XDefineCursor( qt_xdisplay(), wrapper, TQCursor(tqarrowCursor).handle()); XReparentWindow( qt_xdisplay(), client, wrapper, 0, 0 ); XSelectInput( qt_xdisplay(), frame, KeyPressMask | KeyReleaseMask | diff --git a/kwin/options.cpp b/kwin/options.cpp index cab703051..e6afd4a1d 100644 --- a/kwin/options.cpp +++ b/kwin/options.cpp @@ -95,7 +95,7 @@ unsigned long Options::updateSettings() placement = Placement::policyFromString( config->readEntry("Placement"), true ); xineramaPlacementScreen = KCLAMP( config->readNumEntry( "XineramaPlacementScreen", -1 ), - -1, qApp->desktop()->numScreens() - 1 ); + -1, tqApp->desktop()->numScreens() - 1 ); animateShade = config->readBoolEntry("AnimateShade", TRUE ); animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE ); @@ -195,11 +195,11 @@ unsigned long Options::updateSettings() // window drop shadows config->setGroup("Style"); - shadow_colour = config->readColorEntry("ShadowColour", &Qt::black); + shadow_colour = config->readColorEntry("ShadowColour", &TQt::black); shadow_docks = config->readBoolEntry("ShadowDocks", false); shadow_overrides = config->readBoolEntry("ShadowOverrides", false); shadow_topMenus = config->readBoolEntry("ShadowTopMenus", false); - shadow_inactive_colour = config->readColorEntry("InactiveShadowColour", &Qt::black); + shadow_inactive_colour = config->readColorEntry("InactiveShadowColour", &TQt::black); shadow_inactive_enabled = config->readBoolEntry("InactiveShadowEnabled", false); shadow_inactive_opacity = config->readDoubleNumEntry("InactiveShadowOpacity", 0.70); shadow_inactive_thickness = config->readNumEntry("InactiveShadowThickness", 5); @@ -379,7 +379,7 @@ int Options::electricBorderDelay() bool Options::checkIgnoreFocusStealing( const Client* c ) { - return ignoreFocusStealingClasses.contains(TQString::fromLatin1(c->resourceClass())); + return ignoreFocusStealingClasses.tqcontains(TQString::tqfromLatin1(c->resourceClass())); } Options::MouseCommand Options::wheelToMouseCommand( MouseWheelCommand com, int delta ) diff --git a/kwin/popupinfo.cpp b/kwin/popupinfo.cpp index f0e80640a..f2367b933 100644 --- a/kwin/popupinfo.cpp +++ b/kwin/popupinfo.cpp @@ -75,8 +75,8 @@ void PopupInfo::reset() void PopupInfo::paintEvent( TQPaintEvent* ) { TQPainter p( this ); - style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), - colorGroup(), TQStyle::Style_Default ); + tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), + tqcolorGroup(), TQStyle::Style_Default ); paintContents(); } @@ -90,7 +90,7 @@ void PopupInfo::paintContents() TQPainter p( this ); TQRect r( 6, 6, width()-12, height()-12 ); - p.fillRect( r, colorGroup().brush( TQColorGroup::Background ) ); + p.fillRect( r, tqcolorGroup().brush( TQColorGroup::Background ) ); /* p.setPen(Qt::white); diff --git a/kwin/popupinfo.h b/kwin/popupinfo.h index 734a44cbe..30ff76b30 100644 --- a/kwin/popupinfo.h +++ b/kwin/popupinfo.h @@ -20,7 +20,7 @@ namespace KWinInternal class Workspace; -class PopupInfo : public QWidget +class PopupInfo : public TQWidget { Q_OBJECT public: diff --git a/kwin/rules.cpp b/kwin/rules.cpp index cfcf4bc43..ed4a9a8b5 100644 --- a/kwin/rules.cpp +++ b/kwin/rules.cpp @@ -84,7 +84,7 @@ Rules::Rules( const TQString& str, bool temporary ) #define READ_MATCH_STRING( var, func ) \ var = cfg.readEntry( #var ) func; \ - var##match = (StringMatch) QMAX( FirstStringMatch, QMIN( LastStringMatch, cfg.readNumEntry( #var "match" ))); + var##match = (StringMatch) TQMAX( FirstStringMatch, TQMIN( LastStringMatch, cfg.readNumEntry( #var "match" ))); #define READ_SET_RULE( var, type, func ) \ var = func ( cfg.read##type##Entry( #var )); \ @@ -1038,7 +1038,7 @@ void Workspace::discardUsedWindowRules( Client* c, bool withdrawn ) it != rules.end(); ) { - if( c->rules()->contains( *it )) + if( c->rules()->tqcontains( *it )) { updated = true; (*it)->discardUsed( withdrawn ); diff --git a/kwin/rules.h b/kwin/rules.h index 584e6a952..bf1943de7 100644 --- a/kwin/rules.h +++ b/kwin/rules.h @@ -40,7 +40,7 @@ class WindowRules WindowRules(); void update( Client* ); void discardTemporary(); - bool contains( const Rules* rule ) const; + bool tqcontains( const Rules* rule ) const; void remove( Rules* rule ); Placement::Policy checkPlacement( Placement::Policy placement ) const; TQRect checkGeometry( TQRect rect, bool init = false ) const; @@ -284,15 +284,15 @@ WindowRules::WindowRules() } inline -bool WindowRules::contains( const Rules* rule ) const +bool WindowRules::tqcontains( const Rules* rule ) const { - return qFind( rules.begin(), rules.end(), rule ) != rules.end(); + return tqFind( rules.begin(), rules.end(), rule ) != rules.end(); } inline void WindowRules::remove( Rules* rule ) { - TQValueVector< Rules* >::Iterator pos = qFind( rules.begin(), rules.end(), rule ); + TQValueVector< Rules* >::Iterator pos = tqFind( rules.begin(), rules.end(), rule ); if( pos != rules.end()) rules.erase( pos ); } diff --git a/kwin/sm.cpp b/kwin/sm.cpp index 31cada7e0..045d4f924 100644 --- a/kwin/sm.cpp +++ b/kwin/sm.cpp @@ -259,13 +259,13 @@ bool Workspace::windowRoleMatch( const TQCString& role1, const TQCString& role2 { if( role1.isEmpty() && role2.isEmpty()) return true; - int pos1 = role1.find( '#' ); - int pos2 = role2.find( '#' ); + int pos1 = role1.tqfind( '#' ); + int pos2 = role2.tqfind( '#' ); bool ret; if( pos1 < 0 || pos2 < 0 || pos1 != pos2 ) ret = role1 == role2; else - ret = qstrncmp( role1, role2, pos1 ) == 0; + ret = tqstrncmp( role1, role2, pos1 ) == 0; kdDebug() << "WR:" << role1 << ":" << pos1 << ":" << role2 << ":" << pos2 << ":::" << ret << endl; return ret; } @@ -402,7 +402,7 @@ SessionSaveDoneHelper::SessionSaveDoneHelper() props[ 2 ].num_vals = 1; props[ 2 ].vals = &propvalue[ 2 ]; propvalue[ 3 ].length = 0; - propvalue[ 3 ].value = qApp->argv()[ 0 ]; + propvalue[ 3 ].value = tqApp->argv()[ 0 ]; props[ 3 ].name = const_cast< char* >( SmProgram ); props[ 3 ].type = const_cast< char* >( SmARRAY8 ); props[ 3 ].num_vals = 1; @@ -416,7 +416,7 @@ SessionSaveDoneHelper::SessionSaveDoneHelper() SmProp* p[ 5 ] = { &props[ 0 ], &props[ 1 ], &props[ 2 ], &props[ 3 ], &props[ 4 ] }; SmcSetProperties( conn, 5, p ); notifier = new TQSocketNotifier( IceConnectionNumber( SmcGetIceConnection( conn )), - TQSocketNotifier::Read, this ); + TQSocketNotifier::Read, TQT_TQOBJECT(this) ); connect( notifier, TQT_SIGNAL( activated( int )), TQT_SLOT( processData())); } diff --git a/kwin/tabbox.cpp b/kwin/tabbox.cpp index a79c10233..6d78b4242 100644 --- a/kwin/tabbox.cpp +++ b/kwin/tabbox.cpp @@ -43,7 +43,7 @@ namespace KWinInternal extern TQPixmap* kwin_get_menu_pix_hack(); TabBox::TabBox( Workspace *ws, const char *name ) - : TQFrame( 0, name, Qt::WNoAutoErase ), current_client( NULL ), wspace(ws) + : TQFrame( 0, name, WNoAutoErase ), current_client( NULL ), wspace(ws) { setFrameStyle(TQFrame::StyledPanel | TQFrame::Plain); setLineWidth(2); @@ -116,7 +116,7 @@ void TabBox::createClientList(ClientList &list, int desktop /*-1 = all*/, Client Client* modal = c->findModal(); if( modal == NULL || modal == c ) add = c; - else if( !list.contains( modal )) + else if( !list.tqcontains( modal )) add = modal; else { @@ -273,7 +273,7 @@ void TabBox::nextPrev( bool next) client = 0; break; } - } while ( client && !clients.contains( client )); + } while ( client && !clients.tqcontains( client )); setCurrentClient( client ); } else if( mode() == DesktopMode ) @@ -375,7 +375,7 @@ void TabBox::drawContents( TQPainter * ) pix.fill(this, 0, 0); TQPainter p; - p.begin(&pix, this); + p.tqbegin(&pix, this); TQPixmap* menu_pix = kwin_get_menu_pix_hack(); @@ -402,7 +402,7 @@ void TabBox::drawContents( TQPainter * ) { // draw highlight background if ( (*it) == current_client ) - p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight()); + p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight()); // draw icon TQPixmap icon; @@ -439,11 +439,11 @@ void TabBox::drawContents( TQPainter * ) // draw text if ( (*it) == current_client ) - p.setPen(colorGroup().highlightedText()); + p.setPen(tqcolorGroup().highlightedText()); else if( (*it)->isMinimized()) { - TQColor c1 = colorGroup().text(); - TQColor c2 = colorGroup().background(); + TQColor c1 = tqcolorGroup().text(); + TQColor c2 = tqcolorGroup().background(); // from kicker's TaskContainer::blendColors() int r1, g1, b1; int r2, g2, b2; @@ -458,10 +458,10 @@ void TabBox::drawContents( TQPainter * ) p.setPen(TQColor( r1, g1, b1 )); } else - p.setPen(colorGroup().text()); + p.setPen(tqcolorGroup().text()); p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight, - Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, s); + Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine, s); y += lineHeight; } @@ -496,13 +496,13 @@ void TabBox::drawContents( TQPainter * ) { // draw highlight background if ( iDesktop == desk ) // current desktop - p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight()); + p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight()); p.save(); // draw "icon" (here: number of desktop) - p.fillRect(x+5, y+2, iconWidth, iconHeight, colorGroup().base()); - p.setPen(colorGroup().text()); + p.fillRect(x+5, y+2, iconWidth, iconHeight, tqcolorGroup().base()); + p.setPen(tqcolorGroup().text()); p.drawRect(x+5, y+2, iconWidth, iconHeight); // draw desktop-number @@ -514,12 +514,12 @@ void TabBox::drawContents( TQPainter * ) // draw desktop name text if ( iDesktop == desk ) - p.setPen(colorGroup().highlightedText()); + p.setPen(tqcolorGroup().highlightedText()); else - p.setPen(colorGroup().text()); + p.setPen(tqcolorGroup().text()); p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight, - Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, + Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine, workspace()->desktopName(iDesktop)); // show mini icons from that desktop aligned to each other @@ -698,7 +698,7 @@ void TabBox::handleMouseEvent( XEvent* e ) if( e->type != ButtonPress ) return; TQPoint pos( e->xbutton.x_root, e->xbutton.y_root ); - if( !geometry().contains( pos )) + if( !tqgeometry().tqcontains( pos )) { workspace()->closeTabBox(); // click outside closes tab return; @@ -1229,7 +1229,7 @@ void Workspace::tabBoxKeyRelease( const XKeyEvent& ev ) int Workspace::nextDesktopFocusChain( int iDesktop ) const { - int i = desktop_focus_chain.find( iDesktop ); + int i = desktop_focus_chain.tqfind( iDesktop ); if( i >= 0 && i+1 < (int)desktop_focus_chain.size() ) return desktop_focus_chain[i+1]; else if( desktop_focus_chain.size() > 0 ) @@ -1240,7 +1240,7 @@ int Workspace::nextDesktopFocusChain( int iDesktop ) const int Workspace::previousDesktopFocusChain( int iDesktop ) const { - int i = desktop_focus_chain.find( iDesktop ); + int i = desktop_focus_chain.tqfind( iDesktop ); if( i-1 >= 0 ) return desktop_focus_chain[i-1]; else if( desktop_focus_chain.size() > 0 ) @@ -1257,7 +1257,7 @@ Client* Workspace::nextFocusChainClient( Client* c ) const { if ( global_focus_chain.isEmpty() ) return 0; - ClientList::ConstIterator it = global_focus_chain.find( c ); + ClientList::ConstIterator it = global_focus_chain.tqfind( c ); if ( it == global_focus_chain.end() ) return global_focus_chain.last(); if ( it == global_focus_chain.begin() ) @@ -1274,7 +1274,7 @@ Client* Workspace::previousFocusChainClient( Client* c ) const { if ( global_focus_chain.isEmpty() ) return 0; - ClientList::ConstIterator it = global_focus_chain.find( c ); + ClientList::ConstIterator it = global_focus_chain.tqfind( c ); if ( it == global_focus_chain.end() ) return global_focus_chain.first(); ++it; @@ -1291,7 +1291,7 @@ Client* Workspace::nextStaticClient( Client* c ) const { if ( !c || clients.isEmpty() ) return 0; - ClientList::ConstIterator it = clients.find( c ); + ClientList::ConstIterator it = clients.tqfind( c ); if ( it == clients.end() ) return clients.first(); ++it; @@ -1307,7 +1307,7 @@ Client* Workspace::previousStaticClient( Client* c ) const { if ( !c || clients.isEmpty() ) return 0; - ClientList::ConstIterator it = clients.find( c ); + ClientList::ConstIterator it = clients.tqfind( c ); if ( it == clients.end() ) return clients.last(); if ( it == clients.begin() ) diff --git a/kwin/tabbox.h b/kwin/tabbox.h index 926635e7d..d77633125 100644 --- a/kwin/tabbox.h +++ b/kwin/tabbox.h @@ -25,7 +25,7 @@ namespace KWinInternal class Workspace; class Client; -class TabBox : public QFrame +class TabBox : public TQFrame { Q_OBJECT public: diff --git a/kwin/tools/decobenchmark/main.cpp b/kwin/tools/decobenchmark/main.cpp index d0d165005..ca3ce11d2 100644 --- a/kwin/tools/decobenchmark/main.cpp +++ b/kwin/tools/decobenchmark/main.cpp @@ -40,7 +40,7 @@ static KCmdLineOptions options[] = { { "+decoration", "Decoration library to use, such as kwin3_plastik.", 0 }, - { "+tests", "Which test should be executed ('all', 'repaint', 'caption', 'resize', 'recreation')", 0 }, + { "+tests", "Which test should be executed ('all', 'tqrepaint', 'caption', 'resize', 'recreation')", 0 }, { "+repetitions", "Number of test repetitions.", 0 }, { 0, 0, 0 } }; @@ -117,7 +117,7 @@ int main(int argc, char** argv) Tests test; if (t == "all") test = AllTests; - else if (t == "repaint") + else if (t == "tqrepaint") test = RepaintTest; else if (t == "caption") test = CaptionTest; diff --git a/kwin/tools/decobenchmark/preview.cpp b/kwin/tools/decobenchmark/preview.cpp index 3cbcdcb5f..e4dfd0ec1 100644 --- a/kwin/tools/decobenchmark/preview.cpp +++ b/kwin/tools/decobenchmark/preview.cpp @@ -61,12 +61,12 @@ KDecorationPreview::~KDecorationPreview() void KDecorationPreview::performRepaintTest(int n) { - kdDebug() << "start " << n << " repaints..." << endl; + kdDebug() << "start " << n << " tqrepaints..." << endl; bridge->setCaption("Deco Benchmark"); deco->captionChange(); positionPreviews(0); for (int i = 0; i < n; ++i) { - deco->widget()->repaint(); + deco->widget()->tqrepaint(); kapp->processEvents(); } } @@ -79,7 +79,7 @@ void KDecorationPreview::performCaptionTest(int n) for (int i = 0; i < n; ++i) { bridge->setCaption(caption.arg(i) ); deco->captionChange(); - deco->widget()->repaint(); + deco->widget()->tqrepaint(); kapp->processEvents(); } } @@ -127,7 +127,7 @@ void KDecorationPreview::positionPreviews(int shrink) if ( !deco ) return; - TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->minimumSize()*/; + TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->tqminimumSize()*/; TQRect geometry(TQPoint(10, 10), size); deco->widget()->setGeometry(geometry); diff --git a/kwin/useractions.cpp b/kwin/useractions.cpp index 2821658c2..50e495496 100644 --- a/kwin/useractions.cpp +++ b/kwin/useractions.cpp @@ -229,7 +229,7 @@ void Workspace::desktopPopupAboutToShow() id = desk_popup->insertItem( basic_name .arg(i) - .arg( desktopName(i).replace( '&', "&&" )), + .arg( desktopName(i).tqreplace( '&', "&&" )), i ); if ( active_popup_client && !active_popup_client->isOnAllDesktops() && active_popup_client->desktop() == i ) @@ -293,7 +293,7 @@ void Workspace::setupWindowShortcut( Client* c ) client_keys_client = c; connect( client_keys_dialog, TQT_SIGNAL( dialogDone( bool )), TQT_SLOT( setupWindowShortcutDone( bool ))); TQRect r = clientArea( ScreenArea, c ); - TQSize size = client_keys_dialog->sizeHint(); + TQSize size = client_keys_dialog->tqsizeHint(); TQPoint pos = c->pos() + c->clientPos(); if( pos.x() + size.width() >= r.right()) pos.setX( r.right() - size.width()); @@ -1044,8 +1044,8 @@ void Workspace::showWindowMenu( const TQRect &pos, Client* cl ) else { TQRect area = clientArea(ScreenArea, TQPoint(x, y), currentDesktop()); - clientPopupAboutToShow(); // needed for sizeHint() to be correct :-/ - int popupHeight = p->sizeHint().height(); + clientPopupAboutToShow(); // needed for tqsizeHint() to be correct :-/ + int popupHeight = p->tqsizeHint().height(); if (y + popupHeight < area.height()) p->exec( TQPoint( x, y ) ); else @@ -1093,7 +1093,7 @@ void Client::setShortcut( const TQString& _cut ) // Format: // base+(abcdef)<space>base+(abcdef) // E.g. Alt+Ctrl+(ABCDEF) Win+X,Win+(ABCDEF) - if( !cut.contains( '(' ) && !cut.contains( ')' ) && !cut.contains( ' ' )) + if( !cut.tqcontains( '(' ) && !cut.tqcontains( ')' ) && !cut.tqcontains( ' ' )) { if( workspace()->shortcutAvailable( KShortcut( cut ), this )) setShortcutInternal( KShortcut( cut )); diff --git a/kwin/utils.cpp b/kwin/utils.cpp index 33bdd6299..67c3aa1c9 100644 --- a/kwin/utils.cpp +++ b/kwin/utils.cpp @@ -43,11 +43,11 @@ namespace KWinInternal // used to store the return values of // XShapeQueryExtension. -// Necessary since shaped window are an extension to X -int Shape::kwin_shape_version = 0; -int Shape::kwin_shape_event = 0; +// Necessary since tqshaped window are an extension to X +int Shape::kwin_tqshape_version = 0; +int Shape::kwin_tqshape_event = 0; -// does the window w need a shape combine mask around it? +// does the window w need a tqshape combine mask around it? bool Shape::hasShape( WId w) { int xws, yws, xbs, ybs; @@ -61,21 +61,21 @@ bool Shape::hasShape( WId w) return boundingShaped != 0; } -int Shape::shapeEvent() +int Shape::tqshapeEvent() { - return kwin_shape_event; + return kwin_tqshape_event; } void Shape::init() { - kwin_shape_version = 0; + kwin_tqshape_version = 0; int dummy; - if( !XShapeQueryExtension(qt_xdisplay(), &kwin_shape_event, &dummy)) + if( !XShapeQueryExtension(qt_xdisplay(), &kwin_tqshape_event, &dummy)) return; int major, minor; if( !XShapeQueryVersion( qt_xdisplay(), &major, &minor )) return; - kwin_shape_version = major * 0x10 + minor; + kwin_tqshape_version = major * 0x10 + minor; } void Motif::readFlags( WId w, bool& noborder, bool& resize, bool& move, diff --git a/kwin/utils.h b/kwin/utils.h index b1b2b2e2c..4521eeaa7 100644 --- a/kwin/utils.h +++ b/kwin/utils.h @@ -111,14 +111,14 @@ enum ShadeMode class Shape { public: - static bool available() { return kwin_shape_version > 0; } - static int version() { return kwin_shape_version; } // as 16*major+minor, i.e. two hex digits + static bool available() { return kwin_tqshape_version > 0; } + static int version() { return kwin_tqshape_version; } // as 16*major+minor, i.e. two hex digits static bool hasShape( WId w); - static int shapeEvent(); + static int tqshapeEvent(); static void init(); private: - static int kwin_shape_version; - static int kwin_shape_event; + static int kwin_tqshape_version; + static int kwin_tqshape_event; }; // compile with XShape older than 1.0 diff --git a/kwin/wm-spec/x351.html b/kwin/wm-spec/x351.html index 882f63fbf..2e827fbc1 100644 --- a/kwin/wm-spec/x351.html +++ b/kwin/wm-spec/x351.html @@ -97,10 +97,10 @@ NAME="AEN356" ></H2 ><P >This spec suggests implementing the file manager desktop by mapping a -desktop-sized window (no shape) to all desktops, with +desktop-sized window (no tqshape) to all desktops, with _NET_WM_WINDOW_TYPE_DESKTOP. This makes the desktop focusable and greatly simplifies implementation of the file manager. It is also faster than -managing lots of small shaped windows. The file manager draws the background +managing lots of small tqshaped windows. The file manager draws the background on this window. There should be a root property with a window handle for use in applications that want to draw the background (xearth). </P diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp index 2d4eea005..448732963 100644 --- a/kwin/workspace.cpp +++ b/kwin/workspace.cpp @@ -167,7 +167,7 @@ Workspace::Workspace( bool restore ) new TQWidget( 0, "desktop_widget", - Qt::WType_Desktop | Qt::WPaintUnclipped + (WFlags)(TQt::WType_Desktop | TQt::WPaintUnclipped) ); kapp->setGlobalMouseTracking( true ); // so that this doesn't mess eventmask on root window later @@ -539,9 +539,9 @@ void Workspace::addClient( Client* c, allowed_t ) updateFocusChains( c, FocusChainUpdate ); // add to focus chain if not already there clients.append( c ); } - if( !unconstrained_stacking_order.contains( c )) + if( !unconstrained_stacking_order.tqcontains( c )) unconstrained_stacking_order.append( c ); - if( !stacking_order.contains( c )) // it'll be updated later, and updateToolWindows() requires + if( !stacking_order.tqcontains( c )) // it'll be updated later, and updateToolWindows() requires stacking_order.append( c ); // c to be in stacking_order if( c->isTopMenu()) addTopMenu( c ); @@ -580,7 +580,7 @@ void Workspace::removeClient( Client* c, allowed_t ) if( c->isNormalWindow()) Notify::raise( Notify::Delete ); - Q_ASSERT( clients.contains( c ) || desktops.contains( c )); + Q_ASSERT( clients.tqcontains( c ) || desktops.tqcontains( c )); clients.remove( c ); desktops.remove( c ); unconstrained_stacking_order.remove( c ); @@ -641,7 +641,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change ) else focus_chain[ i ].prepend( c ); } - else if( !focus_chain[ i ].contains( c )) + else if( !focus_chain[ i ].tqcontains( c )) { // add it after the active one if( active_client != NULL && active_client != c && !focus_chain[ i ].isEmpty() && focus_chain[ i ].last() == active_client ) @@ -667,7 +667,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change ) focus_chain[ i ].remove( c ); focus_chain[ i ].prepend( c ); } - else if( !focus_chain[ i ].contains( c )) + else if( !focus_chain[ i ].tqcontains( c )) { if( active_client != NULL && active_client != c && !focus_chain[ i ].isEmpty() && focus_chain[ i ].last() == active_client ) @@ -690,7 +690,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change ) global_focus_chain.remove( c ); global_focus_chain.prepend( c ); } - else if( !global_focus_chain.contains( c )) + else if( !global_focus_chain.tqcontains( c )) { if( active_client != NULL && active_client != c && !global_focus_chain.isEmpty() && global_focus_chain.last() == active_client ) @@ -1000,7 +1000,7 @@ void Workspace::slotReconfigure() topmenu_selection->release(); lostTopMenuSelection(); } - topmenu_height = 0; // invalidate used menu height + topmenu_height = 0; // tqinvalidate used menu height if( managingTopMenus()) { updateTopMenuGeometry(); @@ -1039,7 +1039,7 @@ void Workspace::loadDesktopSettings() int n = c->readNumEntry("Number", 4); number_of_desktops = n; delete workarea; - workarea = new QRect[ n + 1 ]; + workarea = new TQRect[ n + 1 ]; delete screenarea; screenarea = NULL; rootInfo->setNumberOfDesktops( number_of_desktops ); @@ -1147,7 +1147,7 @@ void Workspace::refresh() going to be hidden are first obscured by new windows with no background ( i.e. transparent ) placed right below the windows. These invisible windows are removed after the switch is complete. - Reduces desktop ( wallpaper ) repaints during desktop switching + Reduces desktop ( wallpaper ) tqrepaints during desktop switching */ class ObscuringWindows { @@ -1271,7 +1271,7 @@ bool Workspace::setCurrentDesktop( int new_desktop ) { // Search in focus chain if ( movingClient != NULL && active_client == movingClient - && focus_chain[currentDesktop()].contains( active_client ) + && focus_chain[currentDesktop()].tqcontains( active_client ) && active_client->isShown( true ) && active_client->isOnCurrentDesktop()) { c = active_client; // the requestFocus below will fail, as the client is already active @@ -1314,8 +1314,8 @@ bool Workspace::setCurrentDesktop( int new_desktop ) // If input: chain = { 1, 2, 3, 4 } and current_desktop = 3, // Output: chain = { 3, 1, 2, 4 }. // kdDebug(1212) << TQString("Switching to desktop #%1, at focus_chain[currentDesktop()] index %2\n") -// .arg(currentDesktop()).arg(desktop_focus_chain.find( currentDesktop() )); - for( int i = desktop_focus_chain.find( currentDesktop() ); i > 0; i-- ) +// .arg(currentDesktop()).arg(desktop_focus_chain.tqfind( currentDesktop() )); + for( int i = desktop_focus_chain.tqfind( currentDesktop() ); i > 0; i-- ) desktop_focus_chain[i] = desktop_focus_chain[i-1]; desktop_focus_chain[0] = currentDesktop(); @@ -1562,7 +1562,7 @@ int Workspace::numScreens() const { if( !options->xineramaEnabled ) return 0; - return qApp->desktop()->numScreens(); + return tqApp->desktop()->numScreens(); } int Workspace::activeScreen() const @@ -1572,10 +1572,10 @@ int Workspace::activeScreen() const if( !options->activeMouseScreen ) { if( activeClient() != NULL && !activeClient()->isOnScreen( active_screen )) - return qApp->desktop()->screenNumber( activeClient()->geometry().center()); + return tqApp->desktop()->screenNumber( activeClient()->geometry().center()); return active_screen; } - return qApp->desktop()->screenNumber( TQCursor::pos()); + return tqApp->desktop()->screenNumber( TQCursor::pos()); } // check whether a client moved completely out of what's considered the active screen, @@ -1596,21 +1596,21 @@ void Workspace::setActiveScreenMouse( TQPoint mousepos ) { if( !options->xineramaEnabled ) return; - active_screen = qApp->desktop()->screenNumber( mousepos ); + active_screen = tqApp->desktop()->screenNumber( mousepos ); } TQRect Workspace::screenGeometry( int screen ) const { if (( !options->xineramaEnabled ) || (kapp->desktop()->numScreens() < 2)) - return qApp->desktop()->geometry(); - return qApp->desktop()->screenGeometry( screen ); + return tqApp->desktop()->geometry(); + return tqApp->desktop()->screenGeometry( screen ); } int Workspace::screenNumber( TQPoint pos ) const { if( !options->xineramaEnabled ) return 0; - return qApp->desktop()->screenNumber( pos ); + return tqApp->desktop()->screenNumber( pos ); } void Workspace::sendClientToScreen( Client* c, int screen ) @@ -1669,7 +1669,7 @@ void Workspace::calcDesktopLayout(int &x, int &y) const */ bool Workspace::addSystemTrayWin( WId w ) { - if ( systemTrayWins.contains( w ) ) + if ( systemTrayWins.tqcontains( w ) ) return TRUE; NETWinInfo ni( qt_xdisplay(), w, root, NET::WMKDESystemTrayWinFor ); @@ -1691,7 +1691,7 @@ bool Workspace::addSystemTrayWin( WId w ) */ bool Workspace::removeSystemTrayWin( WId w, bool check ) { - if ( !systemTrayWins.contains( w ) ) + if ( !systemTrayWins.tqcontains( w ) ) return FALSE; if( check ) { @@ -1798,7 +1798,7 @@ void Workspace::slotGrabWindow() int count, order; XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), active_client->frameId(), ShapeBounding, &count, &order); - //The ShapeBounding region is the outermost shape of the window; + //The ShapeBounding region is the outermost tqshape of the window; //ShapeBounding - ShapeClipping is defined to be the border. //Since the border area is part of the window, we use bounding // to limit our work region @@ -1816,7 +1816,7 @@ void Workspace::slotGrabWindow() //Get the masked away area. TQRegion maskedAway = bbox - contents; - TQMemArray<TQRect> maskedAwayRects = maskedAway.rects(); + TQMemArray<TQRect> maskedAwayRects = maskedAway.tqrects(); //Construct a bitmap mask from the rectangles TQBitmap mask( snapshot.width(), snapshot.height()); @@ -1906,7 +1906,7 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation { if ( !w ) return state; - TQWidget* widget = TQWidget::find( w ); + TQWidget* widget = TQWidget::tqfind( w ); if ( (!widget || widget->inherits("QToolButton") ) && !findClient( WindowMatchPredicate( w )) ) { int x, y; @@ -2381,7 +2381,7 @@ void Workspace::raiseElectricBorders() void Workspace::addTopMenu( Client* c ) { assert( c->isTopMenu()); - assert( !topmenus.contains( c )); + assert( !topmenus.tqcontains( c )); topmenus.append( c ); if( managingTopMenus()) { @@ -2402,7 +2402,7 @@ void Workspace::removeTopMenu( Client* c ) // if( c->isTopMenu()) // kdDebug() << "REMOVE TOPMENU:" << c << endl; assert( c->isTopMenu()); - assert( topmenus.contains( c )); + assert( topmenus.tqcontains( c )); topmenus.remove( c ); updateCurrentTopMenu(); // TODO reduce topMenuHeight() if possible? @@ -2466,7 +2466,7 @@ int Workspace::topMenuHeight() const { // simply create a dummy menubar and use its preffered height as the menu height KMenuBar tmpmenu; tmpmenu.insertItem( "dummy" ); - topmenu_height = tmpmenu.sizeHint().height(); + topmenu_height = tmpmenu.tqsizeHint().height(); } return topmenu_height; } @@ -2650,20 +2650,20 @@ void Workspace::handleKompmgrOutput( KProcess* , char *buffer, int buflen) { TQString message; TQString output = TQString::fromLocal8Bit( buffer, buflen ); - if (output.contains("Started",false)) + if (output.tqcontains("Started",false)) ; // don't do anything, just pass to the connection release - else if (output.contains("Can't open display",false)) + else if (output.tqcontains("Can't open display",false)) message = i18n("<qt><b>kompmgr failed to open the display</b><br>There is probably an invalid display entry in your ~/.xcompmgrrc.</qt>"); - else if (output.contains("No render extension",false)) + else if (output.tqcontains("No render extension",false)) message = i18n("<qt><b>kompmgr cannot find the Xrender extension</b><br>You are using either an outdated or a crippled version of XOrg.<br>Get XOrg ≥ 6.8 from www.freedesktop.org.<br></qt>"); - else if (output.contains("No composite extension",false)) + else if (output.tqcontains("No composite extension",false)) message = i18n("<qt><b>Composite extension not found</b><br>You <i>must</i> use XOrg ≥ 6.8 for translucency and shadows to work.<br>Additionally, you need to add a new section to your X config file:<br>" "<i>Section \"Extensions\"<br>" "Option \"Composite\" \"Enable\"<br>" "EndSection</i></qt>"); - else if (output.contains("No damage extension",false)) + else if (output.tqcontains("No damage extension",false)) message = i18n("<qt><b>Damage extension not found</b><br>You <i>must</i> use XOrg ≥ 6.8 for translucency and shadows to work.</qt>"); - else if (output.contains("No XFixes extension",false)) + else if (output.tqcontains("No XFixes extension",false)) message = i18n("<qt><b>XFixes extension not found</b><br>You <i>must</i> use XOrg ≥ 6.8 for translucency and shadows to work.</qt>"); else return; //skip others // kompmgr startup failed or succeeded, release connection diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp index 3817a8c4c..09ab7abc0 100644 --- a/kxkb/extension.cpp +++ b/kxkb/extension.cpp @@ -125,7 +125,7 @@ bool XKBExtension::setLayout(const TQString& model, const TQString layoutKey = getLayoutKey(layout, variant); bool res; - if( fileCache.contains(layoutKey) ) { + if( fileCache.tqcontains(layoutKey) ) { res = setCompiledLayout( layoutKey ); kdDebug() << "setCompiledLayout " << layoutKey << ": " << res << endl; @@ -224,7 +224,7 @@ bool XKBExtension::compileCurrentLayout(const TQString &layoutKey) const TQString fileName = getPrecompiledLayoutFilename(layoutKey); kdDebug() << "compiling layout " << this << " cache size: " << fileCache.count() << endl; - if( fileCache.contains(layoutKey) ) { + if( fileCache.tqcontains(layoutKey) ) { kdDebug() << "trashing old compiled layout for " << fileName << endl; if( fileCache[ layoutKey ] != NULL ) fclose( fileCache[ layoutKey ] ); // recompiling - trash the old file @@ -263,7 +263,7 @@ bool XKBExtension::setCompiledLayout(const TQString &layoutKey) { FILE *input = NULL; - if( fileCache.contains(layoutKey) ) { + if( fileCache.tqcontains(layoutKey) ) { input = fileCache[ layoutKey ]; } diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp index 7af7ae691..e4a86243d 100644 --- a/kxkb/kcmlayout.cpp +++ b/kxkb/kcmlayout.cpp @@ -48,7 +48,7 @@ enum { static const TQString DEFAULT_VARIANT_NAME("<default>"); -class OptionListItem : public QCheckListItem +class OptionListItem : public TQCheckListItem { public: @@ -101,39 +101,39 @@ LayoutConfig::LayoutConfig(TQWidget *parent, const char *name) TQVBoxLayout *main = new TQVBoxLayout(this, 0, KDialog::spacingHint()); widget = new LayoutConfigWidget(this, "widget"); - main->addWidget(widget); + main->addWidget(TQT_TQWIDGET(widget)); - connect( widget->chkEnable, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT(changed())); - connect( widget->chkShowSingle, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT(changed())); - connect( widget->chkShowFlag, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT(changed())); - connect( widget->comboModel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); + connect( TQT_TQOBJECT(widget->chkEnable), TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( TQT_TQOBJECT(widget->chkShowSingle), TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( TQT_TQOBJECT(widget->chkShowFlag), TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( TQT_TQOBJECT(widget->comboModel), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changed())); - connect( widget->listLayoutsSrc, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&, int)), - this, TQT_SLOT(add())); - connect( widget->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); - connect( widget->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove())); + connect( TQT_TQOBJECT(widget->listLayoutsSrc), TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&, int)), + TQT_TQOBJECT(this), TQT_SLOT(add())); + connect( TQT_TQOBJECT(widget->btnAdd), TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(add())); + connect( TQT_TQOBJECT(widget->btnRemove), TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(remove())); - connect( widget->comboVariant, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect( widget->comboVariant, TQT_SIGNAL(activated(int)), this, TQT_SLOT(variantChanged())); - connect( widget->listLayoutsDst, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(layoutSelChanged(TQListViewItem *))); + connect( TQT_TQOBJECT(widget->comboVariant), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( TQT_TQOBJECT(widget->comboVariant), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(variantChanged())); + connect( TQT_TQOBJECT(widget->listLayoutsDst), TQT_SIGNAL(selectionChanged(TQListViewItem *)), + TQT_TQOBJECT(this), TQT_SLOT(layoutSelChanged(TQListViewItem *))); - connect( widget->editDisplayName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(displayNameChanged(const TQString&))); + connect( widget->editDisplayName, TQT_SIGNAL(textChanged(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(displayNameChanged(const TQString&))); - connect( widget->chkLatin, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect( widget->chkLatin, TQT_SIGNAL(clicked()), this, TQT_SLOT(latinChanged())); + connect( widget->chkLatin, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( widget->chkLatin, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(latinChanged())); widget->btnUp->setIconSet(SmallIconSet("1uparrow")); - connect( widget->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect( widget->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveUp())); + connect( widget->btnUp, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( widget->btnUp, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(moveUp())); widget->btnDown->setIconSet(SmallIconSet("1downarrow")); - connect( widget->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect( widget->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveDown())); + connect( widget->btnDown, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( widget->btnDown, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(moveDown())); connect( widget->grpSwitching, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed())); - connect( widget->chkEnableSticky, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed())); - connect( widget->spinStickyDepth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect( widget->chkEnableSticky, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( widget->spinStickyDepth, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(changed())); widget->listLayoutsSrc->setColumnText(LAYOUT_COLUMN_FLAG, ""); widget->listLayoutsDst->setColumnText(LAYOUT_COLUMN_FLAG, ""); @@ -245,7 +245,7 @@ void LayoutConfig::initUI() { for (TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it) { TQString option = *it; - TQString optionKey = option.mid(0, option.find(':')); + TQString optionKey = option.mid(0, option.tqfind(':')); TQString optionName = m_rules->options()[option]; OptionListItem *item = m_optionGroups[i18n(optionKey.latin1())]; @@ -444,7 +444,7 @@ void LayoutConfig::displayNameChanged(const TQString& newDisplayName) return; const LayoutUnit layoutUnitKey = getLayoutUnitKey( selLayout ); - LayoutUnit& layoutUnit = *m_kxkbConfig.m_layouts.find(layoutUnitKey); + LayoutUnit& layoutUnit = *m_kxkbConfig.m_layouts.tqfind(layoutUnitKey); TQString oldName = selLayout->text(LAYOUT_COLUMN_DISPLAY_NAME); @@ -557,7 +557,7 @@ TQWidget* LayoutConfig::makeOptionsTab() OptionListItem *parent; for (; it.current(); ++it) { - if (!it.currentKey().contains(':')) + if (!it.currentKey().tqcontains(':')) { if( it.currentKey() == "ctrl" || it.currentKey() == "caps" || it.currentKey() == "altwin" ) { @@ -580,7 +580,7 @@ TQWidget* LayoutConfig::makeOptionsTab() for( ; it.current(); ++it) { TQString key = it.currentKey(); - int pos = key.find(':'); + int pos = key.tqfind(':'); if (pos >= 0) { OptionListItem *parent = m_optionGroups[key.left(pos)]; @@ -589,7 +589,7 @@ TQWidget* LayoutConfig::makeOptionsTab() if (parent != NULL) { // workaroung for mistake in rules file for xkb options in XFree 4.2.0 TQString text(it.current()); - text = text.replace( "Cap$", "Caps." ); + text = text.tqreplace( "Cap$", "Caps." ); if( parent->type() == TQCheckListItem::RadioButtonController ) new OptionListItem(parent, i18n(text.utf8()), TQCheckListItem::RadioButton, key); @@ -639,7 +639,7 @@ void LayoutConfig::updateLayoutCommand() setxkbmap += ",us"; /* LayoutUnit layoutUnitKey = getLayoutUnitKey(sel); - layoutDisplayName = m_kxkbConfig.getLayoutDisplayName( *m_kxkbConfig.m_layouts.find(layoutUnitKey) );*/ + layoutDisplayName = m_kxkbConfig.getLayoutDisplayName( *m_kxkbConfig.m_layouts.tqfind(layoutUnitKey) );*/ layoutDisplayName = sel->text(LAYOUT_COLUMN_DISPLAY_NAME); if( layoutDisplayName.isEmpty() ) { int count = 0; @@ -724,9 +724,9 @@ TQString LayoutConfig::createOptionString() { TQString option(it.currentKey()); - if (option.contains(':')) { + if (option.tqcontains(':')) { - TQString optionKey = option.mid(0, option.find(':')); + TQString optionKey = option.mid(0, option.tqfind(':')); OptionListItem *item = m_optionGroups[optionKey]; if( !item ) { diff --git a/kxkb/kcmlayoutwidget.ui b/kxkb/kcmlayoutwidget.ui index 82c866009..bc1225bfb 100644 --- a/kxkb/kcmlayoutwidget.ui +++ b/kxkb/kcmlayoutwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>LayoutConfigWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>LayoutConfigWidget</cstring> </property> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>600</width> <height>510</height> @@ -30,17 +30,17 @@ <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>tabWidget</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>600</width> <height>500</height> </size> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tabLayout</cstring> </property> @@ -51,7 +51,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>chkEnable</cstring> </property> @@ -62,7 +62,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>grpLayouts</cstring> </property> @@ -76,7 +76,7 @@ <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>textLabel1_4</cstring> </property> @@ -84,7 +84,7 @@ <string>Available layouts:</string> </property> </widget> - <widget class="QLabel" row="2" column="2" rowspan="1" colspan="3"> + <widget class="TQLabel" row="2" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1_4_2</cstring> </property> @@ -92,7 +92,7 @@ <string>Active layouts:</string> </property> </widget> - <widget class="QLabel" row="0" column="2" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -103,7 +103,7 @@ <cstring>comboModel</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="2" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="1" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>comboModel</cstring> </property> @@ -120,7 +120,7 @@ </string> </property> </widget> - <widget class="QListView" row="3" column="2" rowspan="1" colspan="3"> + <widget class="TQListView" row="3" column="2" rowspan="1" colspan="3"> <column> <property name="text"> <string>1</string> @@ -197,7 +197,7 @@ <string>If more than one layout is present in this list, the KDE panel will offer a docked flag. By clicking on this flag you can easily switch between layouts. The first layout will be default one.</string> </property> </widget> - <widget class="QLayoutWidget" row="4" column="2" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="4" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>layout10</cstring> </property> @@ -205,7 +205,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnAdd</cstring> </property> @@ -213,7 +213,7 @@ <string>Add >></string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnRemove</cstring> </property> @@ -221,7 +221,7 @@ <string><< Remove</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnUp</cstring> </property> @@ -237,7 +237,7 @@ <string></string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnDown</cstring> </property> @@ -255,7 +255,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="8" column="0"> + <widget class="TQLabel" row="8" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -266,7 +266,7 @@ <cstring>editCmdLine</cstring> </property> </widget> - <widget class="QListView" row="3" column="0" rowspan="5" colspan="2"> + <widget class="TQListView" row="3" column="0" rowspan="5" colspan="2"> <column> <property name="text"> <string></string> @@ -303,7 +303,7 @@ <property name="name"> <cstring>listLayoutsSrc</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>260</width> <height>0</height> @@ -316,7 +316,7 @@ <string>This is the list of available keyboard layouts in your system. You can add layout to the active list by selecting it and pressing "Add" button.</string> </property> </widget> - <widget class="QLineEdit" row="8" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="8" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>editCmdLine</cstring> </property> @@ -327,7 +327,7 @@ <string>This is the command which is executed when switching to the selected layout. It may help you if you want to debug layout switching, or if you want to switch layouts without the help of KDE.</string> </property> </widget> - <widget class="QCheckBox" row="7" column="2" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="7" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>chkLatin</cstring> </property> @@ -341,7 +341,7 @@ <string>If after you switch to this layout some keyboard shortcuts based on latin keys do not work try to enable this option.</string> </property> </widget> - <widget class="QLabel" row="6" column="2"> + <widget class="TQLabel" row="6" column="2"> <property name="name"> <cstring>textLabel1_6</cstring> </property> @@ -352,7 +352,7 @@ <cstring>editDisplayName</cstring> </property> </widget> - <widget class="QLineEdit" row="6" column="3"> + <widget class="TQLineEdit" row="6" column="3"> <property name="name"> <cstring>editDisplayName</cstring> </property> @@ -363,7 +363,7 @@ <number>3</number> </property> </widget> - <widget class="QLabel" row="5" column="2"> + <widget class="TQLabel" row="5" column="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -374,7 +374,7 @@ <cstring>comboVariant</cstring> </property> </widget> - <widget class="QComboBox" row="5" column="3"> + <widget class="TQComboBox" row="5" column="3"> <property name="name"> <cstring>comboVariant</cstring> </property> @@ -393,7 +393,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>210</width> <height>20</height> @@ -410,7 +410,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>210</width> <height>20</height> @@ -421,7 +421,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -442,14 +442,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QFrame" row="0" column="0"> + <widget class="TQFrame" row="0" column="0"> <property name="name"> <cstring>optionsFrame</cstring> </property> @@ -466,7 +466,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="2" column="0"> + <widget class="TQButtonGroup" row="2" column="0"> <property name="name"> <cstring>grpSwitching</cstring> </property> @@ -483,7 +483,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton1</cstring> </property> @@ -494,7 +494,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton1_3</cstring> </property> @@ -502,7 +502,7 @@ <string>Application</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton1_2</cstring> </property> @@ -512,7 +512,7 @@ </widget> </vbox> </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>chkShowFlag</cstring> </property> @@ -526,7 +526,7 @@ <string>Shows country flag on background of layout name in tray icon</string> </property> </widget> - <widget class="QGroupBox" row="2" column="1"> + <widget class="TQGroupBox" row="2" column="1"> <property name="name"> <cstring>grpBoxStickySwitching</cstring> </property> @@ -537,7 +537,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <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>chkEnableSticky</cstring> </property> @@ -548,7 +548,7 @@ <string>If you have more than two layouts and turn this option on, switching with the keyboard shortcut or clicking on the kxkb indicator will only cycle through the last few layouts. You can specify the number of layouts to rotate below. You can still access all layouts by right-clicking on the kxkb indicator.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_5</cstring> </property> @@ -562,7 +562,7 @@ <cstring>spinBox1</cstring> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>spinStickyDepth</cstring> </property> @@ -578,7 +578,7 @@ </widget> </grid> </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>chkShowSingle</cstring> </property> @@ -590,7 +590,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tabOptions</cstring> </property> @@ -601,7 +601,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chkEnableOptions</cstring> </property> @@ -612,7 +612,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3_2</cstring> </property> @@ -626,7 +626,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <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>checkResetOld</cstring> </property> @@ -634,7 +634,7 @@ <string>&Reset old options</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_3_2</cstring> </property> @@ -642,7 +642,7 @@ <string>Command:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>editCmdLineOpt</cstring> </property> @@ -650,7 +650,7 @@ <bool>true</bool> </property> </widget> - <widget class="QListView" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQListView" row="1" column="0" rowspan="1" colspan="2"> <column> <property name="text"> <string>Options</string> diff --git a/kxkb/kcmmiscwidget.ui b/kxkb/kcmmiscwidget.ui index 479188293..9fff22b4c 100644 --- a/kxkb/kcmmiscwidget.ui +++ b/kxkb/kcmmiscwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KeyboardConfigWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KeyboardConfigWidget</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <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>numlockGroup</cstring> </property> @@ -39,7 +39,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>RadioButton1_2</cstring> </property> @@ -50,7 +50,7 @@ <number>1</number> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>RadioButton1_3</cstring> </property> @@ -61,7 +61,7 @@ <number>2</number> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>RadioButton1</cstring> </property> @@ -74,7 +74,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -85,7 +85,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDelay</cstring> </property> @@ -104,7 +104,7 @@ <cstring>delay</cstring> </property> </widget> - <widget class="QSlider" row="1" column="1"> + <widget class="TQSlider" row="1" column="1"> <property name="name"> <cstring>delaySlider</cstring> </property> @@ -156,7 +156,7 @@ <string>If supported, this option allows you to set the delay after which a pressed key will start generating keycodes. The 'Repeat rate' option controls the frequency of these keycodes.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblRate</cstring> </property> @@ -175,7 +175,7 @@ <cstring>rate</cstring> </property> </widget> - <widget class="QSlider" row="2" column="1" rowspan="1" colspan="1"> + <widget class="TQSlider" row="2" column="1" rowspan="1" colspan="1"> <property name="name"> <cstring>rateSlider</cstring> </property> @@ -230,7 +230,7 @@ <string>If supported, this option allows you to set the rate at which keycodes are generated while a key is pressed.</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>repeatBox</cstring> </property> @@ -266,7 +266,7 @@ <string>If supported, this option allows you to hear audible clicks from your computer's speakers when you press the keys on your keyboard. This might be useful if your keyboard does not have mechanical keys, or if the sound that the keys make is very soft.<p>You can change the loudness of the key click feedback by dragging the slider button or by clicking the up/down arrows on the spin box. Setting the volume to 0% turns off the key click.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 43e9f8046..06b64e59a 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -73,7 +73,7 @@ KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled) } // keep in sync with kcmlayout.cpp - keys = new KGlobalAccel(this); + keys = new KGlobalAccel(TQT_TQOBJECT(this)); #include "kxkbbindings.cpp" keys->updateConnections(); @@ -217,8 +217,8 @@ void KXKBApp::layoutApply() bool KXKBApp::setLayout(const TQString& layoutPair) { const LayoutUnit layoutUnitKey(layoutPair); - if( kxkbConfig.m_layouts.contains(layoutUnitKey) ) { - return setLayout( *kxkbConfig.m_layouts.find(layoutUnitKey) ); + if( kxkbConfig.m_layouts.tqcontains(layoutUnitKey) ) { + return setLayout( *kxkbConfig.m_layouts.tqfind(layoutUnitKey) ); } return false; } diff --git a/kxkb/kxkbbindings.cpp b/kxkb/kxkbbindings.cpp index 3a6137ee1..9d8ebddf5 100644 --- a/kxkb/kxkbbindings.cpp +++ b/kxkb/kxkbbindings.cpp @@ -1,9 +1,9 @@ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString(), key3, key4 ) #endif keys->insert( "Program:kxkb", i18n("Keyboard") ); diff --git a/kxkb/kxkbconfig.cpp b/kxkb/kxkbconfig.cpp index 0e62fbc21..e357abcb7 100644 --- a/kxkb/kxkbconfig.cpp +++ b/kxkb/kxkbconfig.cpp @@ -78,7 +78,7 @@ bool KxkbConfig::load(int loadMode) m_layouts.clear(); for(TQStringList::ConstIterator it = layoutList.begin(); it != layoutList.end() ; ++it) { m_layouts.append( LayoutUnit(*it) ); - kdDebug() << " layout " << LayoutUnit(*it).toPair() << " in list: " << m_layouts.contains( LayoutUnit(*it) ) << endl; + kdDebug() << " layout " << LayoutUnit(*it).toPair() << " in list: " << m_layouts.tqcontains( LayoutUnit(*it) ) << endl; } kdDebug() << "Found " << m_layouts.count() << " layouts, default is " << getDefaultLayout().toPair() << endl; @@ -88,8 +88,8 @@ bool KxkbConfig::load(int loadMode) TQStringList displayNamePair = TQStringList::split(':', *it ); if( displayNamePair.count() == 2 ) { LayoutUnit layoutUnit( displayNamePair[0] ); - if( m_layouts.contains( layoutUnit ) ) { - m_layouts[m_layouts.findIndex(layoutUnit)].displayName = displayNamePair[1].left(3); + if( m_layouts.tqcontains( layoutUnit ) ) { + m_layouts[m_layouts.tqfindIndex(layoutUnit)].displayName = displayNamePair[1].left(3); } } } @@ -102,8 +102,8 @@ bool KxkbConfig::load(int loadMode) TQStringList includePair = TQStringList::split(':', *it ); if( includePair.count() == 2 ) { LayoutUnit layoutUnit( includePair[0] ); - if( m_layouts.contains( layoutUnit ) ) { - m_layouts[m_layouts.findIndex(layoutUnit)].includeGroup = includePair[1]; + if( m_layouts.tqcontains( layoutUnit ) ) { + m_layouts[m_layouts.tqfindIndex(layoutUnit)].includeGroup = includePair[1]; kdDebug() << "Got inc group: " << includePair[0] << ": " << includePair[1] << endl; } } @@ -115,10 +115,10 @@ bool KxkbConfig::load(int loadMode) for(TQStringList::ConstIterator it = includeList.begin(); it != includeList.end() ; ++it) { TQString layoutName = LayoutUnit::parseLayout( *it ); LayoutUnit layoutUnit( layoutName, "" ); - kdDebug() << "old layout for inc: " << layoutUnit.toPair() << " included " << m_layouts.contains( layoutUnit ) << endl; - if( m_layouts.contains( layoutUnit ) ) { + kdDebug() << "old layout for inc: " << layoutUnit.toPair() << " included " << m_layouts.tqcontains( layoutUnit ) << endl; + if( m_layouts.tqcontains( layoutUnit ) ) { TQString variantName = LayoutUnit::parseVariant(*it); - m_layouts[m_layouts.findIndex(layoutUnit)].includeGroup = variantName; + m_layouts[m_layouts.tqfindIndex(layoutUnit)].includeGroup = variantName; kdDebug() << "Got inc group: " << layoutUnit.toPair() << ": " << variantName << endl; } } @@ -276,7 +276,7 @@ TQString KxkbConfig::getDefaultDisplayName(const TQString& code_) displayName = code_; } else { - int sepPos = code_.find(TQRegExp("[-_]")); + int sepPos = code_.tqfind(TQRegExp("[-_]")); TQString leftCode = code_.mid(0, sepPos); TQString rightCode; if( sepPos != -1 ) diff --git a/kxkb/kxkbtraywindow.h b/kxkb/kxkbtraywindow.h index 089a7906b..38e42db5d 100644 --- a/kxkb/kxkbtraywindow.h +++ b/kxkb/kxkbtraywindow.h @@ -78,7 +78,7 @@ class KxkbSystemTray : public KSystemTray void mouseReleaseEvent(TQMouseEvent *ev) { - if (ev->button() == TQMouseEvent::LeftButton) + if (ev->button() == Qt::LeftButton) emit toggled(); KSystemTray::mouseReleaseEvent(ev); } diff --git a/kxkb/pixmap.cpp b/kxkb/pixmap.cpp index 0ca1500e3..ea685715b 100644 --- a/kxkb/pixmap.cpp +++ b/kxkb/pixmap.cpp @@ -83,7 +83,7 @@ LayoutIcon::findPixmap(const TQString& code_, bool showFlag, const TQString& dis if( pm->height() < FLAG_MAX_HEIGHT ) { TQPixmap* pix = new TQPixmap(FLAG_MAX_WIDTH, FLAG_MAX_HEIGHT); pix->fill( Qt::lightGray ); -// pix->fill( TQColor(qRgba(127,127,127,255)) ); +// pix->fill( TQColor(tqRgba(127,127,127,255)) ); // TQBitmap mask; // mask.fill(1); // pix->setMask(mask); @@ -183,7 +183,7 @@ TQString LayoutIcon::getCountryFromLayoutName(const TQString& layoutName) || layoutName == "tel" || layoutName == "tml" || layoutName == "ben" ) // some Indian languages flag = "in"; else { - int sepPos = layoutName.find(TQRegExp("[-_]")); + int sepPos = layoutName.tqfind(TQRegExp("[-_]")); TQString leftCode = layoutName.mid(0, sepPos); TQString rightCode; if( sepPos != -1 ) @@ -211,7 +211,7 @@ void LayoutIcon::dimPixmap(TQPixmap& pm) for(int x=0; x<image.width(); x++) { QRgb rgb = image.pixel(x,y); - QRgb dimRgb(qRgb(qRed(rgb)*3/4, qGreen(rgb)*3/4, qBlue(rgb)*3/4)); + QRgb dimRgb(tqRgb(tqRed(rgb)*3/4, tqGreen(rgb)*3/4, tqBlue(rgb)*3/4)); image.setPixel(x, y, dimRgb); } pm.convertFromImage(image); diff --git a/kxkb/rules.cpp b/kxkb/rules.cpp index dbf5b823d..2abe3f154 100644 --- a/kxkb/rules.cpp +++ b/kxkb/rules.cpp @@ -74,7 +74,7 @@ void XkbRules::loadRules(TQString file, bool layoutsOnly) // }; // // for(int i=0; fixedLayouts[i].layout != 0; i++ ) { -// if( m_layouts.find(fixedLayouts[i].locale) == 0 ) +// if( m_layouts.tqfind(fixedLayouts[i].locale) == 0 ) // m_layouts.insert(fixedLayouts[i].locale, fixedLayouts[i].layout); // } // } @@ -82,8 +82,8 @@ void XkbRules::loadRules(TQString file, bool layoutsOnly) bool XkbRules::isSingleGroup(const TQString& layout) { return X11Helper::areSingleGroupsSupported() - && !m_oldLayouts.contains(layout) - && !m_nonLatinLayouts.contains(layout); + && !m_oldLayouts.tqcontains(layout) + && !m_nonLatinLayouts.tqcontains(layout); } @@ -131,22 +131,22 @@ XkbRules::getDefaultGroup(const TQString& layout, const TQString& includeGroup) return 0; } - TQMap<TQString, unsigned int>::iterator it = m_initialGroups.find(layout); + TQMap<TQString, unsigned int>::iterator it = m_initialGroups.tqfind(layout); return it == m_initialGroups.end() ? 0 : it.data(); } -QStringList +TQStringList XkbRules::getAvailableVariants(const TQString& layout) { - if( layout.isEmpty() || !layouts().find(layout) ) + if( layout.isEmpty() || !layouts().tqfind(layout) ) return TQStringList(); TQStringList* result1 = m_varLists[layout]; if( result1 ) return *result1; - bool oldLayouts = m_oldLayouts.contains(layout); + bool oldLayouts = m_oldLayouts.tqcontains(layout); TQStringList* result = X11Helper::getVariants(layout, X11_DIR, oldLayouts); m_varLists.insert(layout, result); diff --git a/kxkb/x11helper.cpp b/kxkb/x11helper.cpp index e8f13f6aa..cae856720 100644 --- a/kxkb/x11helper.cpp +++ b/kxkb/x11helper.cpp @@ -59,7 +59,7 @@ static const TQRegExp NON_CLEAN_LAYOUT_REGEXP("[^a-z]"); bool X11Helper::m_layoutsClean = true; -const QString +const TQString X11Helper::findX11Dir() { for(int ii=0; ii<X11_DIR_COUNT; ii++) { @@ -78,7 +78,7 @@ X11Helper::findX11Dir() return NULL; } -const QString +const TQString X11Helper::findXkbRulesFile(TQString x11Dir, Display *dpy) { TQString rulesFile; @@ -120,10 +120,10 @@ X11Helper::loadRules(const TQString& file, bool layoutsOnly) for (int i = 0; i < xkbRules->layouts.num_desc; ++i) { TQString layoutName(xkbRules->layouts.desc[i].name); - rulesInfo->layouts.replace( layoutName, qstrdup( xkbRules->layouts.desc[i].desc ) ); + rulesInfo->layouts.tqreplace( layoutName, qstrdup( xkbRules->layouts.desc[i].desc ) ); if( m_layoutsClean == true - && layoutName.find( NON_CLEAN_LAYOUT_REGEXP ) != -1 + && layoutName.tqfind( NON_CLEAN_LAYOUT_REGEXP ) != -1 && layoutName.endsWith("/jp") == false ) { kdDebug() << "Layouts are not clean (Xorg < 6.9.0 or XFree86)" << endl; m_layoutsClean = false; @@ -136,33 +136,33 @@ X11Helper::loadRules(const TQString& file, bool layoutsOnly) } for (int i = 0; i < xkbRules->models.num_desc; ++i) - rulesInfo->models.replace(xkbRules->models.desc[i].name, qstrdup( xkbRules->models.desc[i].desc ) ); + rulesInfo->models.tqreplace(xkbRules->models.desc[i].name, qstrdup( xkbRules->models.desc[i].desc ) ); for (int i = 0; i < xkbRules->options.num_desc; ++i) - rulesInfo->options.replace(xkbRules->options.desc[i].name, qstrdup( xkbRules->options.desc[i].desc ) ); + rulesInfo->options.tqreplace(xkbRules->options.desc[i].name, qstrdup( xkbRules->options.desc[i].desc ) ); XkbRF_Free(xkbRules, true); // workaround for empty 'compose' options group description - if( rulesInfo->options.find("compose:menu") && !rulesInfo->options.find("compose") ) { - rulesInfo->options.replace("compose", "Compose Key Position"); + if( rulesInfo->options.tqfind("compose:menu") && !rulesInfo->options.tqfind("compose") ) { + rulesInfo->options.tqreplace("compose", "Compose Key Position"); } for(TQDictIterator<char> it(rulesInfo->options) ; it.current() != NULL; ++it ) { TQString option(it.currentKey()); - int columnPos = option.find(":"); + int columnPos = option.tqfind(":"); if( columnPos != -1 ) { TQString group = option.mid(0, columnPos); - if( rulesInfo->options.find(group) == NULL ) { - rulesInfo->options.replace(group, group.latin1()); + if( rulesInfo->options.tqfind(group) == NULL ) { + rulesInfo->options.tqreplace(group, group.latin1()); kdDebug() << "Added missing option group: " << group << endl; } } } // // workaround for empty misc options group description in XFree86 4.4.0 -// if( rulesInfo->options.find("numpad:microsoft") && !rulesInfo->options.find("misc") ) { -// rulesInfo->options.replace("misc", "Miscellaneous compatibility options" ); +// if( rulesInfo->options.tqfind("numpad:microsoft") && !rulesInfo->options.tqfind("misc") ) { +// rulesInfo->options.tqreplace("misc", "Miscellaneous compatibility options" ); // } return rulesInfo; @@ -187,10 +187,10 @@ X11Helper::loadOldLayouts(const TQString& rulesFile) while (!ts.eof()) { line = ts.readLine().simplifyWhiteSpace(); - if( line.find(oldLayoutsTag) == 0 ) { + if( line.tqfind(oldLayoutsTag) == 0 ) { line = line.mid(strlen(oldLayoutsTag)); - line = line.mid(line.find('=')+1).simplifyWhiteSpace(); + line = line.mid(line.tqfind('=')+1).simplifyWhiteSpace(); while( !ts.eof() && line.endsWith("\\") ) line = line.left(line.length()-1) + ts.readLine(); line = line.simplifyWhiteSpace(); @@ -202,10 +202,10 @@ X11Helper::loadOldLayouts(const TQString& rulesFile) } else - if( line.find(nonLatinLayoutsTag) == 0 ) { + if( line.tqfind(nonLatinLayoutsTag) == 0 ) { line = line.mid(strlen(nonLatinLayoutsTag)+1).simplifyWhiteSpace(); - line = line.mid(line.find('=')+1).simplifyWhiteSpace(); + line = line.mid(line.tqfind('=')+1).simplifyWhiteSpace(); while( !ts.eof() && line.endsWith("\\") ) line = line.left(line.length()-1) + ts.readLine(); line = line.simplifyWhiteSpace(); @@ -262,15 +262,15 @@ X11Helper::getVariants(const TQString& layout, const TQString& x11Dir, bool oldL if (line[0] == '#' || line.left(2) == "//" || line.isEmpty()) continue; - int pos = line.find("xkb_symbols"); + int pos = line.tqfind("xkb_symbols"); if (pos < 0) continue; - if( prev_line.find("hidden") >=0 ) + if( prev_line.tqfind("hidden") >=0 ) continue; - pos = line.find('"', pos) + 1; - int pos2 = line.find('"', pos); + pos = line.tqfind('"', pos) + 1; + int pos2 = line.tqfind('"', pos); if( pos < 0 || pos2 < 0 ) continue; diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp index 82b4aeb17..7e34eeb12 100644 --- a/libkonq/favicons/favicons.cpp +++ b/libkonq/favicons/favicons.cpp @@ -97,7 +97,7 @@ TQString FaviconsModule::iconForURL(const KURL &url) TQString icon; TQString simplifiedURL = simplifyURL(url); - TQString *iconURL = d->faviconsCache.find( removeSlash(simplifiedURL) ); + TQString *iconURL = d->faviconsCache.tqfind( removeSlash(simplifiedURL) ); if (iconURL) icon = *iconURL; else @@ -181,7 +181,7 @@ void FaviconsModule::downloadHostIcon(const KURL &url) void FaviconsModule::startDownload(const TQString &hostOrURL, bool isHost, const KURL &iconURL) { - if (d->failedDownloads.contains(iconURL.url())) + if (d->failedDownloads.tqcontains(iconURL.url())) return; KIO::Job *job = KIO::get(iconURL, false, false); @@ -219,7 +219,7 @@ void FaviconsModule::slotResult(KIO::Job *job) TQBuffer buffer(download.iconData); buffer.open(IO_ReadOnly); TQImageIO io; - io.setIODevice(&buffer); + io.setIODevice(TQT_TQIODEVICE(&buffer)); io.setParameters("size=16"); // Check here too, the job might have had no error, but the downloaded // file contains just a 404 message sent with a 200 status. diff --git a/libkonq/kfileivi.cc b/libkonq/kfileivi.cc index 3bc303bae..48f6d8bb6 100644 --- a/libkonq/kfileivi.cc +++ b/libkonq/kfileivi.cc @@ -81,7 +81,7 @@ KFileIVI::~KFileIVI() delete d; } -void KFileIVI::invalidateThumb( int state, bool redraw ) +void KFileIVI::tqinvalidateThumb( int state, bool redraw ) { TQIconSet::Mode mode; switch( state ) diff --git a/libkonq/kfileivi.h b/libkonq/kfileivi.h index 6c16907ec..1b2a3402e 100644 --- a/libkonq/kfileivi.h +++ b/libkonq/kfileivi.h @@ -88,14 +88,14 @@ public: bool redraw=false); /** - * Notifies that all icon effects on thumbs should be invalidated, + * Notifies that all icon effects on thumbs should be tqinvalidated, * e.g. because the effect settings have been changed. The thumb itself * is assumed to be still valid (use setThumbnailPixmap() instead * otherwise). * @param state the state of the icon (enum in KIcon) * @param redraw whether to redraw the item after setting the icon */ - void invalidateThumb( int state, bool redraw = false ); + void tqinvalidateThumb( int state, bool redraw = false ); /** * Our current thumbnail is not longer "current". diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cc index 2b32129c2..a139141ac 100644 --- a/libkonq/kivdirectoryoverlay.cc +++ b/libkonq/kivdirectoryoverlay.cc @@ -123,7 +123,7 @@ void KIVDirectoryOverlay::slotNewItems( const KFileItemList& items ) TQString iconName = file -> iconName(); if (!iconName) continue; - int* iconCount = m_popularIcons -> find( file -> iconName() ); + int* iconCount = m_popularIcons -> tqfind( file -> iconName() ); if (!iconCount) { iconCount = new int(0); Q_ASSERT(file); diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc index d592a0617..cc05df41d 100644 --- a/libkonq/knewmenu.cc +++ b/libkonq/knewmenu.cc @@ -56,10 +56,10 @@ KDirWatch * KNewMenu::s_pDirWatch = 0L; class KNewMenu::KNewMenuPrivate { public: - KNewMenuPrivate() : m_parentWidget(0) {} + KNewMenuPrivate() : m_tqparentWidget(0) {} KActionCollection * m_actionCollection; TQString m_destPath; - TQWidget *m_parentWidget; + TQWidget *m_tqparentWidget; KActionMenu *m_menuDev; }; @@ -75,13 +75,13 @@ KNewMenu::KNewMenu( KActionCollection * _collec, const char *name ) : makeMenus(); } -KNewMenu::KNewMenu( KActionCollection * _collec, TQWidget *parentWidget, const char *name ) : +KNewMenu::KNewMenu( KActionCollection * _collec, TQWidget *tqparentWidget, const char *name ) : KActionMenu( i18n( "Create New" ), "filenew", _collec, name ), menuItemsVersion( 0 ) { d = new KNewMenuPrivate; d->m_actionCollection = _collec; - d->m_parentWidget = parentWidget; + d->m_tqparentWidget = tqparentWidget; makeMenus(); } @@ -162,7 +162,7 @@ void KNewMenu::parseFiles() else { // A relative path, then (that's the default in the files we ship) - TQString linkDir = filePath.left( filePath.findRev( '/' ) + 1 /*keep / */ ); + TQString linkDir = filePath.left( filePath.tqfindRev( '/' ) + 1 /*keep / */ ); //kdDebug(1203) << "linkDir=" << linkDir << endl; templatePath = linkDir + templatePath; } @@ -363,16 +363,16 @@ void KNewMenu::slotNewDir() if (popupFiles.isEmpty()) return; - KonqOperations::newDir(d->m_parentWidget, popupFiles.first()); + KonqOperations::newDir(d->m_tqparentWidget, popupFiles.first()); } void KNewMenu::slotNewFile() { - int id = TQString( sender()->name() + 7 ).toInt(); // skip "newmenu" + int id = TQString( TQT_TQOBJECT_CONST(sender())->name() + 7 ).toInt(); // skip "newmenu" if (id == 0) { // run the command for the templates - KRun::runCommand(TQString(sender()->name())); + KRun::runCommand(TQString(TQT_TQOBJECT_CONST(sender())->name())); return; } @@ -396,7 +396,7 @@ void KNewMenu::slotNewFile() { m_isURLDesktopFile = true; // entry.comment contains i18n("Enter link to location (URL):"). JFYI :) - KURLDesktopFileDlg dlg( i18n("File name:"), entry.comment, d->m_parentWidget ); + KURLDesktopFileDlg dlg( i18n("File name:"), entry.comment, d->m_tqparentWidget ); // TODO dlg.setCaption( i18n( ... ) ); if ( dlg.exec() ) { @@ -419,7 +419,7 @@ void KNewMenu::slotNewFile() //kdDebug(1203) << "second arg=" << (*it).url() << endl; //kdDebug(1203) << "third arg=" << entry.text << endl; TQString text = entry.text; - text.replace( "...", TQString::null ); // the ... is fine for the menu item but not for the default filename + text.tqreplace( "...", TQString() ); // the ... is fine for the menu item but not for the default filename KURL defaultFile( *it ); defaultFile.addPath( KIO::encodeFileName( text ) ); @@ -428,7 +428,7 @@ void KNewMenu::slotNewFile() KURL templateURL; templateURL.setPath( entry.templatePath ); - (void) new KPropertiesDialog( templateURL, *it, text, d->m_parentWidget ); + (void) new KPropertiesDialog( templateURL, *it, text, d->m_tqparentWidget ); } return; // done, exit. } @@ -439,7 +439,7 @@ void KNewMenu::slotNewFile() // Show the small dialog for getting the destination filename bool ok; TQString text = entry.text; - text.replace( "...", TQString::null ); // the ... is fine for the menu item but not for the default filename + text.tqreplace( "...", TQString() ); // the ... is fine for the menu item but not for the default filename KURL defaultFile( *(popupFiles.begin()) ); defaultFile.addPath( KIO::encodeFileName( text ) ); @@ -447,7 +447,7 @@ void KNewMenu::slotNewFile() text = KIO::RenameDlg::suggestName( *(popupFiles.begin()), text); name = KInputDialog::getText( TQString::null, entry.comment, - text, &ok, d->m_parentWidget ); + text, &ok, d->m_tqparentWidget ); if ( !ok ) return; } @@ -545,7 +545,7 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin TQLabel * label = new TQLabel( textFileName, fileNameBox ); m_leFileName = new KLineEdit( fileNameBox, 0L ); - m_leFileName->setMinimumWidth(m_leFileName->sizeHint().width() * 3); + m_leFileName->setMinimumWidth(m_leFileName->tqsizeHint().width() * 3); label->setBuddy(m_leFileName); // please "scheck" style m_leFileName->setText( defaultName ); m_leFileName->setSelection(0, m_leFileName->text().length()); // autoselect @@ -559,7 +559,7 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin m_urlRequester = new KURLRequester( defaultUrl, urlBox, "urlRequester" ); m_urlRequester->setMode( KFile::File | KFile::Directory ); - m_urlRequester->setMinimumWidth( m_urlRequester->sizeHint().width() * 3 ); + m_urlRequester->setMinimumWidth( m_urlRequester->tqsizeHint().width() * 3 ); connect( m_urlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotURLTextChanged(const TQString&)) ); label->setBuddy(m_urlRequester); // please "scheck" style diff --git a/libkonq/knewmenu.h b/libkonq/knewmenu.h index 6935ae7a4..3c1b0a78b 100644 --- a/libkonq/knewmenu.h +++ b/libkonq/knewmenu.h @@ -58,7 +58,7 @@ public: * Constructor */ KNewMenu( KActionCollection * _collec, const char *name=0L ); - KNewMenu( KActionCollection * _collec, TQWidget *parentWidget, const char *name=0L ); + KNewMenu( KActionCollection * _collec, TQWidget *tqparentWidget, const char *name=0L ); virtual ~KNewMenu(); /** diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cc index ca21c69a3..b1ebdc92f 100644 --- a/libkonq/konq_bgnddlg.cc +++ b/libkonq/konq_bgnddlg.cc @@ -51,7 +51,7 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent, m_buttonGroup->layout()->setMargin( KDialog::marginHint() ); m_buttonGroup->layout()->setSpacing( KDialog::spacingHint() ); TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->layout() ); - groupLayout->setAlignment( Qt::AlignTop ); + groupLayout->tqsetAlignment( Qt::AlignTop ); mainLayout->addWidget( m_buttonGroup ); connect( m_buttonGroup, TQT_SIGNAL( clicked(int) ), @@ -61,7 +61,7 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent, m_radioColor = new TQRadioButton( i18n("Co&lor:"), m_buttonGroup ); groupLayout->addWidget( m_radioColor, 0, 0 ); m_buttonColor = new KColorButton( theColor, defaultColor, m_buttonGroup ); - m_buttonColor->setSizePolicy( TQSizePolicy::Preferred, + m_buttonColor->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ); groupLayout->addWidget( m_buttonColor, 0, 1 ); @@ -90,14 +90,14 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent, TQLabel* lbl = new TQLabel( i18n("Preview"), page ); hlay->addWidget( lbl ); TQFrame* frame = new TQFrame( page ); - frame->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + frame->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); frame->setFrameShape( TQFrame::HLine ); frame->setFrameShadow( TQFrame::Sunken ); hlay->addWidget( frame ); // preview frame m_preview = new TQFrame( page ); - m_preview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + m_preview->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); m_preview->setMinimumSize( 370, 180 ); m_preview->setFrameShape( TQFrame::Panel ); m_preview->setFrameShadow( TQFrame::Raised ); diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc index d64dde7ef..e3059f4a2 100644 --- a/libkonq/konq_dirpart.cc +++ b/libkonq/konq_dirpart.cc @@ -133,7 +133,7 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name ) resetCount(); //m_bMultipleItemsSelected = false; - connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); + connect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); actionCollection()->setHighlightingEnabled( true ); @@ -301,7 +301,7 @@ void KonqDirPart::slotBackgroundSettings() m_pProps->setBgPixmapFile( dlg->pixmapFile() ); } m_pProps->applyColors( scrollWidget()->viewport() ); - scrollWidget()->viewport()->repaint(); + scrollWidget()->viewport()->tqrepaint(); } delete dlg; @@ -418,7 +418,7 @@ void KonqDirPart::slotClipboardDataChanged() // This is very related to KDIconView::slotClipboardDataChanged KURL::List lst; - TQMimeSource *data = TQApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::tqclipboard()->data(); if ( data->provides( "application/x-kde-cutselection" ) && data->provides( "text/uri-list" ) ) if ( KonqDrag::decodeIsCutSelection( data ) ) (void) KURLDrag::decode( data, lst ); @@ -548,7 +548,7 @@ void KonqDirPart::slotIconSizeToggled( bool toggleOn ) // This slot is called when an iconsize action is checked or by calling // action->setChecked(false) (previously true). So we must filter out - // the 'untoggled' case to prevent odd results here (repaints/loops!) + // the 'untoggled' case to prevent odd results here (tqrepaints/loops!) if ( !toggleOn ) return; diff --git a/libkonq/konq_drag.cc b/libkonq/konq_drag.cc index 0fdca5722..07a3e8bda 100644 --- a/libkonq/konq_drag.cc +++ b/libkonq/konq_drag.cc @@ -47,12 +47,12 @@ const char* KonqIconDrag::format( int i ) const else return 0; } -TQByteArray KonqIconDrag::encodedData( const char* mime ) const +TQByteArray KonqIconDrag::tqencodedData( const char* mime ) const { TQByteArray a; TQCString mimetype( mime ); if ( mimetype == "application/x-qiconlist" ) - a = TQIconDrag::encodedData( mime ); + a = TQIconDrag::tqencodedData( mime ); else if ( mimetype == "text/uri-list" ) { TQCString s = urls.join( "\r\n" ).latin1(); if( urls.count() > 0 ) @@ -145,7 +145,7 @@ const char* KonqIconDrag2::format( int i ) const return KonqIconDrag::format( i ); } -TQByteArray KonqIconDrag2::encodedData( const char* mime ) const +TQByteArray KonqIconDrag2::tqencodedData( const char* mime ) const { TQCString mimetype( mime ); if ( mimetype == "application/x-kde-urilist" ) @@ -164,7 +164,7 @@ TQByteArray KonqIconDrag2::encodedData( const char* mime ) const a[c] = 0; return a; } - return KonqIconDrag::encodedData( mime ); + return KonqIconDrag::tqencodedData( mime ); } // @@ -223,7 +223,7 @@ const char* KonqDrag::format( int i ) const else return 0; } -TQByteArray KonqDrag::encodedData( const char* mime ) const +TQByteArray KonqDrag::tqencodedData( const char* mime ) const { TQByteArray a; TQCString mimetype( mime ); @@ -232,7 +232,7 @@ TQByteArray KonqDrag::encodedData( const char* mime ) const // Code taken from TQUriDrag::setUris int c=0; for (TQStrListIterator it(m_urls); *it; ++it) { - int l = qstrlen(*it); + int l = tqstrlen(*it); a.resize(c+l+2); memcpy(a.data()+c,*it,l); memcpy(a.data()+c+l,"\r\n",2); @@ -243,7 +243,7 @@ TQByteArray KonqDrag::encodedData( const char* mime ) const } else if ( mimetype == "application/x-kde-urilist" ) { - return TQUriDrag::encodedData( "text/uri-list" ); + return TQUriDrag::tqencodedData( "text/uri-list" ); } else if ( mimetype == "application/x-kde-cutselection" ) { @@ -271,7 +271,7 @@ TQByteArray KonqDrag::encodedData( const char* mime ) const bool KonqDrag::decodeIsCutSelection( const TQMimeSource *e ) { - TQByteArray a = e->encodedData( "application/x-kde-cutselection" ); + TQByteArray a = e->tqencodedData( "application/x-kde-cutselection" ); if ( a.isEmpty() ) return false; else diff --git a/libkonq/konq_drag.h b/libkonq/konq_drag.h index e5e49a837..65a156021 100644 --- a/libkonq/konq_drag.h +++ b/libkonq/konq_drag.h @@ -35,7 +35,7 @@ *****************************************************************************/ // Clipboard/dnd data for: Icons + URLS + isCut -class LIBKONQ_EXPORT KonqIconDrag : public QIconDrag +class LIBKONQ_EXPORT KonqIconDrag : public TQIconDrag { Q_OBJECT @@ -44,7 +44,7 @@ public: virtual ~KonqIconDrag() {} const char* format( int i ) const; - TQByteArray encodedData( const char* mime ) const; + TQByteArray tqencodedData( const char* mime ) const; void append( const TQIconDragItem &item, const TQRect &pr, const TQRect &tr, const TQString &url ); @@ -72,7 +72,7 @@ public: virtual ~KonqIconDrag2() {} virtual const char* format( int i ) const; - virtual TQByteArray encodedData( const char* mime ) const; + virtual TQByteArray tqencodedData( const char* mime ) const; void append( const TQIconDragItem &item, const TQRect &pr, const TQRect &tr, const TQString &url, const KURL &mostLocalURL ); @@ -82,7 +82,7 @@ private: }; // Clipboard/dnd data for: URLS + isCut -class LIBKONQ_EXPORT KonqDrag : public QUriDrag +class LIBKONQ_EXPORT KonqDrag : public TQUriDrag { public: // KDE4: remove, use KonqDrag constructor instead @@ -107,7 +107,7 @@ public: virtual ~KonqDrag() {} virtual const char* format( int i ) const; - virtual TQByteArray encodedData( const char* mime ) const; + virtual TQByteArray tqencodedData( const char* mime ) const; void setMoveSelection( bool move ) { m_bCutSelection = move; } diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cc index 81262ae99..c7ef40c56 100644 --- a/libkonq/konq_filetip.cc +++ b/libkonq/konq_filetip.cc @@ -37,7 +37,7 @@ //-------------------------------------------------------------------------------- KonqFileTip::KonqFileTip( TQScrollView* parent ) - : TQFrame( 0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM ), + : TQFrame( 0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM) ), m_on( false ), m_preview( false ), m_filter( false ), @@ -49,7 +49,7 @@ KonqFileTip::KonqFileTip( TQScrollView* parent ) { m_iconLabel = new TQLabel(this); m_textLabel = new TQLabel(this); - m_textLabel->setAlignment(Qt::AlignAuto | Qt::AlignTop); + m_textLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignTop); TQGridLayout* layout = new TQGridLayout(this, 1, 2, 8, 0); layout->addWidget(m_iconLabel, 0, 0); @@ -189,7 +189,7 @@ void KonqFileTip::drawContents( TQPainter *p ) } if ( m_corners[m_corner].isNull()) - m_corners[m_corner].load( locate( "data", TQString::fromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) ); + m_corners[m_corner].load( locate( "data", TQString::tqfromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) ); TQPixmap &pix = m_corners[m_corner]; diff --git a/libkonq/konq_filetip.h b/libkonq/konq_filetip.h index 08ccc9b9b..2c30a0a8f 100644 --- a/libkonq/konq_filetip.h +++ b/libkonq/konq_filetip.h @@ -35,7 +35,7 @@ class TQTimer; //-------------------------------------------------------------------------------- -class LIBKONQ_EXPORT KonqFileTip : public QFrame +class LIBKONQ_EXPORT KonqFileTip : public TQFrame { Q_OBJECT diff --git a/libkonq/konq_historycomm.h b/libkonq/konq_historycomm.h index ea2a387df..96c3a375e 100644 --- a/libkonq/konq_historycomm.h +++ b/libkonq/konq_historycomm.h @@ -37,7 +37,7 @@ public: KURL url; TQString typedURL; TQString title; - Q_UINT32 numberOfTimesVisited; + TQ_UINT32 numberOfTimesVisited; TQDateTime firstVisited; TQDateTime lastVisited; }; @@ -65,8 +65,8 @@ protected: k_dcop: virtual ASYNC notifyHistoryEntry( KonqHistoryEntry e, TQCString saveId) = 0; - virtual ASYNC notifyMaxCount( Q_UINT32 count, TQCString saveId ) = 0; - virtual ASYNC notifyMaxAge( Q_UINT32 days, TQCString saveId ) = 0; + virtual ASYNC notifyMaxCount( TQ_UINT32 count, TQCString saveId ) = 0; + virtual ASYNC notifyMaxAge( TQ_UINT32 days, TQCString saveId ) = 0; virtual ASYNC notifyClear( TQCString saveId ) = 0; virtual ASYNC notifyRemove( KURL url, TQCString saveId ) = 0; virtual ASYNC notifyRemove( KURL::List url, TQCString saveId ) = 0; diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cc index b971d39b3..bff8d7328 100644 --- a/libkonq/konq_historymgr.cc +++ b/libkonq/konq_historymgr.cc @@ -31,7 +31,7 @@ #include "konqbookmarkmanager.h" -const Q_UINT32 KonqHistoryManager::s_historyVersion = 3; +const TQ_UINT32 KonqHistoryManager::s_historyVersion = 3; KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name ) : KParts::HistoryProvider( parent, name ), @@ -43,12 +43,12 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name ) KConfig *config = KGlobal::config(); KConfigGroupSaver cs( config, "HistorySettings" ); m_maxCount = config->readNumEntry( "Maximum of History entries", 500 ); - m_maxCount = QMAX( 1, m_maxCount ); + m_maxCount = TQMAX( 1, m_maxCount ); m_maxAgeDays = config->readNumEntry( "Maximum age of History entries", 90); m_history.setAutoDelete( true ); m_filename = locateLocal( "data", - TQString::fromLatin1("konqueror/konq_history" )); + TQString::tqfromLatin1("konqueror/konq_history" )); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); @@ -102,7 +102,7 @@ bool KonqHistoryManager::loadHistory() TQDataStream crcStream( data, IO_ReadOnly ); if ( !fileStream.atEnd() ) { - Q_UINT32 version; + TQ_UINT32 version; fileStream >> version; TQDataStream *stream = &fileStream; @@ -111,7 +111,7 @@ bool KonqHistoryManager::loadHistory() bool crcOk = false; if ( version == 2 || version == 3) { - Q_UINT32 crc; + TQ_UINT32 crc; crcChecked = true; fileStream >> crc >> data; crcOk = crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() ) == crc; @@ -132,7 +132,7 @@ bool KonqHistoryManager::loadHistory() // binary file, this would make backups impossible (they would clear // themselves on startup, because all entries expire). // [But V1 and V2 formats did it, so we do a dummy read] - Q_UINT32 dummy; + TQ_UINT32 dummy; *stream >> dummy; *stream >> dummy; @@ -224,7 +224,7 @@ bool KonqHistoryManager::saveHistory() //For DCOP, transfer strings instead - wire compat. KonqHistoryEntry::marshalURLAsStrings = true; - Q_UINT32 crc = crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() ); + TQ_UINT32 crc = crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() ); *fileStream << crc << data; file.close(); @@ -295,12 +295,12 @@ void KonqHistoryManager::addToHistory( bool pending, const KURL& _url, // konqueror's window caption). if ( !pending && u != title ) entry.title = title; - entry.firstVisited = TQDateTime::currentDateTime(); + entry.firstVisited = TQDateTime::tqcurrentDateTime(); entry.lastVisited = entry.firstVisited; // always remove from pending if available, otherwise the else branch leaks // if the map already contains an entry for this key. - TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.find( u ); + TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.tqfind( u ); if ( it != m_pending.end() ) { delete it.data(); m_pending.remove( it ); @@ -342,7 +342,7 @@ void KonqHistoryManager::insert( const TQString& url ) // Local URL -> add to history KonqHistoryEntry entry; entry.url = u; - entry.firstVisited = TQDateTime::currentDateTime(); + entry.firstVisited = TQDateTime::tqcurrentDateTime(); entry.lastVisited = entry.firstVisited; emitAddToHistory( entry ); } @@ -368,7 +368,7 @@ void KonqHistoryManager::removePending( const KURL& url ) if ( url.isLocalFile() ) return; - TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.find( url.prettyURL() ); + TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.tqfind( url.prettyURL() ); if ( it != m_pending.end() ) { KonqHistoryEntry *oldEntry = it.data(); // the old entry, may be 0L emitRemoveFromHistory( url ); // remove the current pending entry @@ -419,22 +419,22 @@ void KonqHistoryManager::emitClear() "notifyClear(TQCString)", data ); } -void KonqHistoryManager::emitSetMaxCount( Q_UINT32 count ) +void KonqHistoryManager::emitSetMaxCount( TQ_UINT32 count ) { TQByteArray data; TQDataStream stream( data, IO_WriteOnly ); stream << count << objId(); kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", - "notifyMaxCount(Q_UINT32, TQCString)", data ); + "notifyMaxCount(TQ_UINT32, TQCString)", data ); } -void KonqHistoryManager::emitSetMaxAge( Q_UINT32 days ) +void KonqHistoryManager::emitSetMaxAge( TQ_UINT32 days ) { TQByteArray data; TQDataStream stream( data, IO_WriteOnly ); stream << days << objId(); kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", - "notifyMaxAge(Q_UINT32, TQCString)", data ); + "notifyMaxAge(TQ_UINT32, TQCString)", data ); } /////////////////////////////////////////////////////////////////// @@ -487,7 +487,7 @@ void KonqHistoryManager::notifyHistoryEntry( KonqHistoryEntry e, emit entryAdded( entry ); } -void KonqHistoryManager::notifyMaxCount( Q_UINT32 count, TQCString ) +void KonqHistoryManager::notifyMaxCount( TQ_UINT32 count, TQCString ) { m_maxCount = count; clearPending(); @@ -503,7 +503,7 @@ void KonqHistoryManager::notifyMaxCount( Q_UINT32 count, TQCString ) } } -void KonqHistoryManager::notifyMaxAge( Q_UINT32 days, TQCString ) +void KonqHistoryManager::notifyMaxAge( TQ_UINT32 days, TQCString ) { m_maxAgeDays = days; clearPending(); @@ -589,7 +589,7 @@ void KonqHistoryManager::notifyRemove( KURL::List urls, TQCString ) // compatibility fallback, try to load the old completion history bool KonqHistoryManager::loadFallback() { - TQString file = locateLocal( "config", TQString::fromLatin1("konq_history")); + TQString file = locateLocal( "config", TQString::tqfromLatin1("konq_history")); if ( file.isEmpty() ) return false; @@ -627,7 +627,7 @@ KonqHistoryEntry * KonqHistoryManager::createFallbackEntry(const TQString& item) uint weight = 1; // find out the weighting of this item (appended to the string as ":num") - int index = item.findRev(':'); + int index = item.tqfindRev(':'); if ( index > 0 ) { bool ok; weight = item.mid( index + 1 ).toUInt( &ok ); @@ -646,7 +646,7 @@ KonqHistoryEntry * KonqHistoryManager::createFallbackEntry(const TQString& item) entry->url = u; entry->numberOfTimesVisited = weight; // to make it not expire immediately... - entry->lastVisited = TQDateTime::currentDateTime(); + entry->lastVisited = TQDateTime::tqcurrentDateTime(); } return entry; diff --git a/libkonq/konq_historymgr.h b/libkonq/konq_historymgr.h index 11b14603b..47c3d7b35 100644 --- a/libkonq/konq_historymgr.h +++ b/libkonq/konq_historymgr.h @@ -91,7 +91,7 @@ public: * * The history is saved after receiving the DCOP call. */ - void emitSetMaxCount( Q_UINT32 count ); + void emitSetMaxCount( TQ_UINT32 count ); /** * Sets a new maximum age of history entries and removes all entries that @@ -102,7 +102,7 @@ public: * * The history is saved after receiving the DCOP call. */ - void emitSetMaxAge( Q_UINT32 days ); + void emitSetMaxAge( TQ_UINT32 days ); /** * Removes the history entry for @p url, if existant. Tells all other @@ -123,12 +123,12 @@ public: /** * @returns the current maximum number of history entries. */ - Q_UINT32 maxCount() const { return m_maxCount; } + TQ_UINT32 maxCount() const { return m_maxCount; } /** * @returns the current maximum age (in days) of history entries. */ - Q_UINT32 maxAge() const { return m_maxAgeDays; } + TQ_UINT32 maxAge() const { return m_maxAgeDays; } /** * Adds a pending entry to the history. Pending means, that the entry is @@ -236,7 +236,7 @@ protected: */ inline bool isExpired( KonqHistoryEntry *entry ) { return (entry && m_maxAgeDays > 0 && entry->lastVisited < - TQDate::currentDate().addDays( -m_maxAgeDays )); + TQDateTime(TQDate::currentDate().addDays( -m_maxAgeDays ))); } /** @@ -259,13 +259,13 @@ protected: * Called when the configuration of the maximum count changed. * Called via DCOP by some config-module */ - virtual void notifyMaxCount( Q_UINT32 count, TQCString saveId ); + virtual void notifyMaxCount( TQ_UINT32 count, TQCString saveId ); /** * Called when the configuration of the maximum age of history-entries * changed. Called via DCOP by some config-module */ - virtual void notifyMaxAge( Q_UINT32 days, TQCString saveId ); + virtual void notifyMaxAge( TQ_UINT32 days, TQCString saveId ); /** * Clears the history completely. Called via DCOP by some config-module @@ -327,7 +327,7 @@ protected: private slots: /** * Called by the updateTimer to emit the KParts::HistoryProvider::updated() - * signal so that khtml can repaint the updated links. + * signal so that khtml can tqrepaint the updated links. */ void slotEmitUpdated(); @@ -367,8 +367,8 @@ private: */ TQMap<TQString,KonqHistoryEntry*> m_pending; - Q_UINT32 m_maxCount; // maximum of history entries - Q_UINT32 m_maxAgeDays; // maximum age of a history entry + TQ_UINT32 m_maxCount; // maximum of history entries + TQ_UINT32 m_maxAgeDays; // maximum age of a history entry KCompletion *m_pCompletion; // the completion object we sync with @@ -378,7 +378,7 @@ private: */ TQTimer *m_updateTimer; - static const Q_UINT32 s_historyVersion; + static const TQ_UINT32 s_historyVersion; }; diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc index 0ce2ca346..152083895 100644 --- a/libkonq/konq_iconviewwidget.cc +++ b/libkonq/konq_iconviewwidget.cc @@ -151,7 +151,7 @@ KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WF m_LineupMode = LineupBoth; // emit our signals slotSelectionChanged(); - m_iconPositionGroupPrefix = TQString::fromLatin1( "IconPosition::" ); + m_iconPositionGroupPrefix = TQString::tqfromLatin1( "IconPosition::" ); KonqUndoManager::incRef(); } @@ -308,7 +308,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item ) if (!hasPixmap && backgroundMode() != NoBackground) d->m_movie->setBackgroundColor( viewport()->backgroundColor() ); d->m_movie->connectUpdate( this, TQT_SLOT( slotMovieUpdate(const TQRect &) ) ); - d->m_movie->connectStatus( this, TQT_SLOT( slotMovieStatus(int) ) ); + d->m_movie->connectqStatus( TQT_TQOBJECT(this), TQT_SLOT( slotMovieStatus(int) ) ); d->movieFileName = d->pActiveItem->mouseOverAnimation(); d->pActiveItem->setAnimated( true ); } @@ -331,7 +331,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item ) else // No change in current item { // No effect. If we want to underline on hover, we should - // force the IVI to repaint here, though! + // force the IVI to tqrepaint here, though! d->pActiveItem = 0L; d->pFileTip->setItem( 0L ); } @@ -346,10 +346,10 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item ) // ## shouldn't this be disabled during rectangular selection too ? if (d->bSoundPreviews && d->pSoundPlayer && - d->pSoundPlayer->mimeTypes().contains( + d->pSoundPlayer->mimeTypes().tqcontains( item->item()->mimetype()) && KGlobalSettings::showFilePreview(item->item()->url()) - && topLevelWidget() == kapp->activeWindow()) + && tqtopLevelWidget() == kapp->activeWindow()) { d->pSoundItem = item; d->bSoundItemClicked = false; @@ -478,7 +478,7 @@ void KonqIconViewWidget::slotMovieUpdate( const TQRect& rect ) } d->pActiveItem->setPixmapDirect( frame, false, false /*no redraw*/ ); TQRect pixRect = d->pActiveItem->pixmapRect(false); - repaintContents( pixRect.x() + rect.x(), pixRect.y() + rect.y(), rect.width(), rect.height(), false ); + tqrepaintContents( pixRect.x() + rect.x(), pixRect.y() + rect.y(), rect.width(), rect.height(), false ); } } @@ -561,7 +561,7 @@ bool KonqIconViewWidget::initConfig( bool bInit ) if ( itemTextBg.isValid() ) setItemTextBackground( itemTextBg ); else - setItemTextBackground( NoBrush ); + setItemTextBackground( Qt::NoBrush ); } bool on = m_pSettings->showFileTips() && TQToolTip::isGloballyEnabled(); @@ -648,9 +648,9 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie } bool stopAll = !stopImagePreviewFor.isEmpty() && stopImagePreviewFor.first() == "*"; - // Disable repaints that can be triggered by ivi->setIcon(). Since icons are + // Disable tqrepaints that can be triggered by ivi->setIcon(). Since icons are // resized in-place, if the icon size is increasing it can happens that the right - // or bottom icons exceed the size of the viewport.. here we prevent the repaint + // or bottom icons exceed the size of the viewport.. here we prevent the tqrepaint // event that will be triggered in that case. bool prevUpdatesState = viewport()->isUpdatesEnabled(); viewport()->setUpdatesEnabled( false ); @@ -669,7 +669,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie ivi->setIcon( size, ivi->state(), true, false ); } else - ivi->invalidateThumb( ivi->state(), true ); + ivi->tqinvalidateThumb( ivi->state(), true ); } // Restore viewport update to previous state @@ -677,7 +677,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie if ( ( sizeChanged || previewSizeChanged || oldGridX != gridX() || !stopImagePreviewFor.isEmpty() ) && autoArrange() ) - arrangeItemsInGrid( true ); // take new grid into account and repaint + arrangeItemsInGrid( true ); // take new grid into account and tqrepaint else viewport()->update(); //Repaint later.. } @@ -692,7 +692,7 @@ bool KonqIconViewWidget::mimeTypeMatch( const TQString& mimeType, const TQString return true; // Support for *mt == "image/*" TQString tmp( mimeType ); - if ( (*mt).endsWith("*") && tmp.replace(TQRegExp("/.*"), "/*") == (*mt) ) + if ( (*mt).endsWith("*") && tmp.tqreplace(TQRegExp("/.*"), "/*") == (*mt) ) return true; if ( (*mt) == "text/plain" ) { @@ -830,13 +830,13 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force ) return; } - if ((d->bSoundPreviews = d->previewSettings.contains( "audio/" )) && + if ((d->bSoundPreviews = d->previewSettings.tqcontains( "audio/" )) && !d->pSoundPlayer) { KLibFactory *factory = KLibLoader::self()->factory("konq_sound"); if (factory) d->pSoundPlayer = static_cast<KonqSoundPlayer *>( - factory->create(this, 0, "KonqSoundPlayer")); + factory->create(TQT_TQOBJECT(this), 0, "KonqSoundPlayer")); d->bSoundPreviews = (d->pSoundPlayer != 0L); } @@ -995,7 +995,7 @@ void KonqIconViewWidget::contentsDragEnterEvent( TQDragEnterEvent *e ) { if ( e->provides( "text/uri-list" ) ) { - TQByteArray payload = e->encodedData( "text/uri-list" ); + TQByteArray payload = e->tqencodedData( "text/uri-list" ); if ( !payload.size() ) kdError() << "Empty data !" << endl; // Cache the URLs, since we need them every time we move over a file @@ -1030,7 +1030,7 @@ void KonqIconViewWidget::contentsDragMoveEvent( TQDragMoveEvent *e ) return; } - TQIconViewItem *item = findItem( e->pos() ); + TQIconViewItem *item = tqfindItem( e->pos() ); if ( e->source() != viewport() && !item && m_rootItem && !m_rootItem->isWritable() ) { emit dragMove( false ); @@ -1147,14 +1147,14 @@ void KonqIconViewWidget::cutSelection() kdDebug(1203) << " -- KonqIconViewWidget::cutSelection() -- " << endl; KonqIconDrag * obj = konqDragObject( /* no parent ! */ ); obj->setMoveSelection( true ); - TQApplication::clipboard()->setData( obj ); + TQApplication::tqclipboard()->setData( obj ); } void KonqIconViewWidget::copySelection() { kdDebug(1203) << " -- KonqIconViewWidget::copySelection() -- " << endl; KonqIconDrag * obj = konqDragObject( /* no parent ! */ ); - TQApplication::clipboard()->setData( obj ); + TQApplication::tqclipboard()->setData( obj ); } void KonqIconViewWidget::pasteSelection() @@ -1221,7 +1221,7 @@ void KonqIconViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) // The following call is SO expensive (the ::widgetAt call eats up to 80% // of the mouse move cpucycles!), so it's mandatory to place that function // under strict checks, such as d->pSoundPlayer->isPlaying() - if ( TQApplication::widgetAt( TQCursor::pos() ) != topLevelWidget() ) + if ( TQApplication::widgetAt( TQCursor::pos() ) != tqtopLevelWidget() ) { if (d->pSoundPlayer) d->pSoundPlayer->stop(); @@ -1236,7 +1236,7 @@ void KonqIconViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev ) { - TQIconViewItem *i = findItem( ev->pos() ); + TQIconViewItem *i = tqfindItem( ev->pos() ); if ( ev->source() != viewport() && !i && m_rootItem && !m_rootItem->isWritable() ) { @@ -1249,7 +1249,7 @@ void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev ) if ( !i && (ev->action() == TQDropEvent::Copy || ev->action() == TQDropEvent::Link) && ev->source() && ev->source() == viewport()) { - // First we need to call TQIconView though, to clear the drag shape + // First we need to call TQIconView though, to clear the drag tqshape bool bMovable = itemsMovable(); setItemsMovable(false); // hack ? call it what you want :-) KIconView::contentsDropEvent( ev ); @@ -1281,7 +1281,7 @@ void KonqIconViewWidget::doubleClickTimeout() if ( d->releaseMouseEvent ) { TQMouseEvent e( TQEvent::MouseButtonPress,d->mousePos , 1, d->mouseState); - TQIconViewItem* item = findItem( e.pos() ); + TQIconViewItem* item = tqfindItem( e.pos() ); KURL url; if ( item ) { @@ -1290,7 +1290,7 @@ void KonqIconViewWidget::doubleClickTimeout() if ( url.isLocalFile() && (url.directory(false) == KGlobalSettings::trashPath() || url.path(1).startsWith(KGlobalSettings::trashPath()))) brenameTrash = true; - if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == LeftButton && item->textRect( false ).contains(e.pos())) + if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == Qt::LeftButton && item->textRect( false ).tqcontains(e.pos())) { if( d->pActivateDoubleClick->isActive () ) d->pActivateDoubleClick->stop(); @@ -1359,7 +1359,7 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e ) { if(d->pActivateDoubleClick && d->pActivateDoubleClick->isActive ()) d->pActivateDoubleClick->stop(); - TQIconViewItem* item = findItem( e->pos() ); + TQIconViewItem* item = tqfindItem( e->pos() ); m_mousePos = e->pos(); KURL url; if ( item ) @@ -1368,7 +1368,7 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e ) bool brenameTrash =false; if ( url.isLocalFile() && (url.directory(false) == KGlobalSettings::trashPath() || url.path(1).startsWith(KGlobalSettings::trashPath()))) brenameTrash = true; - if ( !brenameTrash && !KGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == LeftButton && item->textRect( false ).contains(e->pos())&& !d->firstClick && url.isLocalFile() && (!url.protocol().find("device", 0, false)==0)) + if ( !brenameTrash && !KGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == Qt::LeftButton && item->textRect( false ).tqcontains(e->pos())&& !d->firstClick && url.isLocalFile() && (!url.protocol().tqfind("device", 0, false)==0)) { d->firstClick = true; d->mousePos = e->pos(); @@ -1488,7 +1488,7 @@ void KonqIconViewWidget::insertInGrid(TQIconViewItem *item) y = QMAX(y, i->y() + i->height()); } - TQMemArray<TQRect> rects = r.rects(); + TQMemArray<TQRect> rects = r.tqrects(); TQMemArray<TQRect>::Iterator it = rects.begin(); bool foundPlace = FALSE; for (; it != rects.end(); ++it) @@ -1703,7 +1703,7 @@ void KonqIconViewWidget::lineupIcons() } // Perform the actual moving - TQRegion repaintRegion; + TQRegion tqrepaintRegion; TQValueList<TQIconViewItem*> movedItems; for ( i = 0; i < nx; i++ ) { @@ -1722,7 +1722,7 @@ void KonqIconViewWidget::lineupIcons() movedItems.prepend( item ); item->move( newX, newY ); if ( item->rect() != oldRect ) - repaintRegion = repaintRegion.unite( oldRect ); + tqrepaintRegion = tqrepaintRegion.unite( oldRect ); } } delete bin; @@ -1730,20 +1730,20 @@ void KonqIconViewWidget::lineupIcons() } } - // repaint + // tqrepaint if ( newItemWidth ) updateContents(); else { - // Repaint only repaintRegion... - TQMemArray<TQRect> rects = repaintRegion.rects(); + // Repaint only tqrepaintRegion... + TQMemArray<TQRect> rects = tqrepaintRegion.tqrects(); for ( uint l = 0; l < rects.count(); l++ ) { kdDebug( 1203 ) << "Repainting (" << rects[l].x() << "," << rects[l].y() << ")\n"; - repaintContents( rects[l], false ); + tqrepaintContents( rects[l], false ); } // Repaint icons that were moved while ( !movedItems.isEmpty() ) { - repaintItem( movedItems.first() ); + tqrepaintItem( movedItems.first() ); movedItems.remove( movedItems.first() ); } } @@ -1760,7 +1760,7 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement ) gridValues( &x0, &y0, &dx, &dy, &nxmax, &nymax ); int textHeight = iconTextHeight() * fontMetrics().height(); - TQRegion repaintRegion; + TQRegion tqrepaintRegion; TQValueList<TQIconViewItem*> movedItems; int nx = 0, ny = 0; @@ -1775,7 +1775,7 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement ) movedItems.prepend( item ); item->move( newX, newY ); if ( item->rect() != oldRect ) - repaintRegion = repaintRegion.unite( oldRect ); + tqrepaintRegion = tqrepaintRegion.unite( oldRect ); } if ( arrangement == TQIconView::LeftToRight ) { nx++; @@ -1793,16 +1793,16 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement ) } } - // Repaint only repaintRegion... - TQMemArray<TQRect> rects = repaintRegion.rects(); + // Repaint only tqrepaintRegion... + TQMemArray<TQRect> rects = tqrepaintRegion.tqrects(); for ( uint l = 0; l < rects.count(); l++ ) { kdDebug( 1203 ) << "Repainting (" << rects[l].x() << "," << rects[l].y() << ")\n"; - repaintContents( rects[l], false ); + tqrepaintContents( rects[l], false ); } // Repaint icons that were moved while ( !movedItems.isEmpty() ) { - repaintItem( movedItems.first() ); + tqrepaintItem( movedItems.first() ); movedItems.remove( movedItems.first() ); } } @@ -1916,7 +1916,7 @@ void KonqIconViewWidget::updatePreviewMimeTypes() KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { - if ( d->previewSettings.contains((*it)->desktopEntryName()) ) { + if ( d->previewSettings.tqcontains((*it)->desktopEntryName()) ) { TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList(); for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt) d->pPreviewMimeTypes->append(*mt); diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc index 6a1ebcdb6..616404ee5 100644 --- a/libkonq/konq_operations.cc +++ b/libkonq/konq_operations.cc @@ -76,7 +76,7 @@ KonqOperations::~KonqOperations() void KonqOperations::editMimeType( const TQString & mimeType ) { - TQString keditfiletype = TQString::fromLatin1("keditfiletype"); + TQString keditfiletype = TQString::tqfromLatin1("keditfiletype"); KRun::runCommand( keditfiletype + " " + KProcess::quote(mimeType), keditfiletype, keditfiletype /*unused*/); } @@ -124,7 +124,7 @@ void KonqOperations::doPaste( TQWidget * parent, const KURL & destURL, const TQP { // move or not move ? bool move = false; - TQMimeSource *data = TQApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::tqclipboard()->data(); if ( data->provides( "application/x-kde-cutselection" ) ) { move = KonqDrag::decodeIsCutSelection( data ); kdDebug(1203) << "move (from clipboard data) = " << move << endl; @@ -185,7 +185,7 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm return; } - if ( askDeleteConfirmation( selectedURLs, method, confirmation, parentWidget() ) ) + if ( askDeleteConfirmation( selectedURLs, method, confirmation, tqparentWidget() ) ) { //m_srcURLs = selectedURLs; KIO::Job *job; @@ -525,7 +525,7 @@ void KonqOperations::doFileCopy() } m_method = TRASH; - if ( askDeleteConfirmation( mlst, TRASH, DEFAULT_CONFIRMATION, parentWidget() ) ) + if ( askDeleteConfirmation( mlst, TRASH, DEFAULT_CONFIRMATION, tqparentWidget() ) ) action = TQDropEvent::Move; else { @@ -815,7 +815,7 @@ void KonqMultiRestoreJob::slotResult( KIO::Job *job ) slotStart(); } -TQWidget* KonqOperations::parentWidget() const +TQWidget* KonqOperations::tqparentWidget() const { return static_cast<TQWidget *>( parent() ); } diff --git a/libkonq/konq_operations.h b/libkonq/konq_operations.h index f9134bcde..fa47b4abe 100644 --- a/libkonq/konq_operations.h +++ b/libkonq/konq_operations.h @@ -34,7 +34,7 @@ class KonqMainWindow; * Implements file operations (move,del,trash,shred,paste,copy,move,link...) * for konqueror and kdesktop whatever the view mode is (icon, tree, ...) */ -class LIBKONQ_EXPORT KonqOperations : public QObject +class LIBKONQ_EXPORT KonqOperations : public TQObject { Q_OBJECT protected: @@ -173,7 +173,7 @@ protected: void setPasteInfo( KIOPasteInfo * info ) { m_pasteInfo = info; } private: - TQWidget* parentWidget() const; + TQWidget* tqparentWidget() const; protected slots: diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc index 3cff83453..932b1b7d0 100644 --- a/libkonq/konq_pixmapprovider.cc +++ b/libkonq/konq_pixmapprovider.cc @@ -32,7 +32,7 @@ KonqPixmapProvider * KonqPixmapProvider::s_self = 0L; KonqPixmapProvider * KonqPixmapProvider::self() { if ( !s_self ) - s_self = new KonqPixmapProvider( kapp, "KonqPixmapProvider" ); + s_self = new KonqPixmapProvider( TQT_TQOBJECT(kapp), "KonqPixmapProvider" ); return s_self; } @@ -54,7 +54,7 @@ KonqPixmapProvider::~KonqPixmapProvider() // finally, inserts the url/icon pair into the cache TQString KonqPixmapProvider::iconNameFor( const TQString& url ) { - TQMapIterator<TQString,TQString> it = iconMap.find( url ); + TQMapIterator<TQString,TQString> it = iconMap.tqfind( url ); TQString icon; if ( it != iconMap.end() ) { icon = it.data(); @@ -120,7 +120,7 @@ void KonqPixmapProvider::save( KConfig *kc, const TQString& key, TQStringList::ConstIterator it = items.begin(); TQMapConstIterator<TQString,TQString> mit; while ( it != items.end() ) { - mit = iconMap.find( *it ); + mit = iconMap.tqfind( *it ); if ( mit != iconMap.end() ) { list.append( mit.key() ); list.append( mit.data() ); @@ -182,12 +182,12 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon int x = big.width() - small.width(); int y = 0; - if ( big.mask() ) { - TQBitmap mask = *big.mask(); + if ( big.tqmask() ) { + TQBitmap mask = *big.tqmask(); bitBlt( &mask, x, y, - small.mask() ? const_cast<TQBitmap *>(small.mask()) : &small, 0, 0, + small.tqmask() ? TQT_TQPIXMAP(const_cast<TQBitmap *>(small.tqmask())) : &small, 0, 0, small.width(), small.height(), - small.mask() ? OrROP : SetROP ); + small.tqmask() ? OrROP : SetROP ); big.setMask( mask ); } diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index 044bda9d2..273ce8cfc 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -43,6 +43,7 @@ #include "knewmenu.h" #include "konq_popupmenu.h" #include "konq_operations.h" +#include "konq_xmlguiclient.h" #include <dcopclient.h> /* @@ -95,12 +96,12 @@ public: class KonqPopupMenu::KonqPopupMenuPrivate { public: - KonqPopupMenuPrivate() : m_parentWidget( 0 ), + KonqPopupMenuPrivate() : m_tqparentWidget( 0 ), m_itemFlags( KParts::BrowserExtension::DefaultPopupItems ) { } TQString m_urlTitle; - TQWidget *m_parentWidget; + TQWidget *m_tqparentWidget; KParts::BrowserExtension::PopupFlags m_itemFlags; }; @@ -199,30 +200,30 @@ KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items, KURL viewURL, KActionCollection & actions, KNewMenu * newMenu, - TQWidget * parentWidget, + TQWidget * tqparentWidget, bool showProperties ) - : TQPopupMenu( parentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr) + : TQPopupMenu( tqparentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr) { KonqPopupFlags kpf = ( showProperties ? ShowProperties : IsLink ) | ShowNewWindow; - init(parentWidget, kpf, KParts::BrowserExtension::DefaultPopupItems); + init(tqparentWidget, kpf, KParts::BrowserExtension::DefaultPopupItems); } KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items, const KURL& viewURL, KActionCollection & actions, KNewMenu * newMenu, - TQWidget * parentWidget, + TQWidget * tqparentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags flags) - : TQPopupMenu( parentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr) + : TQPopupMenu( tqparentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr) { - init(parentWidget, kpf, flags); + init(tqparentWidget, kpf, flags); } -void KonqPopupMenu::init (TQWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags flags) +void KonqPopupMenu::init (TQWidget * tqparentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags flags) { d = new KonqPopupMenuPrivate; - d->m_parentWidget = parentWidget; + d->m_tqparentWidget = tqparentWidget; d->m_itemFlags = flags; setup(kpf); } @@ -280,8 +281,8 @@ int KonqPopupMenu::insertServices(const ServiceList& list, TQCString name; name.setNum( id ); name.prepend( isBuiltin ? "builtinservice_" : "userservice_" ); - KAction * act = new KAction( TQString((*it).m_strName).replace('&',"&&"), 0, - this, TQT_SLOT( slotRunService() ), + KAction * act = new KAction( TQString((*it).m_strName).tqreplace('&',"&&"), 0, + TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ), &m_ownActions, name ); if ( !(*it).m_strIcon.isEmpty() ) @@ -290,7 +291,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list, act->setIconSet( pix ); } - addAction( act, menu ); // Add to toplevel menu + tqaddAction( act, menu ); // Add to toplevel menu m_mapPopupServices[ id++ ] = *it; ++count; @@ -338,7 +339,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) bool sMoving = sDeleting; bool sWriting = sDeleting && m_lstItems.first()->isWritable(); m_sMimeType = m_lstItems.first()->mimetype(); - TQString mimeGroup = m_sMimeType.left(m_sMimeType.find('/')); + TQString mimeGroup = m_sMimeType.left(m_sMimeType.tqfind('/')); mode_t mode = m_lstItems.first()->mode(); bool isDirectory = S_ISDIR(mode); bool bTrashIncluded = false; @@ -354,7 +355,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) m_pluginList.setAutoDelete( true ); m_ownActions.setHighlightingEnabled( true ); - attrName = TQString::fromLatin1( "name" ); + attrName = TQString::tqfromLatin1( "name" ); prepareXMLGUIStuff(); m_builder = new KonqPopupMenuGUIBuilder( this ); @@ -380,11 +381,11 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) { m_sMimeType = TQString::null; // mimetypes are different => null - if ( mimeGroup != (*it)->mimetype().left((*it)->mimetype().find('/'))) + if ( mimeGroup != (*it)->mimetype().left((*it)->mimetype().tqfind('/'))) mimeGroup = TQString::null; // mimetype groups are different as well! } - if ( mimeTypeList.findIndex( (*it)->mimetype() ) == -1 ) + if ( mimeTypeList.tqfindIndex( (*it)->mimetype() ) == -1 ) mimeTypeList << (*it)->mimetype(); if ( isReallyLocal && !url.isLocalFile() ) @@ -475,7 +476,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( ((kpf & ShowNewWindow) != 0) && sReading ) { TQString openStr = isKDesktop ? i18n( "&Open" ) : i18n( "Open in New &Window" ); - actNewWindow = new KAction( openStr, "window_new", 0, this, TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" ); + actNewWindow = new KAction( openStr, "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" ); } if ( actNewWindow && !isKDesktop ) @@ -496,7 +497,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) m_pMenuNew->slotCheckUpToDate(); m_pMenuNew->setPopupFiles( m_lstPopupURLs ); - addAction( m_pMenuNew ); + tqaddAction( m_pMenuNew ); addSeparator(); } @@ -504,32 +505,32 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) { if (d->m_itemFlags & KParts::BrowserExtension::ShowCreateDirectory) { - KAction *actNewDir = new KAction( i18n( "Create &Folder..." ), "folder_new", 0, this, TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" ); - addAction( actNewDir ); + KAction *actNewDir = new KAction( i18n( "Create &Folder..." ), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" ); + tqaddAction( actNewDir ); addSeparator(); } } } else if ( isIntoTrash ) { // Trashed item, offer restoring - act = new KAction( i18n( "&Restore" ), 0, this, TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" ); - addAction( act ); + act = new KAction( i18n( "&Restore" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" ); + tqaddAction( act ); } if (d->m_itemFlags & KParts::BrowserExtension::ShowNavigationItems) { if (d->m_itemFlags & KParts::BrowserExtension::ShowUp) - addAction( "up" ); - addAction( "back" ); - addAction( "forward" ); + tqaddAction( "up" ); + tqaddAction( "back" ); + tqaddAction( "forward" ); if (d->m_itemFlags & KParts::BrowserExtension::ShowReload) - addAction( "reload" ); + tqaddAction( "reload" ); addSeparator(); } // "open in new window" is either provided by us, or by the tabhandling group if (actNewWindow) { - addAction( actNewWindow ); + tqaddAction( actNewWindow ); addSeparator(); } addGroup( "tabhandling" ); // includes a separator @@ -538,21 +539,21 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) { if ( !currentDir && sReading ) { if ( sDeleting ) { - addAction( "cut" ); + tqaddAction( "cut" ); } - addAction( "copy" ); + tqaddAction( "copy" ); } if ( S_ISDIR(mode) && sWriting ) { if ( currentDir ) - addAction( "paste" ); + tqaddAction( "paste" ); else - addAction( "pasteto" ); + tqaddAction( "pasteto" ); } if ( !currentDir ) { if ( m_lstItems.count() == 1 && sMoving ) - addAction( "rename" ); + tqaddAction( "rename" ); bool addTrash = false; bool addDel = false; @@ -563,7 +564,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( sDeleting ) { if ( !isLocal ) addDel = true; - else if (KApplication::keyboardMouseState() & Qt::ShiftButton) { + else if (KApplication::keyboardMouseState() & TQt::ShiftButton) { addTrash = false; addDel = true; } @@ -575,18 +576,18 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) } if ( addTrash ) - addAction( "trash" ); + tqaddAction( "trash" ); if ( addDel ) - addAction( "del" ); + tqaddAction( "del" ); } } if ( isCurrentTrash ) { - act = new KAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, TQT_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" ); + act = new KAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" ); KSimpleConfig trashConfig( "trashrc", true ); trashConfig.setGroup( "Status" ); act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) ); - addAction( act ); + tqaddAction( act ); } addGroup( "editactions" ); @@ -602,7 +603,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) TQString caption; if (currentDir) { - bool httpPage = (m_sViewURL.protocol().find("http", 0, false) == 0); + bool httpPage = (m_sViewURL.protocol().tqfind("http", 0, false) == 0); if (httpPage) caption = i18n("&Bookmark This Page"); else @@ -615,11 +616,11 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) else caption = i18n("&Bookmark This File"); - act = new KAction( caption, "bookmark_add", 0, this, TQT_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" ); + act = new KAction( caption, "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" ); if (m_lstItems.count() > 1) act->setEnabled(false); if (kapp->authorizeKAction("bookmarks")) - addAction( act ); + tqaddAction( act ); if (bIsLink) addGroup( "linkactions" ); } @@ -706,7 +707,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( cfg.hasKey( "X-KDE-ShowIfDcopCall" ) ) { TQString dcopcall = cfg.readEntry( "X-KDE-ShowIfDcopCall" ); - const TQCString app = dcopcall.section(' ', 0,0).utf8(); + const TQCString app = TQString(dcopcall.section(' ', 0,0)).utf8(); //if( !kapp->dcopClient()->isApplicationRegistered( app )) // continue; //app does not exist so cannot send call @@ -717,8 +718,8 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) TQCString replyType; TQByteArray replyData; - TQCString object = dcopcall.section(' ', 1,-2).utf8(); - TQString function = dcopcall.section(' ', -1); + TQCString object = TQString(dcopcall.section(' ', 1,-2)).utf8(); + TQString function = TQString(dcopcall.section(' ', -1)); if(!function.endsWith("(KURL::List)")) { kdWarning() << "Desktop file " << *eIt << " contains an invalid X-KDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl; continue; //Be safe. @@ -741,7 +742,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) else if ( cfg.hasKey( "X-KDE-Protocols" ) ) { TQStringList protocols = TQStringList::split( "," , cfg.readEntry( "X-KDE-Protocols" ) ); - if ( !protocols.contains( urlForServiceMenu.protocol() ) ) + if ( !protocols.tqcontains( urlForServiceMenu.protocol() ) ) continue; } else if ( urlForServiceMenu.protocol() == "trash" || urlForServiceMenu.url().startsWith( "system:/trash" ) ) @@ -755,7 +756,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( cfg.hasKey( "X-KDE-Require" ) ) { const TQStringList capabilities = cfg.readListEntry( "X-KDE-Require" ); - if ( capabilities.contains( "Write" ) && !sWriting ) + if ( capabilities.tqcontains( "Write" ) && !sWriting ) continue; } if ( (cfg.hasKey( "Actions" ) || cfg.hasKey( "X-KDE-GetActionMenu") ) && cfg.hasKey( "ServiceTypes" ) ) @@ -791,7 +792,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) *it == m_sMimeType) || (!mimeGroup.isEmpty() && ((*it).right(1) == "*" && - (*it).left((*it).find('/')) == mimeGroup))) + (*it).left((*it).tqfind('/')) == mimeGroup))) { checkTheMimetypes = true; } @@ -801,7 +802,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) ok = true; for (TQStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex) { - if( ((*itex).right(1) == "*" && (*itex).left((*itex).find('/')) == mimeGroup) || + if( ((*itex).right(1) == "*" && (*itex).left((*itex).tqfind('/')) == mimeGroup) || ((*itex) == m_sMimeType) ) { ok = false; @@ -882,27 +883,27 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) const TQString onlyShowIn = service->property("OnlyShowIn", TQVariant::String).toString(); if ( !onlyShowIn.isEmpty() ) { const TQStringList aList = TQStringList::split(';', onlyShowIn); - if (!aList.contains("KDE")) + if (!aList.tqcontains("KDE")) continue; } const TQString notShowIn = service->property("NotShowIn", TQVariant::String).toString(); if ( !notShowIn.isEmpty() ) { const TQStringList aList = TQStringList::split(';', notShowIn); - if (aList.contains("KDE")) + if (aList.tqcontains("KDE")) continue; } TQCString nam; nam.setNum( id ); - TQString actionName( (*it)->name().replace("&", "&&") ); + TQString actionName( (*it)->name().tqreplace("&", "&&") ); if ( menu == m_menuElement ) // no submenu -> prefix single offer actionName = i18n( "Open with %1" ).arg( actionName ); act = new KAction( actionName, (*it)->pixmap( KIcon::Small ), 0, - this, TQT_SLOT( slotRunService() ), + TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ), &m_ownActions, nam.prepend( "appservice_" ) ); - addAction( act, menu ); + tqaddAction( act, menu ); m_mapPopup[ id++ ] = *it; } @@ -917,13 +918,13 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) { openWithActionName = i18n( "&Open With..." ); } - KAction *openWithAct = new KAction( openWithActionName, 0, this, TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); - addAction( openWithAct, menu ); + KAction *openWithAct = new KAction( openWithActionName, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); + tqaddAction( openWithAct, menu ); } else // no app offers -> Open With... { - act = new KAction( i18n( "&Open With..." ), 0, this, TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); - addAction( act ); + act = new KAction( i18n( "&Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); + tqaddAction( act ); } } @@ -976,9 +977,9 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( KPropertiesDialog::canDisplay( m_lstItems ) && (kpf & ShowProperties) ) { - act = new KAction( i18n( "&Properties" ), 0, this, TQT_SLOT( slotPopupProperties() ), + act = new KAction( i18n( "&Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupProperties() ), &m_ownActions, "properties" ); - addAction( act ); + tqaddAction( act ); } while ( !m_menuElement.lastChild().isNull() && @@ -990,9 +991,9 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( KFileShare::authorization() == KFileShare::Authorized ) { addSeparator(); - act = new KAction( i18n("Share"), 0, this, TQT_SLOT( slotOpenShareFileDialog() ), + act = new KAction( i18n("Share"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenShareFileDialog() ), &m_ownActions, "sharefile" ); - addAction( act ); + tqaddAction( act ); } } @@ -1034,7 +1035,7 @@ void KonqPopupMenu::slotPopupNewDir() if (m_lstPopupURLs.empty()) return; - KonqOperations::newDir(d->m_parentWidget, m_lstPopupURLs.first()); + KonqOperations::newDir(d->m_tqparentWidget, m_lstPopupURLs.first()); } void KonqPopupMenu::slotPopupEmptyTrashBin() @@ -1072,11 +1073,11 @@ void KonqPopupMenu::slotPopupAddToBookmark() void KonqPopupMenu::slotRunService() { - TQCString senderName = sender()->name(); - int id = senderName.mid( senderName.find( '_' ) + 1 ).toInt(); + TQCString senderName = TQT_TQOBJECT_CONST(sender())->name(); + int id = senderName.mid( senderName.tqfind( '_' ) + 1 ).toInt(); // Is it a usual service (application) - TQMap<int,KService::Ptr>::Iterator it = m_mapPopup.find( id ); + TQMap<int,KService::Ptr>::Iterator it = m_mapPopup.tqfind( id ); if ( it != m_mapPopup.end() ) { KRun::run( **it, m_lstPopupURLs ); @@ -1084,7 +1085,7 @@ void KonqPopupMenu::slotRunService() } // Is it a service specific to desktop entry files ? - TQMap<int,KDEDesktopMimeType::Service>::Iterator it2 = m_mapPopupServices.find( id ); + TQMap<int,KDEDesktopMimeType::Service>::Iterator it2 = m_mapPopupServices.tqfind( id ); if ( it2 != m_mapPopupServices.end() ) { KDEDesktopMimeType::executeService( m_lstPopupURLs, it2.data() ); @@ -1115,19 +1116,19 @@ KPropertiesDialog* KonqPopupMenu::showPropertiesDialog() if (item->entry().count() == 0) // this item wasn't listed by a slave { // KPropertiesDialog will use stat to get more info on the file - return new KPropertiesDialog( item->url(), d->m_parentWidget ); + return new KPropertiesDialog( item->url(), d->m_tqparentWidget ); } } - return new KPropertiesDialog( m_lstItems, d->m_parentWidget ); + return new KPropertiesDialog( m_lstItems, d->m_tqparentWidget ); } KAction *KonqPopupMenu::action( const TQDomElement &element ) const { TQCString name = element.attribute( attrName ).ascii(); - KAction *res = m_ownActions.action( name ); + KAction *res = m_ownActions.action( static_cast<const char *>(name) ); if ( !res ) - res = m_actions.action( name ); + res = m_actions.action( static_cast<const char *>(name) ); if ( !res && m_pMenuNew && strcmp( name, m_pMenuNew->name() ) == 0 ) return m_pMenuNew; @@ -1156,7 +1157,7 @@ void KonqPopupMenu::addPlugins() //search for a plugin with the right protocol KTrader::OfferList plugin_offers; unsigned int pluginCount = 0; - plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes"); + plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::tqfromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes"); if ( plugin_offers.isEmpty() ) return; // no plugins installed do not bother about it @@ -1170,12 +1171,12 @@ void KonqPopupMenu::addPlugins() KonqPopupMenuPlugin *plugin = KParts::ComponentFactory:: createInstanceFromLibrary<KonqPopupMenuPlugin>( TQFile::encodeName( (*iterator)->library() ), - this, + TQT_TQOBJECT(this), (*iterator)->name().latin1() ); if ( !plugin ) continue; // This make the kuick plugin insert its stuff above "Properties" - TQString pluginClientName = TQString::fromLatin1( "Plugin%1" ).arg( pluginCount ); + TQString pluginClientName = TQString::tqfromLatin1( "Plugin%1" ).arg( pluginCount ); addMerge( pluginClientName ); plugin->domDocument().documentElement().setAttribute( "name", pluginClientName ); m_pluginList.append( plugin ); diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h index ee528bc9e..15dbcef5e 100644 --- a/libkonq/konq_popupmenu.h +++ b/libkonq/konq_popupmenu.h @@ -69,7 +69,7 @@ public: // WARNING: bitfield. Next item is 8 /** - * @deprecated lacks parentWidget pointer, and + * @deprecated lacks tqparentWidget pointer, and * uses bool instead of KonqPopupFlags enum, * might do strange things with the 'new window' action. */ @@ -89,7 +89,7 @@ public: KURL viewURL, KActionCollection & actions, KNewMenu * newMenu, - TQWidget * parentWidget, + TQWidget * tqparentWidget, bool showPropertiesAndFileType = true ) KDE_DEPRECATED; /** @@ -99,7 +99,7 @@ public: * @param viewURL the URL shown in the view, to test for RMB click on view background * @param actions list of actions the caller wants to see in the menu * @param newMenu "New" menu, shared with the File menu, in konqueror - * @param parentWidget the widget we're showing this popup for. Helps destroying + * @param tqparentWidget the widget we're showing this popup for. Helps destroying * the popup if the widget is destroyed before the popup. * @param kpf flags from the KonqPopupFlags enum, set by the calling application * @param f flags from the BrowserExtension enum, set by the calling part @@ -117,7 +117,7 @@ public: const KURL& viewURL, KActionCollection & actions, KNewMenu * newMenu, - TQWidget * parentWidget, + TQWidget * tqparentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags f /*= KParts::BrowserExtension::DefaultPopupItems*/); @@ -177,7 +177,7 @@ protected: KActionCollection m_ownActions; private: - void init (TQWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags itemFlags); + void init (TQWidget * tqparentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags itemFlags); void setup(KonqPopupFlags kpf); void addPlugins( ); int insertServicesSubmenus(const TQMap<TQString, ServiceList>& list, TQDomElement& menu, bool isBuiltin); @@ -210,7 +210,7 @@ public: * Constructor * If you want to insert a dynamic item or menu to konqpopupmenu * this class is the right choice. - * Create a KAction and use _popup->addAction(new KAction ); + * Create a KAction and use _popup->tqaddAction(new KAction ); * If you want to create a submenu use _popup->addGroup( ); */ KonqPopupMenuPlugin( KonqPopupMenu *_popup, const char *name ); // this should also be the parent diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc index 303fe044f..eb9c68bbc 100644 --- a/libkonq/konq_propsview.cc +++ b/libkonq/konq_propsview.cc @@ -40,7 +40,7 @@ static TQPixmap wallpaperPixmap( const TQString & _wallpaper ) key += _wallpaper; KPixmap pix; - if ( TQPixmapCache::find( key, pix ) ) + if ( TQPixmapCache::tqfind( key, pix ) ) return pix; TQString path = locate("tiles", _wallpaper); @@ -103,7 +103,7 @@ KonqPropsView::KonqPropsView( KInstance * instance, KonqPropsView * defaultProps //the default-to-off bias to propagate up. if (!config->readBoolEntry("EnableSoundPreviews", false)) { - if (!m_dontPreview.contains("audio/")) + if (!m_dontPreview.tqcontains("audio/")) m_dontPreview.append("audio/"); } @@ -234,13 +234,13 @@ bool KonqPropsView::enterDir( const KURL & dir ) { if (!config->readBoolEntry("EnableSoundPreviews", false)) - if (!m_dontPreview.contains("audio/")) + if (!m_dontPreview.tqcontains("audio/")) m_dontPreview.append("audio/"); } else { - if (m_defaultProps->m_dontPreview.contains("audio/")) - if (!m_dontPreview.contains("audio/")) + if (m_defaultProps->m_dontPreview.tqcontains("audio/")) + if (!m_dontPreview.tqcontains("audio/")) m_dontPreview.append("audio/"); } } @@ -395,7 +395,7 @@ void KonqPropsView::setShowingDirectoryOverlays( bool show ) void KonqPropsView::setShowingPreview( const TQString &preview, bool show ) { - if ( m_dontPreview.contains( preview ) != show ) + if ( m_dontPreview.tqcontains( preview ) != show ) return; else if ( show ) m_dontPreview.remove( preview ); @@ -409,7 +409,7 @@ void KonqPropsView::setShowingPreview( const TQString &preview, bool show ) //Audio is special-cased, as we use a binary setting //for it to get it to follow the defaults right. - bool audioEnabled = !m_dontPreview.contains("audio/"); + bool audioEnabled = !m_dontPreview.tqcontains("audio/"); //Don't write it out into the DontPreview line if (!audioEnabled) @@ -474,7 +474,7 @@ void KonqPropsView::setBgColor( const TQColor & color ) const TQColor & KonqPropsView::bgColor( TQWidget * widget ) const { if ( !m_bgColor.isValid() ) - return widget->colorGroup().base(); + return widget->tqcolorGroup().base(); else return m_bgColor; } @@ -501,7 +501,7 @@ void KonqPropsView::setTextColor( const TQColor & color ) const TQColor & KonqPropsView::textColor( TQWidget * widget ) const { if ( !m_textColor.isValid() ) - return widget->colorGroup().text(); + return widget->tqcolorGroup().text(); else return m_textColor; } @@ -567,10 +567,10 @@ const TQStringList& KonqPropsView::previewSettings() for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it ) { TQString name = (*it)->desktopEntryName(); - if ( ! m_dontPreview.contains(name) ) + if ( ! m_dontPreview.tqcontains(name) ) d->previewsToShow->append( name ); } - if ( ! m_dontPreview.contains( "audio/" ) ) + if ( ! m_dontPreview.tqcontains( "audio/" ) ) d->previewsToShow->append( "audio/" ); } } diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h index c69b97966..a1d397d18 100644 --- a/libkonq/konq_propsview.h +++ b/libkonq/konq_propsview.h @@ -107,7 +107,7 @@ public: void setShowingPreview( const TQString &preview, bool show ); void setShowingPreview( bool show ); - bool isShowingPreview( const TQString &preview ) const { return ! m_dontPreview.contains(preview); } + bool isShowingPreview( const TQString &preview ) const { return ! m_dontPreview.tqcontains(preview); } bool isShowingPreview(); const TQStringList &previewSettings(); @@ -133,7 +133,7 @@ protected: TQString currentGroup() const { return isDefaultProperties() ? - TQString::fromLatin1("Settings") : TQString::fromLatin1("URL properties"); + TQString::tqfromLatin1("Settings") : TQString::tqfromLatin1("URL properties"); } private: diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc index d48c7af10..51eb595a5 100644 --- a/libkonq/konq_settings.cc +++ b/libkonq/konq_settings.cc @@ -142,14 +142,14 @@ bool KonqFMSettings::shouldEmbed( const TQString & serviceType ) const kdDebug(1203) << "No X-KDE-AutoEmbed, looking for group" << endl; } // 2 - in the configuration for the group if nothing was found in the mimetype - TQString serviceTypeGroup = serviceType.left(serviceType.find("/")); + TQString serviceTypeGroup = serviceType.left(serviceType.tqfind("/")); kdDebug(1203) << "KonqFMSettings::shouldEmbed : serviceTypeGroup=" << serviceTypeGroup << endl; if ( serviceTypeGroup == "inode" || serviceTypeGroup == "Browser" || serviceTypeGroup == "Konqueror" ) return true; //always embed mimetype inode/*, Browser/* and Konqueror/* - TQMap<TQString, TQString>::ConstIterator it = m_embedMap.find( TQString::fromLatin1("embed-")+serviceTypeGroup ); + TQMap<TQString, TQString>::ConstIterator it = m_embedMap.tqfind( TQString::tqfromLatin1("embed-")+serviceTypeGroup ); if ( it != m_embedMap.end() ) { kdDebug(1203) << "KonqFMSettings::shouldEmbed: " << it.data() << endl; - return it.data() == TQString::fromLatin1("true"); + return it.data() == TQString::tqfromLatin1("true"); } // 3 - if no config found, use default. // Note: if you change those defaults, also change kcontrol/filetypes/typeslistitem.cpp ! diff --git a/libkonq/konq_sound.cc b/libkonq/konq_sound.cc index 577dd5dc4..31448a57e 100644 --- a/libkonq/konq_sound.cc +++ b/libkonq/konq_sound.cc @@ -71,7 +71,7 @@ const TQStringList &KonqSoundPlayerImpl::mimeTypes() vector<string> *prop = (*it).getProperty("MimeType"); for (vector<string>::iterator mt = prop->begin(); mt != prop->end(); ++mt) - if ((*mt).length()) // && (*mt).find("video/") == string::npos) + if ((*mt).length()) // && (*mt).tqfind("video/") == string::npos) m_mimeTypes << (*mt).c_str(); delete prop; } @@ -122,7 +122,7 @@ TQObject *KonqSoundFactory::createObject(TQObject *, const char *, const char *className, const TQStringList &) { if (qstrcmp(className, "KonqSoundPlayer") == 0) - return new KonqSoundPlayerImpl(); + return TQT_TQOBJECT(new KonqSoundPlayerImpl()); return 0; } diff --git a/libkonq/konq_sound.h b/libkonq/konq_sound.h index 32bddc40f..c0139e763 100644 --- a/libkonq/konq_sound.h +++ b/libkonq/konq_sound.h @@ -21,7 +21,7 @@ #include <klibloader.h> -class KonqSoundPlayer : public QObject +class KonqSoundPlayer : public TQObject { public: virtual const TQStringList &mimeTypes() = 0; diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cc index 91eece83b..962c26741 100644 --- a/libkonq/konq_undo.cc +++ b/libkonq/konq_undo.cc @@ -135,7 +135,7 @@ void KonqCommandRecorder::slotCopyingDone( KIO::Job *job, const KURL &from, cons Q_ASSERT( from.isLocalFile() ); Q_ASSERT( to.protocol() == "trash" ); TQMap<TQString, TQString> metaData = job->metaData(); - TQMap<TQString, TQString>::ConstIterator it = metaData.find( "trashURL-" + from.path() ); + TQMap<TQString, TQString>::ConstIterator it = metaData.tqfind( "trashURL-" + from.path() ); if ( it != metaData.end() ) { // Update URL op.m_dst = it.data(); @@ -317,7 +317,7 @@ void KonqUndoManager::undo() } else if ( (*it).m_link ) { - if ( !d->m_fileCleanupStack.contains( (*it).m_dst ) ) + if ( !d->m_fileCleanupStack.tqcontains( (*it).m_dst ) ) d->m_fileCleanupStack.prepend( (*it).m_dst ); if ( d->m_current.m_type != KonqCommand::MOVE ) @@ -339,7 +339,7 @@ void KonqUndoManager::undo() KURL::List::ConstIterator it = d->m_current.m_src.begin(); KURL::List::ConstIterator end = d->m_current.m_src.end(); for (; it != end; ++it ) - if ( !d->m_dirStack.contains( *it) ) + if ( !d->m_dirStack.tqcontains( *it) ) d->m_dirStack.push( *it ); } */ @@ -390,7 +390,7 @@ void KonqUndoManager::slotResult( KIO::Job *job ) void KonqUndoManager::addDirToUpdate( const KURL& url ) { - if ( d->m_dirsToUpdate.find( url ) == d->m_dirsToUpdate.end() ) + if ( d->m_dirsToUpdate.tqfind( url ) == d->m_dirsToUpdate.end() ) d->m_dirsToUpdate.prepend( url ); } @@ -652,13 +652,13 @@ TQDataStream &operator>>( TQDataStream &stream, KonqBasicOperation &op ) TQDataStream &operator<<( TQDataStream &stream, const KonqCommand &cmd ) { - stream << cmd.m_valid << (Q_INT8)cmd.m_type << cmd.m_opStack << cmd.m_src << cmd.m_dst; + stream << cmd.m_valid << (TQ_INT8)cmd.m_type << cmd.m_opStack << cmd.m_src << cmd.m_dst; return stream; } TQDataStream &operator>>( TQDataStream &stream, KonqCommand &cmd ) { - Q_INT8 type; + TQ_INT8 type; stream >> cmd.m_valid >> type >> cmd.m_opStack >> cmd.m_src >> cmd.m_dst; cmd.m_type = static_cast<KonqCommand::Type>( type ); return stream; diff --git a/libkonq/konq_undo.h b/libkonq/konq_undo.h index 3e704a8d2..6be92033b 100644 --- a/libkonq/konq_undo.h +++ b/libkonq/konq_undo.h @@ -68,7 +68,7 @@ struct KonqCommand KURL m_dst; }; -class KonqCommandRecorder : public QObject +class KonqCommandRecorder : public TQObject { Q_OBJECT public: diff --git a/libkonq/konq_xmlguiclient.cc b/libkonq/konq_xmlguiclient.cc index 5561ced8e..1f4d6a13b 100644 --- a/libkonq/konq_xmlguiclient.cc +++ b/libkonq/konq_xmlguiclient.cc @@ -70,12 +70,12 @@ TQDomDocument KonqXMLGUIClient::domDocument() const return m_doc; } -void KonqXMLGUIClient::addAction( KAction *act, const TQDomElement &menu ) +void KonqXMLGUIClient::tqaddAction( KAction *act, const TQDomElement &menu ) { - addAction( act->name(), menu ); + tqaddAction( act->name(), menu ); } -void KonqXMLGUIClient::addAction( const char *name, const TQDomElement &menu ) +void KonqXMLGUIClient::tqaddAction( const char *name, const TQDomElement &menu ) { static const TQString& tagAction = KGlobal::staticQString( "action" ); diff --git a/libkonq/konq_xmlguiclient.h b/libkonq/konq_xmlguiclient.h index 772554dd2..596615872 100644 --- a/libkonq/konq_xmlguiclient.h +++ b/libkonq/konq_xmlguiclient.h @@ -45,8 +45,8 @@ public: TQDomElement DomElement( ) const; // KDE4: s/D/d/ protected: - void addAction( KAction *action, const TQDomElement &menu = TQDomElement() ); - void addAction( const char *name, const TQDomElement &menu = TQDomElement() ); + void tqaddAction( KAction *action, const TQDomElement &menu = TQDomElement() ); + void tqaddAction( const char *name, const TQDomElement &menu = TQDomElement() ); void addSeparator( const TQDomElement &menu = TQDomElement() ); /// only add a separator if an action is added afterwards void addPendingSeparator(); diff --git a/libkonq/konqbookmarkmanager.h b/libkonq/konqbookmarkmanager.h index 9774d92e9..a45878562 100644 --- a/libkonq/konqbookmarkmanager.h +++ b/libkonq/konqbookmarkmanager.h @@ -11,7 +11,7 @@ public: static KBookmarkManager * self() { if ( !s_bookmarkManager ) { - TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); + TQString bookmarksFile = locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml")); s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile ); } return s_bookmarkManager; diff --git a/nsplugins/NSPluginCallbackIface.h b/nsplugins/NSPluginCallbackIface.h index 33e9f85c3..6b23e87a9 100644 --- a/nsplugins/NSPluginCallbackIface.h +++ b/nsplugins/NSPluginCallbackIface.h @@ -37,7 +37,7 @@ k_dcop: virtual ASYNC requestURL(TQString url, TQString target) = 0; virtual ASYNC postURL(TQString url, TQString target, TQByteArray data, TQString mime) = 0; virtual ASYNC statusMessage( TQString msg ) = 0; - virtual ASYNC evalJavaScript( Q_INT32 id, TQString script ) = 0; + virtual ASYNC evalJavaScript( TQ_INT32 id, TQString script ) = 0; }; diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp index 3824334c0..9cd60d77c 100644 --- a/nsplugins/nspluginloader.cpp +++ b/nsplugins/nspluginloader.cpp @@ -130,7 +130,7 @@ void NSPluginInstance::windowChanged(WId w) setBackgroundMode(w == 0 ? TQWidget::PaletteBackground : TQWidget::NoBackground); if (w == 0) { // FIXME: Put a notice here to tell the user that it crashed. - repaint(); + tqrepaint(); } } @@ -174,13 +174,13 @@ void NSPluginInstance::focusOutEvent( TQFocusEvent* event ) void NSPluginInstance::displayPlugin() { - qApp->syncX(); // process pending X commands + tqApp->syncX(); // process pending X commands stub->displayPlugin(); } void NSPluginInstance::resizePlugin( int w, int h ) { - qApp->syncX(); + tqApp->syncX(); stub->resizePlugin( w, h ); } @@ -292,7 +292,7 @@ void NSPluginLoader::scanPlugins() stripped = stripped.right( stripped.length()-p ); // add filetype to list - if ( !stripped.isEmpty() && !_filetype.find(stripped) ) + if ( !stripped.isEmpty() && !_filetype.tqfind(stripped) ) _filetype.insert( stripped, new TQString(mime)); } } diff --git a/nsplugins/nspluginloader.h b/nsplugins/nspluginloader.h index 1748bb504..13e77093d 100644 --- a/nsplugins/nspluginloader.h +++ b/nsplugins/nspluginloader.h @@ -78,7 +78,7 @@ private: // wrappers }; -class NSPluginLoader : public QObject +class NSPluginLoader : public TQObject { Q_OBJECT diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index e7580db93..f55f6469b 100644 --- a/nsplugins/plugin_part.cpp +++ b/nsplugins/plugin_part.cpp @@ -90,7 +90,7 @@ TQString PluginLiveConnectExtension::evalJavaScript( const TQString & script ) kdDebug(1432) << "PLUGIN:LiveConnect::evalJavaScript " << script << endl; ArgList args; TQString jscode; - jscode.sprintf("this.__nsplugin=eval(\"%s\")", TQString(script).replace('\\', "\\\\").replace('"', "\\\"").latin1()); + jscode.sprintf("this.__nsplugin=eval(\"%s\")", TQString(script).tqreplace('\\', "\\\\").tqreplace('"', "\\\"").latin1()); //kdDebug(1432) << "String is [" << jscode << "]" << endl; args.push_back(qMakePair(KParts::LiveConnectExtension::TypeString, jscode)); TQString nsplugin("Undefined"); @@ -171,13 +171,13 @@ PluginFactory::~PluginFactory() s_instance = 0; } -KParts::Part * PluginFactory::createPartObject(TQWidget *parentWidget, const char *widgetName, +KParts::Part * PluginFactory::createPartObject(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args) { Q_UNUSED(classname) kdDebug(1432) << "PluginFactory::create" << endl; - KParts::Part *obj = new PluginPart(parentWidget, widgetName, parent, name, args); + KParts::Part *obj = new PluginPart(tqparentWidget, widgetName, parent, name, args); return obj; } @@ -201,7 +201,7 @@ KAboutData *PluginFactory::aboutData() /**************************************************************************/ -PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent, +PluginPart::PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList &args) : KParts::ReadOnlyPart(parent, name), _widget(0), _args(args), _destructed(0L) @@ -226,9 +226,9 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject _callback = new NSPluginCallback(this); // create a canvas to insert our widget - _canvas = new PluginCanvasWidget( parentWidget, widgetName ); + _canvas = new PluginCanvasWidget( tqparentWidget, widgetName ); //_canvas->setFocusPolicy( TQWidget::ClickFocus ); - _canvas->setFocusPolicy( TQWidget::WheelFocus ); + _canvas->setFocusPolicy( TQ_WheelFocus ); _canvas->setBackgroundMode( TQWidget::NoBackground ); setWidget(_canvas); _canvas->show(); @@ -266,7 +266,7 @@ bool PluginPart::openURL(const KURL &url) TQStringList::Iterator it = _args.begin(); for ( ; it != _args.end(); ) { - int equalPos = (*it).find("="); + int equalPos = (*it).tqfind("="); if (equalPos>0) { TQString name = (*it).left(equalPos).upper(); @@ -307,7 +307,7 @@ bool PluginPart::openURL(const KURL &url) _widget = inst; } else { TQLabel *label = new TQLabel( i18n("Unable to load Netscape plugin for %1").arg(url.url()), _canvas ); - label->setAlignment( AlignCenter | WordBreak ); + label->tqsetAlignment( AlignCenter | WordBreak ); _widget = label; } diff --git a/nsplugins/plugin_part.h b/nsplugins/plugin_part.h index 012d5443f..6173eeed8 100644 --- a/nsplugins/plugin_part.h +++ b/nsplugins/plugin_part.h @@ -67,7 +67,7 @@ public: PluginFactory(); virtual ~PluginFactory(); - virtual KParts::Part * createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, + virtual KParts::Part * createPartObject(TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList()); @@ -82,7 +82,7 @@ private: }; -class PluginCanvasWidget : public QWidget +class PluginCanvasWidget : public TQWidget { Q_OBJECT public: @@ -102,7 +102,7 @@ class PluginPart: public KParts::ReadOnlyPart { Q_OBJECT public: - PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent, + PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList &args = TQStringList()); virtual ~PluginPart(); diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index 6914deb93..91da2dd52 100644 --- a/nsplugins/pluginscan.cpp +++ b/nsplugins/pluginscan.cpp @@ -130,7 +130,7 @@ void deletePluginMimeTypes() } for ( unsigned int i=0; i<dirs.count(); i++ ) { - if ( !dirs[i].contains(".") ) { + if ( !dirs[i].tqcontains(".") ) { // check all mime types for X-KDE-nsplugin flag kdDebug(1433) << " - Looking in " << dirs[i] << endl; @@ -162,7 +162,7 @@ void generateMimeType( TQString mime, TQString extensions, TQString pluginName, // get directory from mime string TQString dir; TQString name; - int pos = mime.findRev('/'); + int pos = mime.tqfindRev('/'); if ( pos<0 ) { kdDebug(1433) << "Invalid MIME type " << mime << endl; kdDebug(1433) << "<- generateMimeType" << endl; @@ -251,14 +251,14 @@ int tryCheck(int write_fd, const TQString &absFile) NPError err = func_GetValue( 0, NPPVpluginNameString, (void*)&buf ); if ( err==NPERR_NO_ERROR ) - name = TQString::fromLatin1( buf ); + name = TQString::tqfromLatin1( buf ); kdDebug() << "name = " << name << endl; // get name NPError nperr = func_GetValue( 0, NPPVpluginDescriptionString, (void*)&buf ); if ( nperr==NPERR_NO_ERROR ) - description = TQString::fromLatin1( buf ); + description = TQString::tqfromLatin1( buf ); kdDebug() << "description = " << description << endl; } else @@ -283,7 +283,7 @@ int tryCheck(int write_fd, const TQString &absFile) // remove version info, as it is not used at the moment TQRegExp versionRegExp(";version=[^:]*:"); - mimeInfo.replace( versionRegExp, ":"); + mimeInfo.tqreplace( versionRegExp, ":"); // unload plugin lib kdDebug(1433) << " - unloading plugin" << endl; @@ -318,7 +318,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList, for (unsigned int i=0; i<files.count(); i++) { TQString extension; - int j = files[i].findRev('.'); + int j = files[i].tqfindRev('.'); if (j > 0) extension = files[i].mid(j+1); @@ -346,7 +346,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList, // open the library and ask for the mimetype kdDebug(1433) << " - opening " << absFile << endl; - cache.device()->flush(); + cache.tqdevice()->flush(); // fork, so that a crash in the plugin won't stop the scanning of other plugins int pipes[2]; if (pipe(pipes) != 0) continue; @@ -404,10 +404,10 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList, for ( type=types.begin(); type!=types.end(); ++type ) { kdDebug(1433) << " - type=" << *type << endl; - name = name.replace( ':', "%3A" ); + name = name.tqreplace( ':', "%3A" ); TQString entry = name + ":" + *type; - if ( !mimeInfoList.contains( entry ) ) { + if ( !mimeInfoList.tqcontains( entry ) ) { if (!actuallyUsing) { // note the plugin name cache << "[" << absFile << "]" << endl; @@ -444,7 +444,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList, static int depth = 0; // avoid recursion because of symlink circles depth++; for ( unsigned int i=0; i<dirs.count(); i++ ) { - if ( depth<8 && !dirs[i].contains(".") ) + if ( depth<8 && !dirs[i].tqcontains(".") ) scanDirectory( dirs.absFilePath(dirs[i]), mimeInfoList, cache ); } depth--; @@ -620,7 +620,7 @@ int main( int argc, char **argv ) TQString desc = info[3]; // append to global mime type list - if ( !mimeTypes.contains(type) ) { + if ( !mimeTypes.tqcontains(type) ) { kdDebug(1433) << " - mimeType=" << type << endl; mimeTypes.append( type ); diff --git a/nsplugins/sdk/jni.h b/nsplugins/sdk/jni.h index 863075afa..7ef133a51 100644 --- a/nsplugins/sdk/jni.h +++ b/nsplugins/sdk/jni.h @@ -580,7 +580,7 @@ struct JNINativeInterface_ { (JNIEnv *env, jclass clazz, jfieldID fieldID, jdouble value); jstring (JNICALL *NewString) - (JNIEnv *env, const jchar *unicode, jsize len); + (JNIEnv *env, const jchar *tqunicode, jsize len); jsize (JNICALL *GetStringLength) (JNIEnv *env, jstring str); const jchar *(JNICALL *GetStringChars) @@ -1508,8 +1508,8 @@ struct JNIEnv_ { functions->SetStaticDoubleField(this,clazz,fieldID,value); } - jstring NewString(const jchar *unicode, jsize len) { - return functions->NewString(this,unicode,len); + jstring NewString(const jchar *tqunicode, jsize len) { + return functions->NewString(this,tqunicode,len); } jsize GetStringLength(jstring str) { return functions->GetStringLength(this,str); diff --git a/nsplugins/sdk/jri.h b/nsplugins/sdk/jri.h index f29945b94..62d542a8b 100644 --- a/nsplugins/sdk/jri.h +++ b/nsplugins/sdk/jri.h @@ -341,8 +341,8 @@ typedef const JRIEnvInterface* JRIEnv; #define JRI_SetStaticFieldDouble(env, clazz, fieldID, value) \ (((*(env))->SetStaticFieldDouble)(env, JRI_SetStaticFieldDouble_op, clazz, fieldID, value)) -#define JRI_NewString(env, unicode, len) \ - (((*(env))->NewString)(env, JRI_NewString_op, unicode, len)) +#define JRI_NewString(env, tqunicode, len) \ + (((*(env))->NewString)(env, JRI_NewString_op, tqunicode, len)) #define JRI_GetStringLength(env, string) \ (((*(env))->GetStringLength)(env, JRI_GetStringLength_op, string)) diff --git a/nsplugins/sdk/npruntime.h b/nsplugins/sdk/npruntime.h index 5a8423390..06a8e1ee6 100644 --- a/nsplugins/sdk/npruntime.h +++ b/nsplugins/sdk/npruntime.h @@ -66,7 +66,7 @@ #define _NP_RUNTIME_H_ #include <tqglobal.h> -typedef Q_UINT32 uint32_t; +typedef TQ_UINT32 uint32_t; #ifdef __cplusplus extern "C" { @@ -306,7 +306,7 @@ typedef bool (*NPRemovePropertyFunctionPtr)(NPObject *npobj, NPInvalidateFunctionPtr is called by the scripting environment when the native code is shutdown. Any attempt to message a - NPObject instance after the invalidate callback has been + NPObject instance after the tqinvalidate callback has been called will result in undefined behavior, even if the native code is still retaining those NPObject instances. (The runtime will typically return immediately, with 0 or NULL, from an attempt @@ -318,7 +318,7 @@ struct NPClass uint32_t structVersion; NPAllocateFunctionPtr allocate; NPDeallocateFunctionPtr deallocate; - NPInvalidateFunctionPtr invalidate; + NPInvalidateFunctionPtr tqinvalidate; NPHasMethodFunctionPtr hasMethod; NPInvokeFunctionPtr invoke; NPInvokeDefaultFunctionPtr invokeDefault; diff --git a/nsplugins/sdk/npupp.h b/nsplugins/sdk/npupp.h index dff545d9f..4ba50e5ae 100644 --- a/nsplugins/sdk/npupp.h +++ b/nsplugins/sdk/npupp.h @@ -1690,8 +1690,8 @@ typedef struct _NPNetscapeFuncs { NPN_PostURLNotifyUPP posturlnotify; NPN_GetValueUPP getvalue; NPN_SetValueUPP setvalue; - NPN_InvalidateRectUPP invalidaterect; - NPN_InvalidateRegionUPP invalidateregion; + NPN_InvalidateRectUPP tqinvalidaterect; + NPN_InvalidateRegionUPP tqinvalidateregion; NPN_ForceRedrawUPP forceredraw; NPN_GetStringIdentifierUPP getstringidentifier; NPN_GetStringIdentifiersUPP getstringidentifiers; diff --git a/nsplugins/viewer/NSPluginClassIface.h b/nsplugins/viewer/NSPluginClassIface.h index 7eb71f27d..c9051821d 100644 --- a/nsplugins/viewer/NSPluginClassIface.h +++ b/nsplugins/viewer/NSPluginClassIface.h @@ -47,10 +47,10 @@ class NSPluginClassIface : virtual public DCOPObject k_dcop: - virtual DCOPRef newInstance(TQString url, TQString mimeType, Q_INT8 embed, + virtual DCOPRef newInstance(TQString url, TQString mimeType, TQ_INT8 embed, TQStringList argn, TQStringList argv, - TQString appId, TQString callbackId, Q_INT8 reload, - Q_INT8 doPost, TQByteArray postData, Q_UINT32 xembed) = 0; + TQString appId, TQString callbackId, TQ_INT8 reload, + TQ_INT8 doPost, TQByteArray postData, TQ_UINT32 xembed) = 0; virtual TQString getMIMEDescription() = 0; }; @@ -66,11 +66,11 @@ k_dcop: virtual int winId() = 0; - virtual int setWindow(Q_INT8 remove=0) = 0; + virtual int setWindow(TQ_INT8 remove=0) = 0; - virtual void resizePlugin(Q_INT32 w, Q_INT32 h) = 0; + virtual void resizePlugin(TQ_INT32 w, TQ_INT32 h) = 0; - virtual void javascriptResult(Q_INT32 id, TQString result) = 0; + virtual void javascriptResult(TQ_INT32 id, TQString result) = 0; virtual void displayPlugin() = 0; diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp index 9f5f43d51..dbc865fb5 100644 --- a/nsplugins/viewer/kxt.cpp +++ b/nsplugins/viewer/kxt.cpp @@ -255,7 +255,7 @@ static void np_event_proc( XEvent* e ) { Widget xtw = XtWindowToWidget( e->xany.display, e->xany.window ); - if ( xtw && qApp->loopLevel() > 0 ) { + if ( xtw && tqApp->loopLevel() > 0 ) { // Allow Xt to process the event qt_np_cascade_event_handler[e->type]( e ); } @@ -505,7 +505,7 @@ KXtWidget::~KXtWidget() if ( need_reroot ) { hide(); - XReparentWindow(qt_xdisplay(), winId(), qApp->desktop()->winId(), + XReparentWindow(qt_xdisplay(), winId(), tqApp->desktop()->winId(), x(), y()); } @@ -567,7 +567,7 @@ bool KXtWidget::isActiveWindow() const TQWidget *w = find( (WId)win ); if ( w ) { // We know that window - return w->topLevelWidget() == topLevelWidget(); + return w->tqtopLevelWidget() == tqtopLevelWidget(); } else { // Window still may be a parent (if top-level is foreign window) Window root, parent; diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp index be313b52b..f91e3fd9f 100644 --- a/nsplugins/viewer/nsplugin.cpp +++ b/nsplugins/viewer/nsplugin.cpp @@ -138,7 +138,7 @@ void g_NPN_ForceRedraw(NPP /*instance*/) } -// invalidate rect +// tqinvalidate rect void g_NPN_InvalidateRect(NPP /*instance*/, NPRect* /*invalidRect*/) { // http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api7.html#999503 @@ -147,7 +147,7 @@ void g_NPN_InvalidateRect(NPP /*instance*/, NPRect* /*invalidRect*/) } -// invalidate region +// tqinvalidate region void g_NPN_InvalidateRegion(NPP /*instance*/, NPRegion /*invalidRegion*/) { // http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api8.html#999528 @@ -252,8 +252,8 @@ NPError g_NPN_GetURL(NPP instance, const char *url, const char *target) NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata); if (inst) { - inst->requestURL( TQString::fromLatin1(url), TQString::null, - TQString::fromLatin1(target), 0 ); + inst->requestURL( TQString::tqfromLatin1(url), TQString::null, + TQString::tqfromLatin1(target), 0 ); } return NPERR_NO_ERROR; @@ -267,8 +267,8 @@ NPError g_NPN_GetURLNotify(NPP instance, const char *url, const char *target, NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata); if (inst) { kdDebug(1431) << "g_NPN_GetURLNotify: ndata=" << (void*)inst << endl; - inst->requestURL( TQString::fromLatin1(url), TQString::null, - TQString::fromLatin1(target), notifyData, true ); + inst->requestURL( TQString::tqfromLatin1(url), TQString::null, + TQString::tqfromLatin1(target), notifyData, true ); } return NPERR_NO_ERROR; @@ -318,7 +318,7 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target, break; } - TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); + TQString thisLine = TQString::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); previousStart = &buf[l]; previousCR = true; @@ -360,9 +360,9 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target, } NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata); - if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) { - inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(), - TQString::fromLatin1(target), notifyData, args, true ); + if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) { + inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(), + TQString::tqfromLatin1(target), notifyData, args, true ); } else { // Unsupported / insecure return NPERR_INVALID_URL; @@ -415,7 +415,7 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target, break; } - TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); + TQString thisLine = TQString::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); previousStart = &buf[l]; previousCR = true; @@ -457,9 +457,9 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target, } NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata); - if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) { - inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(), - TQString::fromLatin1(target), 0L, args, false ); + if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) { + inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(), + TQString::tqfromLatin1(target), 0L, args, false ); } else { // Unsupported / insecure return NPERR_INVALID_URL; @@ -820,7 +820,7 @@ void NSPluginInstance::timer() s->post( url, req.data, req.mime, req.notify, req.args ); } else if (url.lower().startsWith("javascript:")){ if (_callback) { - static Q_INT32 _jsrequestid = 0; + static TQ_INT32 _jsrequestid = 0; _jsrequests.insert(_jsrequestid, new Request(req)); _callback->evalJavaScript(_jsrequestid++, url.mid(11)); } else { @@ -916,7 +916,7 @@ void NSPluginInstance::streamFinished( NSPluginStreamBase* strm ) _timer->start( 100, true ); } -int NSPluginInstance::setWindow(Q_INT8 remove) +int NSPluginInstance::setWindow(TQ_INT8 remove) { if (remove) { @@ -980,7 +980,7 @@ static void resizeWidgets(Window w, int width, int height) { } -void NSPluginInstance::resizePlugin(Q_INT32 w, Q_INT32 h) +void NSPluginInstance::resizePlugin(TQ_INT32 w, TQ_INT32 h) { if (w == _width && h == _height) return; @@ -1021,8 +1021,8 @@ void NSPluginInstance::resizePlugin(Q_INT32 w, Q_INT32 h) } -void NSPluginInstance::javascriptResult(Q_INT32 id, TQString result) { - TQMap<int, Request*>::iterator i = _jsrequests.find( id ); +void NSPluginInstance::javascriptResult(TQ_INT32 id, TQString result) { + TQMap<int, Request*>::iterator i = _jsrequests.tqfind( id ); if (i != _jsrequests.end()) { Request *req = i.data(); _jsrequests.remove( i ); @@ -1295,7 +1295,7 @@ void NSPluginViewer::shutdown() #if QT_VERSION < 0x030100 quitXt(); #else - qApp->quit(); + tqApp->quit(); #endif } @@ -1434,8 +1434,8 @@ int NSPluginClass::initialize() _nsFuncs.posturlnotify = g_NPN_PostURLNotify; _nsFuncs.getvalue = g_NPN_GetValue; _nsFuncs.setvalue = g_NPN_SetValue; - _nsFuncs.invalidaterect = g_NPN_InvalidateRect; - _nsFuncs.invalidateregion = g_NPN_InvalidateRegion; + _nsFuncs.tqinvalidaterect = g_NPN_InvalidateRect; + _nsFuncs.tqinvalidateregion = g_NPN_InvalidateRegion; _nsFuncs.forceredraw = g_NPN_ForceRedraw; // initialize plugin @@ -1458,10 +1458,10 @@ void NSPluginClass::shutdown() } -DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, Q_INT8 embed, +DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, TQ_INT8 embed, TQStringList argn, TQStringList argv, TQString appId, TQString callbackId, - Q_INT8 reload, Q_INT8 doPost, TQByteArray postData, Q_UINT32 xembed ) + TQ_INT8 reload, TQ_INT8 doPost, TQByteArray postData, TQ_UINT32 xembed ) { kdDebug(1431) << "-> NSPluginClass::NewInstance" << endl; @@ -1670,7 +1670,7 @@ void NSPluginStreamBase::updateURL( const KURL& newURL ) int NSPluginStreamBase::process( const TQByteArray &data, int start ) { int32 max, sent, to_sent, len; - char *d = data.data() + start; + char *d = const_cast<TQByteArray&>(data).data() + start; to_sent = data.size() - start; while (to_sent > 0) diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h index da92edd76..e968eb684 100644 --- a/nsplugins/viewer/nsplugin.h +++ b/nsplugins/viewer/nsplugin.h @@ -63,7 +63,7 @@ class KLibrary; class TQTimer; -class NSPluginStreamBase : public QObject +class NSPluginStreamBase : public TQObject { Q_OBJECT friend class NSPluginInstance; @@ -172,9 +172,9 @@ public: // DCOP functions void shutdown(); int winId() { return _form != 0 ? XtWindow(_form) : 0; } - int setWindow(Q_INT8 remove=0); - void resizePlugin(Q_INT32 w, Q_INT32 h); - void javascriptResult(Q_INT32 id, TQString result); + int setWindow(TQ_INT8 remove=0); + void resizePlugin(TQ_INT32 w, TQ_INT32 h); + void javascriptResult(TQ_INT32 id, TQString result); void displayPlugin(); void gotFocusIn(); void gotFocusOut(); @@ -281,10 +281,10 @@ public: ~NSPluginClass(); TQString getMIMEDescription(); - DCOPRef newInstance(TQString url, TQString mimeType, Q_INT8 embed, + DCOPRef newInstance(TQString url, TQString mimeType, TQ_INT8 embed, TQStringList argn, TQStringList argv, - TQString appId, TQString callbackId, Q_INT8 reload, Q_INT8 post, - TQByteArray postData, Q_UINT32 xembed ); + TQString appId, TQString callbackId, TQ_INT8 reload, TQ_INT8 post, + TQByteArray postData, TQ_UINT32 xembed ); void destroyInstance( NSPluginInstance* inst ); bool error() { return _error; } diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp index b34c1e03c..327eaa77e 100644 --- a/nsplugins/viewer/qxteventloop.cpp +++ b/nsplugins/viewer/qxteventloop.cpp @@ -154,12 +154,12 @@ Boolean qmotif_event_dispatcher( XEvent *event ) TQApplication::sendPostedEvents(); TQWidgetIntDict *mapper = &static_d->mapper; - TQWidget* qMotif = mapper->find( event->xany.window ); + TQWidget* qMotif = mapper->tqfind( event->xany.window ); if ( !qMotif && TQWidget::find( event->xany.window) == 0 ) { // event is not for Qt, try Xt Display* dpy = TQPaintDevice::x11AppDisplay(); Widget w = XtWindowToWidget( dpy, event->xany.window ); - while ( w && ! ( qMotif = mapper->find( XtWindow( w ) ) ) ) { + while ( w && ! ( qMotif = mapper->tqfind( XtWindow( w ) ) ) ) { if ( XtIsShell( w ) ) { break; } @@ -174,7 +174,7 @@ Boolean qmotif_event_dispatcher( XEvent *event ) } last_xevent = event; - bool delivered = ( qApp->x11ProcessEvent( event ) != -1 ); + bool delivered = ( tqApp->x11ProcessEvent( event ) != -1 ); last_xevent = 0; if ( qMotif ) { switch ( event->type ) { @@ -309,15 +309,15 @@ XtAppContext QXtEventLoop::applicationContext() const void QXtEventLoop::appStartingUp() { - int argc = qApp->argc(); + int argc = tqApp->argc(); XtDisplayInitialize( d->appContext, TQPaintDevice::x11AppDisplay(), - qApp->name(), + tqApp->name(), d->applicationClass, d->options, d->numOptions, &argc, - qApp->argv() ); + tqApp->argv() ); d->hookMeUp(); } @@ -352,7 +352,7 @@ void QXtEventLoop::unregisterWidget( TQWidget* w ) void qmotif_socknot_handler( XtPointer pointer, int *, XtInputId *id ) { QXtEventLoop *eventloop = (QXtEventLoop *) pointer; - TQSocketNotifier *socknot = static_d->socknotDict.find( *id ); + TQSocketNotifier *socknot = static_d->socknotDict.tqfind( *id ); if ( ! socknot ) // this shouldn't happen return; eventloop->setSocketNotifierPending( socknot ); @@ -420,7 +420,7 @@ void qmotif_timeout_handler( XtPointer, XtIntervalId * ) */ bool QXtEventLoop::processEvents( ProcessEventsFlags flags ) { - // Qt uses posted events to do lots of delayed operations, like repaints... these + // Qt uses posted events to do lots of delayed operations, like tqrepaints... these // need to be delivered before we go to sleep TQApplication::sendPostedEvents(); diff --git a/nsplugins/viewer/qxteventloop.h b/nsplugins/viewer/qxteventloop.h index 02ed69541..31351f201 100644 --- a/nsplugins/viewer/qxteventloop.h +++ b/nsplugins/viewer/qxteventloop.h @@ -38,7 +38,7 @@ #include <tqglobal.h> -#if QT_VERSION >= 0x030100 +// #if QT_VERSION >= 0x030100 #include <tqeventloop.h> @@ -47,9 +47,10 @@ class QXtEventLoopPrivate; -class QXtEventLoop : public QEventLoop +class QXtEventLoop : public TQEventLoop { Q_OBJECT + TQ_OBJECT public: QXtEventLoop( const char *applicationClass, XtAppContext context = NULL, XrmOptionDescRec *options = 0, int numOptions = 0); @@ -75,6 +76,6 @@ private: }; -#endif +// #endif #endif // QMOTIF_H diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp index ba14b0990..e15b52eb0 100644 --- a/nsplugins/viewer/viewer.cpp +++ b/nsplugins/viewer/viewer.cpp @@ -286,7 +286,7 @@ int main(int argc, char** argv) } kdDebug(1430) << "6 - dcop->registerAs" << endl; - if (g_dcopId) + if (g_dcopId != 0) g_dcopId = dcop->registerAs( g_dcopId, false ); else g_dcopId = dcop->registerAs("nspluginviewer"); diff --git a/nsplugins/wrapper/wrapper.c b/nsplugins/wrapper/wrapper.c index 965868426..acd07ea91 100644 --- a/nsplugins/wrapper/wrapper.c +++ b/nsplugins/wrapper/wrapper.c @@ -544,7 +544,7 @@ static void MyNPN_InvalidateRect(NPP instance, NPRect *invalidRect) { DEB(ef, "-> NPN_InvalidateRect( %x, 0x%x )\n", instance, invalidRect); - gNetscapeFuncs.invalidaterect( instance, invalidRect ); + gNetscapeFuncs.tqinvalidaterect( instance, invalidRect ); DEB(ef, "<- NPN_InvalidateRect\n"); } @@ -552,7 +552,7 @@ static void MyNPN_InvalidateRegion(NPP instance, NPRegion invalidRegion) { DEB(ef, "-> NPN_InvalidateRegion( %x, 0x%x )\n", instance, invalidRegion); - gNetscapeFuncs.invalidateregion( instance, invalidRegion ); + gNetscapeFuncs.tqinvalidateregion( instance, invalidRegion ); DEB(ef, "<- NPN_InvalidateRegion\n"); } @@ -605,8 +605,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) DEB(ef, "nsTable->posturlnotify = 0x%x\n", nsTable->posturlnotify); DEB(ef, "nsTable->getvalue = 0x%x\n", nsTable->getvalue); DEB(ef, "nsTable->setvalue = 0x%x\n", nsTable->setvalue); - DEB(ef, "nsTable->invalidaterect = 0x%x\n", nsTable->invalidaterect); - DEB(ef, "nsTable->invalidateregion = 0x%x\n", nsTable->invalidateregion); + DEB(ef, "nsTable->tqinvalidaterect = 0x%x\n", nsTable->tqinvalidaterect); + DEB(ef, "nsTable->tqinvalidateregion = 0x%x\n", nsTable->tqinvalidateregion); DEB(ef, "nsTable->forceredraw = 0x%x\n", nsTable->forceredraw); DEB(ef, "pluginFuncs->size = %d\n", pluginFuncs->size); @@ -659,8 +659,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) gExtNetscapeFuncs.posturlnotify = MyNPN_PostURLNotify; gExtNetscapeFuncs.getvalue = MyNPN_GetValue; gExtNetscapeFuncs.setvalue = MyNPN_SetValue; - gExtNetscapeFuncs.invalidaterect = MyNPN_InvalidateRect; - gExtNetscapeFuncs.invalidateregion = MyNPN_InvalidateRegion; + gExtNetscapeFuncs.tqinvalidaterect = MyNPN_InvalidateRect; + gExtNetscapeFuncs.tqinvalidateregion = MyNPN_InvalidateRegion; gExtNetscapeFuncs.forceredraw = MyNPN_ForceRedraw; gPluginFuncs.size = sizeof( gPluginFuncs ); @@ -709,8 +709,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) DEB(ef, "nsTable->posturlnotify = 0x%x\n", gExtNetscapeFuncs.posturlnotify); DEB(ef, "nsTable->getvalue = 0x%x\n", gExtNetscapeFuncs.getvalue); DEB(ef, "nsTable->setvalue = 0x%x\n", gExtNetscapeFuncs.setvalue); - DEB(ef, "nsTable->invalidaterect = 0x%x\n", gExtNetscapeFuncs.invalidaterect); - DEB(ef, "nsTable->invalidateregion = 0x%x\n", gExtNetscapeFuncs.invalidateregion); + DEB(ef, "nsTable->tqinvalidaterect = 0x%x\n", gExtNetscapeFuncs.tqinvalidaterect); + DEB(ef, "nsTable->tqinvalidateregion = 0x%x\n", gExtNetscapeFuncs.tqinvalidateregion); DEB(ef, "nsTable->forceredraw = 0x%x\n", gExtNetscapeFuncs.forceredraw); DEB(ef, "pluginFuncs->size = %d\n", pluginFuncs->size); -- cgit v1.2.1
     
    %1%1
    %1%1
    %1
    %1
    %1%1
    \n" << it.key() << "  " - << (indexmap.contains(it.key()) ? indexmap[it.key()] : "" ) + << (indexmap.tqcontains(it.key()) ? indexmap[it.key()] : "" ) << "
      " - << (indexmap.contains(manindex->manpage_begin) ? indexmap[manindex->manpage_begin] : "" ) + << (indexmap.tqcontains(manindex->manpage_begin) ? indexmap[manindex->manpage_begin] : "" ) << "
      " - << (indexmap.contains(manindex->manpage_begin) ? indexmap[manindex->manpage_begin] : "" ) + << (indexmap.tqcontains(manindex->manpage_begin) ? indexmap[manindex->manpage_begin] : "" ) << "
    %1
    %1%1   %1