From c663b6440964f6ac48027143ac9e63298991f9d0 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:33:34 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- drkonqi/backtrace.cpp | 44 +- drkonqi/backtrace.h | 10 +- drkonqi/crashtest.cpp | 4 +- drkonqi/debugger.cpp | 58 +- drkonqi/debugger.h | 20 +- drkonqi/drbugreport.cpp | 8 +- drkonqi/drbugreport.h | 6 +- drkonqi/krashconf.cpp | 40 +- drkonqi/krashconf.h | 72 +- drkonqi/krashdcopinterface.h | 18 +- drkonqi/toplevel.cpp | 46 +- drkonqi/toplevel.h | 8 +- kappfinder/common.cpp | 44 +- kappfinder/common.h | 22 +- kappfinder/main_install.cpp | 10 +- kappfinder/toplevel.cpp | 82 +- kappfinder/toplevel.h | 30 +- kate/app/kateapp.cpp | 46 +- kate/app/kateapp.h | 12 +- kate/app/kateappIface.cpp | 10 +- kate/app/kateappIface.h | 10 +- kate/app/kateconfigdialog.cpp | 140 +-- kate/app/kateconfigdialog.h | 20 +- kate/app/kateconfigplugindialogpage.cpp | 26 +- kate/app/kateconfigplugindialogpage.h | 6 +- kate/app/kateconsole.cpp | 10 +- kate/app/kateconsole.h | 6 +- kate/app/katedocmanager.cpp | 80 +- kate/app/katedocmanager.h | 38 +- kate/app/katedocmanageriface.cpp | 2 +- kate/app/katedocmanageriface.h | 2 +- kate/app/kateexternaltools.cpp | 230 ++-- kate/app/kateexternaltools.h | 66 +- kate/app/katefilelist.cpp | 186 ++-- kate/app/katefilelist.h | 52 +- kate/app/katefileselector.cpp | 278 ++--- kate/app/katefileselector.h | 44 +- kate/app/kategrepdialog.cpp | 162 +-- kate/app/kategrepdialog.h | 44 +- kate/app/katemailfilesdialog.cpp | 30 +- kate/app/katemailfilesdialog.h | 10 +- kate/app/katemain.cpp | 28 +- kate/app/katemainwindow.cpp | 164 +-- kate/app/katemainwindow.h | 16 +- kate/app/katemainwindowiface.cpp | 2 +- kate/app/katemdi.cpp | 146 +-- kate/app/katemdi.h | 74 +- kate/app/katemwmodonhddialog.cpp | 50 +- kate/app/katemwmodonhddialog.h | 8 +- kate/app/katepluginmanager.cpp | 26 +- kate/app/katepluginmanager.h | 16 +- kate/app/katesavemodifieddialog.cpp | 62 +- kate/app/katesavemodifieddialog.h | 10 +- kate/app/katesession.cpp | 132 +-- kate/app/katesession.h | 46 +- kate/app/katetabwidget.cpp | 22 +- kate/app/katetabwidget.h | 18 +- kate/app/kateviewmanager.cpp | 84 +- kate/app/kateviewmanager.h | 20 +- kate/app/kateviewspace.cpp | 108 +- kate/app/kateviewspace.h | 44 +- kate/app/kateviewspacecontainer.cpp | 122 +-- kate/app/kateviewspacecontainer.h | 20 +- kate/app/kbookmarkhandler.cpp | 22 +- kate/app/kbookmarkhandler.h | 18 +- kate/app/kwritemain.cpp | 100 +- kate/app/kwritemain.h | 16 +- kate/interfaces/application.cpp | 2 +- kate/interfaces/application.h | 2 +- kate/interfaces/documentmanager.cpp | 4 +- kate/interfaces/documentmanager.h | 4 +- kate/interfaces/mainwindow.cpp | 4 +- kate/interfaces/mainwindow.h | 6 +- kate/interfaces/plugin.cpp | 4 +- kate/interfaces/plugin.h | 6 +- kate/interfaces/pluginconfiginterfaceextension.cpp | 2 +- kate/interfaces/pluginconfiginterfaceextension.h | 14 +- kate/interfaces/pluginmanager.cpp | 10 +- kate/interfaces/pluginmanager.h | 10 +- kate/interfaces/toolviewmanager.cpp | 10 +- kate/interfaces/toolviewmanager.h | 10 +- kate/interfaces/viewmanager.cpp | 4 +- kate/interfaces/viewmanager.h | 2 +- kate/utils/dockviewbase.cpp | 42 +- kate/utils/dockviewbase.h | 20 +- kate/utils/listboxview.cpp | 4 +- kate/utils/listboxview.h | 4 +- kate/utils/messageview.cpp | 12 +- kate/utils/messageview.h | 10 +- kcminit/main.cpp | 44 +- kcminit/main.h | 6 +- kcontrol/access/kaccess.cpp | 72 +- kcontrol/access/kaccess.h | 18 +- kcontrol/access/kcmaccess.cpp | 310 +++--- kcontrol/access/kcmaccess.h | 34 +- kcontrol/accessibility/accessibility.cpp | 16 +- kcontrol/accessibility/accessibility.h | 2 +- kcontrol/arts/arts.cpp | 184 ++-- kcontrol/arts/arts.h | 40 +- kcontrol/arts/krichtextlabel.cpp | 44 +- kcontrol/arts/krichtextlabel.h | 18 +- kcontrol/background/bgadvanced.cpp | 132 +-- kcontrol/background/bgadvanced.h | 48 +- kcontrol/background/bgdefaults.h | 4 +- kcontrol/background/bgdialog.cpp | 198 ++-- kcontrol/background/bgdialog.h | 24 +- kcontrol/background/bghash.h | 6 +- kcontrol/background/bgmonitor.cpp | 82 +- kcontrol/background/bgmonitor.h | 46 +- kcontrol/background/bgrender.cpp | 178 ++-- kcontrol/background/bgrender.h | 52 +- kcontrol/background/bgsettings.cpp | 166 +-- kcontrol/background/bgsettings.h | 128 +-- kcontrol/background/bgwallpaper.cpp | 48 +- kcontrol/background/bgwallpaper.h | 14 +- kcontrol/background/main.cpp | 14 +- kcontrol/background/main.h | 2 +- kcontrol/bell/bell.cpp | 46 +- kcontrol/bell/bell.h | 6 +- kcontrol/clock/dtime.cpp | 138 +-- kcontrol/clock/dtime.h | 44 +- kcontrol/clock/main.cpp | 16 +- kcontrol/clock/main.h | 4 +- kcontrol/clock/tzone.cpp | 44 +- kcontrol/clock/tzone.h | 6 +- kcontrol/colors/colorscm.cpp | 236 ++--- kcontrol/colors/colorscm.h | 38 +- kcontrol/colors/widgetcanvas.cpp | 274 ++--- kcontrol/colors/widgetcanvas.h | 84 +- kcontrol/componentchooser/componentchooser.cpp | 120 +-- kcontrol/componentchooser/componentchooser.h | 28 +- kcontrol/componentchooser/kcm_componentchooser.cpp | 10 +- kcontrol/componentchooser/kcm_componentchooser.h | 2 +- kcontrol/crypto/certexport.cpp | 54 +- kcontrol/crypto/certexport.h | 8 +- kcontrol/crypto/crypto.cpp | 718 ++++++------- kcontrol/crypto/crypto.h | 198 ++-- kcontrol/crypto/kdatetimedlg.cpp | 36 +- kcontrol/crypto/kdatetimedlg.h | 14 +- kcontrol/css/kcmcss.cpp | 134 +-- kcontrol/css/kcmcss.h | 6 +- kcontrol/css/template.cpp | 18 +- kcontrol/css/template.h | 10 +- kcontrol/display/display.cpp | 32 +- kcontrol/display/display.h | 8 +- kcontrol/dnssd/kcmdnssd.cpp | 62 +- kcontrol/dnssd/kcmdnssd.h | 6 +- kcontrol/ebrowsing/filteropts.cpp | 10 +- kcontrol/ebrowsing/filteropts.h | 4 +- kcontrol/ebrowsing/main.cpp | 30 +- kcontrol/ebrowsing/main.h | 6 +- kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp | 114 +- kcontrol/ebrowsing/plugins/ikws/ikwsopts.h | 14 +- kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp | 4 +- kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h | 4 +- .../ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp | 134 +-- .../ebrowsing/plugins/ikws/kuriikwsfiltereng.h | 28 +- .../ebrowsing/plugins/ikws/kurisearchfilter.cpp | 10 +- kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h | 8 +- kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp | 16 +- kcontrol/ebrowsing/plugins/ikws/searchprovider.h | 32 +- .../ebrowsing/plugins/ikws/searchproviderdlg.cpp | 26 +- .../ebrowsing/plugins/ikws/searchproviderdlg.h | 2 +- .../plugins/localdomain/localdomainurifilter.cpp | 28 +- .../plugins/localdomain/localdomainurifilter.h | 12 +- .../ebrowsing/plugins/shorturi/kshorturifilter.cpp | 98 +- .../ebrowsing/plugins/shorturi/kshorturifilter.h | 18 +- kcontrol/energy/energy.cpp | 44 +- kcontrol/energy/energy.h | 8 +- kcontrol/filetypes/control.cpp | 2 +- kcontrol/filetypes/filegroupdetails.cpp | 26 +- kcontrol/filetypes/filegroupdetails.h | 6 +- kcontrol/filetypes/filetypedetails.cpp | 104 +- kcontrol/filetypes/filetypedetails.h | 24 +- kcontrol/filetypes/filetypesview.cpp | 130 +-- kcontrol/filetypes/filetypesview.h | 32 +- kcontrol/filetypes/keditfiletype.cpp | 28 +- kcontrol/filetypes/kservicelistwidget.cpp | 90 +- kcontrol/filetypes/kservicelistwidget.h | 16 +- kcontrol/filetypes/kserviceselectdlg.cpp | 14 +- kcontrol/filetypes/kserviceselectdlg.h | 2 +- kcontrol/filetypes/newtypedlg.cpp | 30 +- kcontrol/filetypes/newtypedlg.h | 12 +- kcontrol/filetypes/typeslistitem.cpp | 110 +- kcontrol/filetypes/typeslistitem.h | 56 +- kcontrol/fonts/fonts.cpp | 180 ++-- kcontrol/fonts/fonts.h | 44 +- kcontrol/fonts/kxftconfig.cpp | 186 ++-- kcontrol/fonts/kxftconfig.h | 78 +- kcontrol/iccconfig/iccconfig.cpp | 100 +- kcontrol/iccconfig/iccconfig.h | 20 +- kcontrol/icons/icons.cpp | 200 ++-- kcontrol/icons/icons.h | 54 +- kcontrol/icons/iconthemes.cpp | 112 +- kcontrol/icons/iconthemes.h | 24 +- kcontrol/icons/main.cpp | 16 +- kcontrol/icons/main.h | 8 +- kcontrol/info/info.cpp | 140 +-- kcontrol/info/info.h | 56 +- kcontrol/info/info_aix.cpp | 76 +- kcontrol/info/info_fbsd.cpp | 148 +-- kcontrol/info/info_generic.cpp | 22 +- kcontrol/info/info_hpux.cpp | 216 ++-- kcontrol/info/info_linux.cpp | 158 +-- kcontrol/info/info_netbsd.cpp | 90 +- kcontrol/info/info_openbsd.cpp | 84 +- kcontrol/info/info_osx.cpp | 42 +- kcontrol/info/info_sgi.cpp | 26 +- kcontrol/info/info_solaris.cpp | 76 +- kcontrol/info/info_svr4.cpp | 38 +- kcontrol/info/main.cpp | 26 +- kcontrol/info/memory.cpp | 86 +- kcontrol/info/memory.h | 42 +- kcontrol/info/memory_linux.cpp | 4 +- kcontrol/info/memory_osx.cpp | 2 +- kcontrol/info/opengl.cpp | 140 +-- kcontrol/input/core/themepage.cpp | 40 +- kcontrol/input/core/themepage.h | 6 +- kcontrol/input/logitechmouse.cpp | 40 +- kcontrol/input/logitechmouse.h | 18 +- kcontrol/input/main.cpp | 16 +- kcontrol/input/mouse.cpp | 146 +-- kcontrol/input/mouse.h | 42 +- kcontrol/input/xcursor/previewwidget.cpp | 40 +- kcontrol/input/xcursor/previewwidget.h | 8 +- kcontrol/input/xcursor/themepage.cpp | 160 +-- kcontrol/input/xcursor/themepage.h | 26 +- kcontrol/ioslaveinfo/kcmioslaveinfo.cpp | 54 +- kcontrol/ioslaveinfo/kcmioslaveinfo.h | 14 +- kcontrol/joystick/caldialog.cpp | 36 +- kcontrol/joystick/caldialog.h | 6 +- kcontrol/joystick/joydevice.cpp | 4 +- kcontrol/joystick/joydevice.h | 14 +- kcontrol/joystick/joystick.cpp | 4 +- kcontrol/joystick/joystick.h | 2 +- kcontrol/joystick/joywidget.cpp | 90 +- kcontrol/joystick/joywidget.h | 22 +- kcontrol/joystick/poswidget.cpp | 12 +- kcontrol/joystick/poswidget.h | 6 +- kcontrol/kcontrol/aboutwidget.cpp | 48 +- kcontrol/kcontrol/aboutwidget.h | 18 +- kcontrol/kcontrol/dockcontainer.cpp | 82 +- kcontrol/kcontrol/dockcontainer.h | 20 +- kcontrol/kcontrol/global.cpp | 46 +- kcontrol/kcontrol/global.h | 48 +- kcontrol/kcontrol/helpwidget.cpp | 10 +- kcontrol/kcontrol/helpwidget.h | 12 +- kcontrol/kcontrol/indexwidget.cpp | 50 +- kcontrol/kcontrol/indexwidget.h | 10 +- kcontrol/kcontrol/kcrootonly.cpp | 10 +- kcontrol/kcontrol/kcrootonly.h | 2 +- kcontrol/kcontrol/main.cpp | 22 +- kcontrol/kcontrol/moduleIface.cpp | 12 +- kcontrol/kcontrol/moduleIface.h | 18 +- kcontrol/kcontrol/moduleiconview.cpp | 38 +- kcontrol/kcontrol/moduleiconview.h | 22 +- kcontrol/kcontrol/modulemenu.cpp | 30 +- kcontrol/kcontrol/modulemenu.h | 18 +- kcontrol/kcontrol/modules.cpp | 60 +- kcontrol/kcontrol/modules.h | 30 +- kcontrol/kcontrol/moduletreeview.cpp | 126 +-- kcontrol/kcontrol/moduletreeview.h | 50 +- kcontrol/kcontrol/proxywidget.cpp | 110 +- kcontrol/kcontrol/proxywidget.h | 10 +- kcontrol/kcontrol/searchwidget.cpp | 66 +- kcontrol/kcontrol/searchwidget.h | 34 +- kcontrol/kcontrol/toplevel.cpp | 126 +-- kcontrol/kcontrol/toplevel.h | 14 +- kcontrol/kded/kcmkded.cpp | 118 +-- kcontrol/kded/kcmkded.h | 26 +- kcontrol/kdm/background.cpp | 22 +- kcontrol/kdm/background.h | 10 +- kcontrol/kdm/kbackedcombobox.cpp | 6 +- kcontrol/kdm/kbackedcombobox.h | 10 +- kcontrol/kdm/kdm-appear.cpp | 216 ++-- kcontrol/kdm/kdm-appear.h | 36 +- kcontrol/kdm/kdm-conv.cpp | 164 +-- kcontrol/kdm/kdm-conv.h | 26 +- kcontrol/kdm/kdm-font.cpp | 52 +- kcontrol/kdm/kdm-font.h | 4 +- kcontrol/kdm/kdm-shut.cpp | 80 +- kcontrol/kdm/kdm-shut.h | 8 +- kcontrol/kdm/kdm-users.cpp | 240 ++--- kcontrol/kdm/kdm-users.h | 34 +- kcontrol/kdm/main.cpp | 82 +- kcontrol/kdm/main.h | 14 +- kcontrol/keys/commandShortcuts.cpp | 72 +- kcontrol/keys/commandShortcuts.h | 24 +- kcontrol/keys/kaccelaction.h | 60 +- kcontrol/keys/keyconfig.cpp | 104 +- kcontrol/keys/keyconfig.h | 32 +- kcontrol/keys/khotkeys.cpp | 28 +- kcontrol/keys/khotkeys.h | 12 +- kcontrol/keys/main.cpp | 22 +- kcontrol/keys/main.h | 8 +- kcontrol/keys/modifiers.cpp | 64 +- kcontrol/keys/modifiers.h | 14 +- kcontrol/keys/shortcuts.cpp | 96 +- kcontrol/keys/shortcuts.h | 26 +- kcontrol/keys/treeview.cpp | 100 +- kcontrol/keys/treeview.h | 42 +- kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp | 138 +-- kcontrol/kfontinst/kcmfontinst/KCmFontInst.h | 14 +- .../kfontinst/kcmfontinst/KFileFontIconView.cpp | 16 +- kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h | 10 +- kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp | 136 +-- kcontrol/kfontinst/kcmfontinst/KFileFontView.h | 60 +- kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp | 24 +- kcontrol/kfontinst/kcmfontinst/PrintDialog.h | 6 +- kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp | 26 +- kcontrol/kfontinst/kcmfontinst/SettingsDialog.h | 4 +- kcontrol/kfontinst/kfile-plugin/KFileFont.cpp | 42 +- kcontrol/kfontinst/kfile-plugin/KFileFont.h | 2 +- kcontrol/kfontinst/kfontinst/FontEngine.cpp | 26 +- kcontrol/kfontinst/kfontinst/FontEngine.h | 18 +- kcontrol/kfontinst/kfontinst/Fontmap.cpp | 102 +- kcontrol/kfontinst/kfontinst/Fontmap.h | 24 +- kcontrol/kfontinst/kfontinst/Main.cpp | 16 +- kcontrol/kfontinst/kfontinst/XConfig.cpp | 44 +- kcontrol/kfontinst/kfontinst/XConfig.h | 24 +- kcontrol/kfontinst/kio/KioFonts.cpp | 396 +++---- kcontrol/kfontinst/kio/KioFonts.h | 50 +- kcontrol/kfontinst/lib/FcEngine.cpp | 158 +-- kcontrol/kfontinst/lib/FcEngine.h | 52 +- kcontrol/kfontinst/lib/Misc.cpp | 48 +- kcontrol/kfontinst/lib/Misc.h | 40 +- kcontrol/kfontinst/thumbnail/FontThumbnail.cpp | 10 +- kcontrol/kfontinst/thumbnail/FontThumbnail.h | 2 +- kcontrol/kfontinst/viewpart/FontPreview.cpp | 22 +- kcontrol/kfontinst/viewpart/FontPreview.h | 24 +- kcontrol/kfontinst/viewpart/FontViewPart.cpp | 86 +- kcontrol/kfontinst/viewpart/FontViewPart.h | 8 +- .../kfontinst/viewpart/FontViewPartFactory.cpp | 6 +- kcontrol/kfontinst/viewpart/FontViewPartFactory.h | 2 +- kcontrol/kfontinst/viewpart/FontViewerApp.cpp | 10 +- kcontrol/kfontinst/viewpart/KfiPrint.cpp | 30 +- kcontrol/kfontinst/viewpart/KfiPrint.h | 4 +- kcontrol/kicker/advancedDialog.cpp | 54 +- kcontrol/kicker/advancedDialog.h | 2 +- kcontrol/kicker/applettab_impl.cpp | 76 +- kcontrol/kicker/applettab_impl.h | 12 +- kcontrol/kicker/extensionInfo.cpp | 18 +- kcontrol/kicker/extensionInfo.h | 20 +- kcontrol/kicker/hidingconfig.cpp | 20 +- kcontrol/kicker/hidingconfig.h | 2 +- kcontrol/kicker/hidingtab_impl.cpp | 60 +- kcontrol/kicker/hidingtab_impl.h | 2 +- kcontrol/kicker/lookandfeelconfig.cpp | 20 +- kcontrol/kicker/lookandfeelconfig.h | 2 +- kcontrol/kicker/lookandfeeltab_impl.cpp | 66 +- kcontrol/kicker/lookandfeeltab_impl.h | 12 +- kcontrol/kicker/lookandfeeltab_kcm.cpp | 10 +- kcontrol/kicker/lookandfeeltab_kcm.h | 4 +- kcontrol/kicker/main.cpp | 74 +- kcontrol/kicker/main.h | 18 +- kcontrol/kicker/menuconfig.cpp | 20 +- kcontrol/kicker/menuconfig.h | 2 +- kcontrol/kicker/menutab_impl.cpp | 86 +- kcontrol/kicker/menutab_impl.h | 20 +- kcontrol/kicker/positionconfig.cpp | 20 +- kcontrol/kicker/positionconfig.h | 2 +- kcontrol/kicker/positiontab_impl.cpp | 174 +-- kcontrol/kicker/positiontab_impl.h | 10 +- kcontrol/kio/cache.cpp | 28 +- kcontrol/kio/cache.h | 4 +- kcontrol/kio/fakeuaprovider.cpp | 48 +- kcontrol/kio/fakeuaprovider.h | 14 +- kcontrol/kio/kcookiesmain.cpp | 18 +- kcontrol/kio/kcookiesmain.h | 6 +- kcontrol/kio/kcookiesmanagement.cpp | 136 +-- kcontrol/kio/kcookiesmanagement.h | 36 +- kcontrol/kio/kcookiespolicies.cpp | 124 +-- kcontrol/kio/kcookiespolicies.h | 16 +- kcontrol/kio/kenvvarproxydlg.cpp | 62 +- kcontrol/kio/kenvvarproxydlg.h | 6 +- kcontrol/kio/kmanualproxydlg.cpp | 90 +- kcontrol/kio/kmanualproxydlg.h | 22 +- kcontrol/kio/kproxydlg.cpp | 82 +- kcontrol/kio/kproxydlg.h | 14 +- kcontrol/kio/kproxydlgbase.cpp | 8 +- kcontrol/kio/kproxydlgbase.h | 16 +- kcontrol/kio/ksaveioconfig.cpp | 42 +- kcontrol/kio/ksaveioconfig.h | 10 +- kcontrol/kio/main.cpp | 32 +- kcontrol/kio/main.h | 6 +- kcontrol/kio/netpref.cpp | 50 +- kcontrol/kio/netpref.h | 12 +- kcontrol/kio/policydlg.cpp | 28 +- kcontrol/kio/policydlg.h | 18 +- kcontrol/kio/smbrodlg.cpp | 70 +- kcontrol/kio/smbrodlg.h | 18 +- kcontrol/kio/socks.cpp | 68 +- kcontrol/kio/socks.h | 10 +- kcontrol/kio/uagentproviderdlg.cpp | 48 +- kcontrol/kio/uagentproviderdlg.h | 20 +- kcontrol/kio/useragentdlg.cpp | 114 +- kcontrol/kio/useragentdlg.h | 8 +- kcontrol/knotify/knotify.cpp | 56 +- kcontrol/knotify/knotify.h | 10 +- kcontrol/konq/behaviour.cpp | 120 +-- kcontrol/konq/behaviour.h | 28 +- kcontrol/konq/browser.cpp | 30 +- kcontrol/konq/browser.h | 6 +- kcontrol/konq/desktop.cpp | 74 +- kcontrol/konq/desktop.h | 6 +- kcontrol/konq/desktopbehavior_impl.cpp | 118 +-- kcontrol/konq/desktopbehavior_impl.h | 8 +- kcontrol/konq/fontopts.cpp | 158 +-- kcontrol/konq/fontopts.h | 46 +- kcontrol/konq/main.cpp | 20 +- kcontrol/konq/previews.cpp | 58 +- kcontrol/konq/previews.h | 10 +- kcontrol/konq/rootopts.cpp | 74 +- kcontrol/konq/rootopts.h | 6 +- kcontrol/konqhtml/advancedTabDialog.cpp | 42 +- kcontrol/konqhtml/advancedTabDialog.h | 2 +- kcontrol/konqhtml/appearance.cpp | 238 ++--- kcontrol/konqhtml/appearance.h | 36 +- kcontrol/konqhtml/domainlistview.cpp | 76 +- kcontrol/konqhtml/domainlistview.h | 34 +- kcontrol/konqhtml/filteropts.cpp | 116 +- kcontrol/konqhtml/filteropts.h | 24 +- kcontrol/konqhtml/htmlopts.cpp | 126 +-- kcontrol/konqhtml/htmlopts.h | 40 +- kcontrol/konqhtml/javaopts.cpp | 114 +- kcontrol/konqhtml/javaopts.h | 28 +- kcontrol/konqhtml/jsopts.cpp | 64 +- kcontrol/konqhtml/jsopts.h | 18 +- kcontrol/konqhtml/jspolicies.cpp | 188 ++-- kcontrol/konqhtml/jspolicies.h | 26 +- kcontrol/konqhtml/khttpoptdlg.cpp | 28 +- kcontrol/konqhtml/khttpoptdlg.h | 22 +- kcontrol/konqhtml/main.cpp | 28 +- kcontrol/konqhtml/main.h | 6 +- kcontrol/konqhtml/pluginopts.cpp | 200 ++-- kcontrol/konqhtml/pluginopts.h | 38 +- kcontrol/konqhtml/policies.cpp | 14 +- kcontrol/konqhtml/policies.h | 18 +- kcontrol/konqhtml/policydlg.cpp | 52 +- kcontrol/konqhtml/policydlg.h | 34 +- kcontrol/konsole/kcmkonsole.cpp | 56 +- kcontrol/konsole/kcmkonsole.h | 2 +- kcontrol/konsole/schemaeditor.cpp | 166 +-- kcontrol/konsole/schemaeditor.h | 26 +- kcontrol/konsole/sessioneditor.cpp | 100 +- kcontrol/konsole/sessioneditor.h | 18 +- kcontrol/krdb/krdb.cpp | 192 ++-- kcontrol/kthememanager/knewthemedlg.cpp | 30 +- kcontrol/kthememanager/knewthemedlg.h | 28 +- kcontrol/kthememanager/ktheme.cpp | 294 +++--- kcontrol/kthememanager/ktheme.h | 86 +- kcontrol/kthememanager/kthemedlg.ui.h | 2 +- kcontrol/kthememanager/kthememanager.cpp | 120 +-- kcontrol/kthememanager/kthememanager.h | 18 +- kcontrol/launch/kcmlaunch.cpp | 60 +- kcontrol/launch/kcmlaunch.h | 10 +- kcontrol/locale/kcmlocale.cpp | 238 ++--- kcontrol/locale/kcmlocale.h | 34 +- kcontrol/locale/klocalesample.cpp | 74 +- kcontrol/locale/klocalesample.h | 14 +- kcontrol/locale/localemon.cpp | 164 +-- kcontrol/locale/localemon.h | 36 +- kcontrol/locale/localenum.cpp | 92 +- kcontrol/locale/localenum.h | 28 +- kcontrol/locale/localeother.cpp | 48 +- kcontrol/locale/localeother.h | 12 +- kcontrol/locale/localetime.cpp | 174 +-- kcontrol/locale/localetime.h | 50 +- kcontrol/locale/main.cpp | 2 +- kcontrol/locale/toplevel.cpp | 164 +-- kcontrol/locale/toplevel.h | 10 +- kcontrol/nics/nic.cpp | 66 +- kcontrol/nics/nic.h | 6 +- kcontrol/performance/kcmperformance.cpp | 24 +- kcontrol/performance/kcmperformance.h | 4 +- kcontrol/performance/konqueror.cpp | 42 +- kcontrol/performance/konqueror.h | 4 +- kcontrol/performance/system.cpp | 16 +- kcontrol/performance/system.h | 2 +- kcontrol/privacy/kprivacymanager.cpp | 38 +- kcontrol/privacy/kprivacymanager.h | 4 +- kcontrol/privacy/privacy.cpp | 88 +- kcontrol/privacy/privacy.h | 26 +- kcontrol/randr/configdialog.cpp | 22 +- kcontrol/randr/configdialog.h | 26 +- kcontrol/randr/krandrbindings.cpp | 6 +- kcontrol/randr/krandrmodule.cpp | 88 +- kcontrol/randr/krandrmodule.h | 8 +- kcontrol/randr/krandrpassivepopup.cpp | 20 +- kcontrol/randr/krandrpassivepopup.h | 20 +- kcontrol/randr/krandrtray.cpp | 68 +- kcontrol/randr/krandrtray.h | 12 +- kcontrol/samba/kcmsambaimports.cpp | 18 +- kcontrol/samba/kcmsambaimports.h | 10 +- kcontrol/samba/kcmsambalog.cpp | 42 +- kcontrol/samba/kcmsambalog.h | 28 +- kcontrol/samba/kcmsambastatistics.cpp | 114 +- kcontrol/samba/kcmsambastatistics.h | 52 +- kcontrol/samba/ksmbstatus.cpp | 42 +- kcontrol/samba/ksmbstatus.h | 20 +- kcontrol/samba/main.cpp | 16 +- kcontrol/screensaver/advanceddialog.cpp | 62 +- kcontrol/screensaver/advanceddialog.h | 34 +- kcontrol/screensaver/kssmonitor.h | 4 +- kcontrol/screensaver/kswidget.cpp | 2 +- kcontrol/screensaver/kswidget.h | 2 +- kcontrol/screensaver/saverconfig.cpp | 2 +- kcontrol/screensaver/saverconfig.h | 28 +- kcontrol/screensaver/saverlist.cpp | 2 +- kcontrol/screensaver/saverlist.h | 6 +- kcontrol/screensaver/scrnsave.cpp | 220 ++-- kcontrol/screensaver/scrnsave.h | 42 +- kcontrol/smartcard/smartcard.cpp | 116 +- kcontrol/smartcard/smartcard.h | 14 +- kcontrol/smserver/kcmsmserver.cpp | 22 +- kcontrol/smserver/kcmsmserver.h | 2 +- kcontrol/smserver/smserverconfigimpl.cpp | 2 +- kcontrol/smserver/smserverconfigimpl.h | 4 +- kcontrol/spellchecking/spellchecking.cpp | 16 +- kcontrol/spellchecking/spellchecking.h | 2 +- kcontrol/style/kcmstyle.cpp | 334 +++--- kcontrol/style/kcmstyle.h | 114 +- kcontrol/style/keramik/keramikconf.cpp | 28 +- kcontrol/style/keramik/keramikconf.h | 8 +- kcontrol/style/main.cpp | 4 +- kcontrol/style/menupreview.cpp | 36 +- kcontrol/style/menupreview.h | 6 +- kcontrol/style/styleconfdialog.cpp | 6 +- kcontrol/style/styleconfdialog.h | 2 +- kcontrol/style/stylepreview.ui.h | 32 +- kcontrol/taskbar/kcmtaskbar.cpp | 68 +- kcontrol/taskbar/kcmtaskbar.h | 22 +- kcontrol/usbview/kcmusb.cpp | 68 +- kcontrol/usbview/kcmusb.h | 12 +- kcontrol/usbview/usbdb.cpp | 66 +- kcontrol/usbview/usbdb.h | 14 +- kcontrol/usbview/usbdevices.cpp | 108 +- kcontrol/usbview/usbdevices.h | 26 +- kcontrol/view1394/view1394.cpp | 72 +- kcontrol/view1394/view1394.h | 22 +- kcontrol/xinerama/kcmxinerama.cpp | 86 +- kcontrol/xinerama/kcmxinerama.h | 12 +- kdcop/kdcoplistview.cpp | 52 +- kdcop/kdcoplistview.h | 60 +- kdcop/kdcopwindow.cpp | 484 ++++----- kdcop/kdcopwindow.h | 22 +- kdebugdialog/kabstractdebugdialog.cpp | 18 +- kdebugdialog/kabstractdebugdialog.h | 4 +- kdebugdialog/kdebugdialog.cpp | 120 +-- kdebugdialog/kdebugdialog.h | 64 +- kdebugdialog/klistdebugdialog.cpp | 68 +- kdebugdialog/klistdebugdialog.h | 20 +- kdebugdialog/main.cpp | 22 +- kdepasswd/kcm/chfacedlg.cpp | 78 +- kdepasswd/kcm/chfacedlg.h | 12 +- kdepasswd/kcm/chfnprocess.cpp | 4 +- kdepasswd/kcm/chfnprocess.h | 6 +- kdepasswd/kcm/main.cpp | 90 +- kdepasswd/kcm/main.h | 12 +- kdepasswd/kdepasswd.cpp | 4 +- kdepasswd/passwd.cpp | 8 +- kdepasswd/passwd.h | 10 +- kdepasswd/passwddlg.cpp | 12 +- kdepasswd/passwddlg.h | 6 +- kdeprint/descriptions/sortthem.cpp | 6 +- kdeprint/kdeprint_part/printpart.cpp | 10 +- kdeprint/kdeprint_part/printpart.h | 6 +- kdeprint/kdeprintfax/conffax.cpp | 26 +- kdeprint/kdeprintfax/conffax.h | 4 +- kdeprint/kdeprintfax/conffilters.cpp | 66 +- kdeprint/kdeprintfax/conffilters.h | 6 +- kdeprint/kdeprintfax/confgeneral.cpp | 34 +- kdeprint/kdeprintfax/confgeneral.h | 8 +- kdeprint/kdeprintfax/configdlg.cpp | 6 +- kdeprint/kdeprintfax/configdlg.h | 4 +- kdeprint/kdeprintfax/confsystem.cpp | 50 +- kdeprint/kdeprintfax/confsystem.h | 6 +- kdeprint/kdeprintfax/defcmds.cpp | 4 +- kdeprint/kdeprintfax/defcmds.h | 4 +- kdeprint/kdeprintfax/faxab.cpp | 42 +- kdeprint/kdeprintfax/faxab.h | 18 +- kdeprint/kdeprintfax/faxctrl.cpp | 158 +-- kdeprint/kdeprintfax/faxctrl.h | 20 +- kdeprint/kdeprintfax/filterdlg.cpp | 26 +- kdeprint/kdeprintfax/filterdlg.h | 4 +- kdeprint/kdeprintfax/kdeprintfax.cpp | 210 ++-- kdeprint/kdeprintfax/kdeprintfax.h | 44 +- kdeprint/kdeprintfax/main.cpp | 6 +- kdeprint/kjobviewer/kjobviewer.cpp | 26 +- kdeprint/kjobviewer/kjobviewer.h | 6 +- kdeprint/kprinter/main.cpp | 4 +- kdeprint/kprinter/printwrapper.cpp | 68 +- kdeprint/kprinter/printwrapper.h | 4 +- kdeprint/printmgr/kcmprintmgr.cpp | 10 +- kdeprint/printmgr/kcmprintmgr.h | 4 +- kdeprint/slave/kio_print.cpp | 148 +-- kdeprint/slave/kio_print.h | 20 +- kdesktop/KBackgroundIface.h | 14 +- kdesktop/KDesktopIface.h | 8 +- kdesktop/bgmanager.cc | 98 +- kdesktop/bgmanager.h | 34 +- kdesktop/desktop.cc | 186 ++-- kdesktop/desktop.h | 28 +- kdesktop/init.cc | 68 +- kdesktop/kcustommenu.cc | 30 +- kdesktop/kcustommenu.h | 4 +- kdesktop/kdesktopbindings.cpp | 10 +- kdesktop/kdesktopshadowsettings.cpp | 4 +- kdesktop/kdesktopshadowsettings.h | 10 +- kdesktop/kdiconview.cc | 378 +++---- kdesktop/kdiconview.h | 68 +- kdesktop/kfileividesktop.cpp | 50 +- kdesktop/kfileividesktop.h | 30 +- kdesktop/krootwm.cc | 134 +-- kdesktop/krootwm.h | 30 +- kdesktop/kshadowengine.cpp | 16 +- kdesktop/kshadowengine.h | 16 +- kdesktop/kshadowsettings.cpp | 10 +- kdesktop/kshadowsettings.h | 12 +- kdesktop/kwebdesktop/kwebdesktop.cpp | 44 +- kdesktop/kwebdesktop/kwebdesktop.h | 14 +- kdesktop/lock/autologout.cc | 46 +- kdesktop/lock/autologout.h | 16 +- kdesktop/lock/infodlg.cc | 48 +- kdesktop/lock/infodlg.h | 18 +- kdesktop/lock/lockdlg.cc | 194 ++-- kdesktop/lock/lockdlg.h | 30 +- kdesktop/lock/lockprocess.cc | 164 +-- kdesktop/lock/lockprocess.h | 44 +- kdesktop/lock/main.cc | 6 +- kdesktop/lock/querydlg.cc | 56 +- kdesktop/lock/querydlg.h | 18 +- kdesktop/lockeng.cc | 30 +- kdesktop/lockeng.h | 8 +- kdesktop/main.cc | 10 +- kdesktop/minicli.cpp | 184 ++-- kdesktop/minicli.h | 40 +- kdesktop/pixmapserver.cc | 14 +- kdesktop/pixmapserver.h | 38 +- kdesktop/startupid.cpp | 60 +- kdesktop/startupid.h | 22 +- kdesktop/xautolock.cc | 6 +- kdesktop/xautolock.h | 4 +- kdesu/kdesu/kdesu.cpp | 60 +- kdesu/kdesu/sudlg.cpp | 8 +- kdesu/kdesu/sudlg.h | 4 +- kdesu/kdesud/handler.cpp | 26 +- kdesu/kdesud/handler.h | 10 +- kdesu/kdesud/kdesud.cpp | 16 +- kdesu/kdesud/lexer.cpp | 6 +- kdesu/kdesud/lexer.h | 8 +- kdesu/kdesud/repo.cpp | 30 +- kdesu/kdesud/repo.h | 28 +- kdialog/kdialog.cpp | 204 ++-- kdialog/klistboxdialog.cpp | 20 +- kdialog/klistboxdialog.h | 12 +- kdialog/progressdialog.cpp | 4 +- kdialog/progressdialog.h | 4 +- kdialog/progressdialogiface.h | 2 +- kdialog/widgets.cpp | 76 +- kdialog/widgets.h | 24 +- kdm/kfrontend/kchooser.cpp | 78 +- kdm/kfrontend/kchooser.h | 10 +- kdm/kfrontend/kconsole.cpp | 12 +- kdm/kfrontend/kconsole.h | 12 +- kdm/kfrontend/kdm_greet.c | 2 +- kdm/kfrontend/kdmclock.cpp | 36 +- kdm/kfrontend/kdmclock.h | 16 +- kdm/kfrontend/kdmconfig.cpp | 44 +- kdm/kfrontend/kdmconfig.h | 10 +- kdm/kfrontend/kdmshutdown.cpp | 238 ++--- kdm/kfrontend/kdmshutdown.h | 72 +- kdm/kfrontend/kfdialog.cpp | 50 +- kdm/kfrontend/kfdialog.h | 28 +- kdm/kfrontend/kgapp.cpp | 18 +- kdm/kfrontend/kgapp.h | 2 +- kdm/kfrontend/kgdialog.cpp | 64 +- kdm/kfrontend/kgdialog.h | 10 +- kdm/kfrontend/kgreeter.cpp | 216 ++-- kdm/kfrontend/kgreeter.h | 34 +- kdm/kfrontend/kgverify.cpp | 158 +-- kdm/kfrontend/kgverify.h | 84 +- kdm/kfrontend/krootimage.cpp | 8 +- kdm/kfrontend/krootimage.h | 4 +- kdm/kfrontend/themer/kdmitem.cpp | 104 +- kdm/kfrontend/themer/kdmitem.h | 66 +- kdm/kfrontend/themer/kdmlabel.cpp | 60 +- kdm/kfrontend/themer/kdmlabel.h | 28 +- kdm/kfrontend/themer/kdmlayout.cpp | 38 +- kdm/kfrontend/themer/kdmlayout.h | 20 +- kdm/kfrontend/themer/kdmpixmap.cpp | 38 +- kdm/kfrontend/themer/kdmpixmap.h | 24 +- kdm/kfrontend/themer/kdmrect.cpp | 56 +- kdm/kfrontend/themer/kdmrect.h | 20 +- kdm/kfrontend/themer/kdmthemer.cpp | 112 +- kdm/kfrontend/themer/kdmthemer.h | 32 +- kdmlib/dmctl.cpp | 62 +- kdmlib/dmctl.h | 18 +- kdmlib/kgreet_classic.cpp | 86 +- kdmlib/kgreet_classic.h | 20 +- kdmlib/kgreet_winbind.cpp | 152 +-- kdmlib/kgreet_winbind.h | 28 +- kdmlib/kgreeterplugin.h | 34 +- kfind/kdatecombo.cpp | 44 +- kfind/kdatecombo.h | 28 +- kfind/kfind.cpp | 38 +- kfind/kfind.h | 8 +- kfind/kfinddlg.cpp | 88 +- kfind/kfinddlg.h | 18 +- kfind/kfindpart.cpp | 38 +- kfind/kfindpart.h | 14 +- kfind/kftabdlg.cpp | 234 ++--- kfind/kftabdlg.h | 74 +- kfind/kfwin.cpp | 136 +-- kfind/kfwin.h | 22 +- kfind/kquery.cpp | 96 +- kfind/kquery.h | 58 +- kfind/main.cpp | 8 +- khelpcenter/docentry.cpp | 66 +- khelpcenter/docentry.h | 84 +- khelpcenter/docmetainfo.cpp | 36 +- khelpcenter/docmetainfo.h | 22 +- khelpcenter/fontdialog.cpp | 54 +- khelpcenter/fontdialog.h | 4 +- khelpcenter/formatter.cpp | 46 +- khelpcenter/formatter.h | 22 +- khelpcenter/glossary.cpp | 108 +- khelpcenter/glossary.h | 64 +- khelpcenter/history.cpp | 50 +- khelpcenter/history.h | 12 +- khelpcenter/htmlsearch.cpp | 10 +- khelpcenter/htmlsearch.h | 10 +- khelpcenter/htmlsearch/htmlsearch.cpp | 112 +- khelpcenter/htmlsearch/htmlsearch.h | 22 +- khelpcenter/htmlsearch/kcmhtmlsearch.cpp | 146 +-- khelpcenter/htmlsearch/kcmhtmlsearch.h | 12 +- khelpcenter/htmlsearch/klangcombo.cpp | 16 +- khelpcenter/htmlsearch/klangcombo.h | 6 +- khelpcenter/htmlsearch/ktagcombobox.cpp | 86 +- khelpcenter/htmlsearch/ktagcombobox.h | 34 +- khelpcenter/htmlsearch/progressdialog.cpp | 26 +- khelpcenter/htmlsearch/progressdialog.h | 4 +- khelpcenter/htmlsearchconfig.cpp | 64 +- khelpcenter/htmlsearchconfig.h | 6 +- khelpcenter/infotree.cpp | 42 +- khelpcenter/infotree.h | 4 +- khelpcenter/kcmhelpcenter.cpp | 152 +-- khelpcenter/kcmhelpcenter.h | 44 +- khelpcenter/khc_indexbuilder.cpp | 56 +- khelpcenter/khc_indexbuilder.h | 14 +- khelpcenter/mainwindow.cpp | 126 +-- khelpcenter/mainwindow.h | 14 +- khelpcenter/navigator.cpp | 180 ++-- khelpcenter/navigator.h | 46 +- khelpcenter/navigatorappitem.cpp | 30 +- khelpcenter/navigatorappitem.h | 22 +- khelpcenter/navigatoritem.cpp | 22 +- khelpcenter/navigatoritem.h | 14 +- khelpcenter/plugintraverser.cpp | 4 +- khelpcenter/plugintraverser.h | 4 +- khelpcenter/scopeitem.h | 10 +- khelpcenter/scrollkeepertreebuilder.cpp | 46 +- khelpcenter/scrollkeepertreebuilder.h | 14 +- khelpcenter/searchengine.cpp | 114 +- khelpcenter/searchengine.h | 54 +- khelpcenter/searchhandler.cpp | 70 +- khelpcenter/searchhandler.h | 40 +- khelpcenter/searchwidget.cpp | 86 +- khelpcenter/searchwidget.h | 28 +- khelpcenter/testmetainfo.cpp | 12 +- khelpcenter/toc.cpp | 108 +- khelpcenter/toc.h | 24 +- khelpcenter/treebuilder.cpp | 6 +- khelpcenter/treebuilder.h | 6 +- khelpcenter/view.cpp | 80 +- khelpcenter/view.h | 26 +- khotkeys/app/app.cpp | 14 +- khotkeys/app/app.h | 2 +- khotkeys/app/kded.cpp | 8 +- khotkeys/app/kded.h | 2 +- khotkeys/arts/soundrecorder_arts.cpp | 14 +- khotkeys/arts/soundrecorder_arts.h | 10 +- khotkeys/arts/voicerecorder_arts.cpp | 6 +- khotkeys/kcontrol/action_group_tab.cpp | 30 +- khotkeys/kcontrol/action_group_tab.h | 4 +- khotkeys/kcontrol/action_list_widget.cpp | 48 +- khotkeys/kcontrol/action_list_widget.h | 36 +- khotkeys/kcontrol/actions_listview_widget.cpp | 36 +- khotkeys/kcontrol/actions_listview_widget.h | 26 +- khotkeys/kcontrol/command_url_widget.cpp | 14 +- khotkeys/kcontrol/command_url_widget.h | 2 +- khotkeys/kcontrol/condition_list_widget.cpp | 54 +- khotkeys/kcontrol/condition_list_widget.h | 44 +- khotkeys/kcontrol/dcop_widget.cpp | 22 +- khotkeys/kcontrol/dcop_widget.h | 2 +- khotkeys/kcontrol/general_settings_tab.cpp | 8 +- khotkeys/kcontrol/general_settings_tab.h | 2 +- khotkeys/kcontrol/general_tab.cpp | 44 +- khotkeys/kcontrol/general_tab.h | 6 +- khotkeys/kcontrol/gesture_triggers_tab.cpp | 40 +- khotkeys/kcontrol/gesture_triggers_tab.h | 12 +- khotkeys/kcontrol/gesturedrawer.cpp | 62 +- khotkeys/kcontrol/gesturedrawer.h | 28 +- khotkeys/kcontrol/gesturerecorder.cpp | 28 +- khotkeys/kcontrol/gesturerecorder.h | 14 +- khotkeys/kcontrol/gesturerecordpage.cpp | 46 +- khotkeys/kcontrol/gesturerecordpage.h | 14 +- khotkeys/kcontrol/gestures_settings_tab.cpp | 18 +- khotkeys/kcontrol/gestures_settings_tab.h | 2 +- khotkeys/kcontrol/info_tab.cpp | 6 +- khotkeys/kcontrol/info_tab.h | 2 +- khotkeys/kcontrol/init.cpp | 4 +- khotkeys/kcontrol/kcmkhotkeys.cpp | 34 +- khotkeys/kcontrol/kcmkhotkeys.h | 6 +- khotkeys/kcontrol/keyboard_input_widget.cpp | 28 +- khotkeys/kcontrol/keyboard_input_widget.h | 2 +- khotkeys/kcontrol/main_buttons_widget.cpp | 24 +- khotkeys/kcontrol/main_buttons_widget.h | 2 +- khotkeys/kcontrol/menuedit.cpp | 58 +- khotkeys/kcontrol/menuedit.h | 16 +- khotkeys/kcontrol/menuentry_widget.cpp | 14 +- khotkeys/kcontrol/menuentry_widget.h | 2 +- khotkeys/kcontrol/tab_widget.cpp | 18 +- khotkeys/kcontrol/tab_widget.h | 6 +- khotkeys/kcontrol/triggers_tab.cpp | 76 +- khotkeys/kcontrol/triggers_tab.h | 26 +- khotkeys/kcontrol/voice_settings_tab.cpp | 8 +- khotkeys/kcontrol/voice_settings_tab.h | 2 +- khotkeys/kcontrol/voicerecorder.cpp | 36 +- khotkeys/kcontrol/voicerecorder.h | 10 +- khotkeys/kcontrol/voicerecordpage.cpp | 36 +- khotkeys/kcontrol/voicerecordpage.h | 12 +- khotkeys/kcontrol/window_trigger_widget.cpp | 20 +- khotkeys/kcontrol/window_trigger_widget.h | 2 +- khotkeys/kcontrol/windowdef_list_widget.cpp | 50 +- khotkeys/kcontrol/windowdef_list_widget.h | 44 +- khotkeys/kcontrol/windowdef_simple_widget.cpp | 64 +- khotkeys/kcontrol/windowdef_simple_widget.h | 4 +- khotkeys/kcontrol/windowselector.cpp | 8 +- khotkeys/kcontrol/windowselector.h | 4 +- khotkeys/shared/action_data.cpp | 22 +- khotkeys/shared/action_data.h | 84 +- khotkeys/shared/actions.cpp | 48 +- khotkeys/shared/actions.h | 92 +- khotkeys/shared/conditions.cpp | 44 +- khotkeys/shared/conditions.h | 46 +- khotkeys/shared/gestures.cpp | 18 +- khotkeys/shared/gestures.h | 28 +- khotkeys/shared/input.cpp | 36 +- khotkeys/shared/input.h | 20 +- khotkeys/shared/khlistbox.cpp | 32 +- khotkeys/shared/khlistbox.h | 16 +- khotkeys/shared/khlistview.cpp | 28 +- khotkeys/shared/khlistview.h | 18 +- khotkeys/shared/khotkeysglobal.cpp | 10 +- khotkeys/shared/khotkeysglobal.h | 6 +- khotkeys/shared/settings.cpp | 22 +- khotkeys/shared/settings.h | 2 +- khotkeys/shared/sound.cpp | 34 +- khotkeys/shared/sound.h | 10 +- khotkeys/shared/soundrecorder.cpp | 6 +- khotkeys/shared/soundrecorder.h | 8 +- khotkeys/shared/triggers.cpp | 48 +- khotkeys/shared/triggers.h | 58 +- khotkeys/shared/voices.cpp | 26 +- khotkeys/shared/voices.h | 16 +- khotkeys/shared/voicesignature.cpp | 30 +- khotkeys/shared/voicesignature.h | 14 +- khotkeys/shared/windows.cpp | 48 +- khotkeys/shared/windows.h | 74 +- khotkeys/update/update.cpp | 6 +- kicker/applets/clock/clock.cpp | 332 +++--- kicker/applets/clock/clock.h | 120 +-- kicker/applets/clock/datepicker.cpp | 20 +- kicker/applets/clock/datepicker.h | 14 +- kicker/applets/clock/zone.cpp | 38 +- kicker/applets/clock/zone.h | 14 +- kicker/applets/launcher/configdlg.cpp | 12 +- kicker/applets/launcher/configdlg.h | 4 +- kicker/applets/launcher/flowgridmanager.cpp | 84 +- kicker/applets/launcher/flowgridmanager.h | 56 +- kicker/applets/launcher/popularity.cpp | 66 +- kicker/applets/launcher/popularity.h | 14 +- kicker/applets/launcher/quickaddappsmenu.cpp | 16 +- kicker/applets/launcher/quickaddappsmenu.h | 18 +- kicker/applets/launcher/quickbutton.cpp | 62 +- kicker/applets/launcher/quickbutton.h | 56 +- kicker/applets/launcher/quickbuttongroup.h | 10 +- kicker/applets/launcher/quicklauncher.cpp | 170 +-- kicker/applets/launcher/quicklauncher.h | 54 +- kicker/applets/lockout/lockout.cpp | 88 +- kicker/applets/lockout/lockout.h | 22 +- kicker/applets/media/mediaapplet.cpp | 34 +- kicker/applets/media/mediaapplet.h | 18 +- kicker/applets/media/mediumbutton.cpp | 42 +- kicker/applets/media/mediumbutton.h | 22 +- kicker/applets/media/preferencesdialog.cpp | 48 +- kicker/applets/media/preferencesdialog.h | 12 +- kicker/applets/menu/menuapplet.cpp | 60 +- kicker/applets/menu/menuapplet.h | 16 +- kicker/applets/minipager/pagerapplet.cpp | 180 ++-- kicker/applets/minipager/pagerapplet.h | 32 +- kicker/applets/minipager/pagerbutton.cpp | 222 ++-- kicker/applets/minipager/pagerbutton.h | 48 +- kicker/applets/naughty/NaughtyApplet.cpp | 40 +- kicker/applets/naughty/NaughtyApplet.h | 10 +- kicker/applets/naughty/NaughtyConfigDialog.cpp | 10 +- kicker/applets/naughty/NaughtyConfigDialog.h | 6 +- kicker/applets/naughty/NaughtyProcessMonitor.cpp | 88 +- kicker/applets/naughty/NaughtyProcessMonitor.h | 10 +- kicker/applets/run/runapplet.cpp | 56 +- kicker/applets/run/runapplet.h | 16 +- kicker/applets/swallow/prefwidget.cpp | 2 +- kicker/applets/swallow/prefwidget.h | 2 +- kicker/applets/swallow/swallow.cpp | 60 +- kicker/applets/swallow/swallow.h | 22 +- kicker/applets/systemtray/systemtrayapplet.cpp | 112 +- kicker/applets/systemtray/systemtrayapplet.h | 30 +- kicker/applets/taskbar/taskbarapplet.cpp | 22 +- kicker/applets/taskbar/taskbarapplet.h | 8 +- kicker/applets/trash/trashapplet.cpp | 22 +- kicker/applets/trash/trashapplet.h | 8 +- kicker/applets/trash/trashbutton.cpp | 24 +- kicker/applets/trash/trashbutton.h | 18 +- kicker/extensions/dockbar/dockbarextension.cpp | 62 +- kicker/extensions/dockbar/dockbarextension.h | 22 +- kicker/extensions/dockbar/dockcontainer.cpp | 26 +- kicker/extensions/dockbar/dockcontainer.h | 30 +- kicker/extensions/kasbar/docs.h | 10 +- kicker/extensions/kasbar/kasaboutdlg.cpp | 58 +- kicker/extensions/kasbar/kasaboutdlg.h | 2 +- kicker/extensions/kasbar/kasbar.cpp | 152 +-- kicker/extensions/kasbar/kasbar.h | 62 +- kicker/extensions/kasbar/kasbarapp.cpp | 4 +- kicker/extensions/kasbar/kasbarextension.cpp | 28 +- kicker/extensions/kasbar/kasbarextension.h | 14 +- kicker/extensions/kasbar/kasclockitem.cpp | 44 +- kicker/extensions/kasbar/kasclockitem.h | 6 +- kicker/extensions/kasbar/kasgrouper.cpp | 10 +- kicker/extensions/kasbar/kasgroupitem.cpp | 34 +- kicker/extensions/kasbar/kasgroupitem.h | 12 +- kicker/extensions/kasbar/kasitem.cpp | 88 +- kicker/extensions/kasbar/kasitem.h | 74 +- kicker/extensions/kasbar/kasloaditem.cpp | 28 +- kicker/extensions/kasbar/kasloaditem.h | 12 +- kicker/extensions/kasbar/kaspopup.cpp | 14 +- kicker/extensions/kasbar/kaspopup.h | 8 +- kicker/extensions/kasbar/kasprefsdlg.cpp | 298 +++--- kicker/extensions/kasbar/kasprefsdlg.h | 40 +- kicker/extensions/kasbar/kasresources.cpp | 54 +- kicker/extensions/kasbar/kasresources.h | 100 +- kicker/extensions/kasbar/kasstartupitem.cpp | 20 +- kicker/extensions/kasbar/kasstartupitem.h | 10 +- kicker/extensions/kasbar/kastasker.cpp | 94 +- kicker/extensions/kasbar/kastasker.h | 6 +- kicker/extensions/kasbar/kastaskitem.cpp | 128 +-- kicker/extensions/kasbar/kastaskitem.h | 22 +- kicker/extensions/kasbar/kastaskpopup.cpp | 18 +- kicker/extensions/kasbar/kastaskpopup.h | 2 +- kicker/extensions/sidebar/sidebarextension.cpp | 56 +- kicker/extensions/sidebar/sidebarextension.h | 14 +- kicker/extensions/taskbar/taskbarextension.cpp | 48 +- kicker/extensions/taskbar/taskbarextension.h | 16 +- kicker/kicker/buttons/bookmarksbutton.cpp | 6 +- kicker/kicker/buttons/bookmarksbutton.h | 4 +- kicker/kicker/buttons/browserbutton.cpp | 30 +- kicker/kicker/buttons/browserbutton.h | 20 +- kicker/kicker/buttons/desktopbutton.cpp | 18 +- kicker/kicker/buttons/desktopbutton.h | 8 +- kicker/kicker/buttons/extensionbutton.cpp | 10 +- kicker/kicker/buttons/extensionbutton.h | 8 +- kicker/kicker/buttons/kbutton.cpp | 8 +- kicker/kicker/buttons/kbutton.h | 6 +- kicker/kicker/buttons/nonkdeappbutton.cpp | 50 +- kicker/kicker/buttons/nonkdeappbutton.h | 36 +- kicker/kicker/buttons/servicebutton.cpp | 50 +- kicker/kicker/buttons/servicebutton.h | 18 +- kicker/kicker/buttons/servicemenubutton.cpp | 14 +- kicker/kicker/buttons/servicemenubutton.h | 10 +- kicker/kicker/buttons/urlbutton.cpp | 28 +- kicker/kicker/buttons/urlbutton.h | 12 +- kicker/kicker/buttons/windowlistbutton.cpp | 6 +- kicker/kicker/buttons/windowlistbutton.h | 4 +- kicker/kicker/core/applethandle.cpp | 128 +-- kicker/kicker/core/applethandle.h | 36 +- kicker/kicker/core/container_applet.cpp | 76 +- kicker/kicker/core/container_applet.h | 22 +- kicker/kicker/core/container_base.cpp | 16 +- kicker/kicker/core/container_base.h | 42 +- kicker/kicker/core/container_button.cpp | 114 +- kicker/kicker/core/container_button.h | 122 +-- kicker/kicker/core/container_extension.cpp | 278 ++--- kicker/kicker/core/container_extension.h | 58 +- kicker/kicker/core/containerarea.cpp | 308 +++--- kicker/kicker/core/containerarea.h | 100 +- kicker/kicker/core/containerarealayout.cpp | 84 +- kicker/kicker/core/containerarealayout.h | 40 +- kicker/kicker/core/extensionmanager.cpp | 84 +- kicker/kicker/core/extensionmanager.h | 20 +- kicker/kicker/core/kicker.cpp | 74 +- kicker/kicker/core/kicker.h | 28 +- kicker/kicker/core/kickerbindings.cpp | 4 +- kicker/kicker/core/main.cpp | 14 +- kicker/kicker/core/menumanager.cpp | 66 +- kicker/kicker/core/menumanager.h | 22 +- kicker/kicker/core/panelextension.cpp | 108 +- kicker/kicker/core/panelextension.h | 52 +- kicker/kicker/core/pluginmanager.cpp | 80 +- kicker/kicker/core/pluginmanager.h | 38 +- kicker/kicker/core/showdesktop.cpp | 40 +- kicker/kicker/core/showdesktop.h | 4 +- kicker/kicker/core/unhidetrigger.cpp | 14 +- kicker/kicker/core/unhidetrigger.h | 4 +- kicker/kicker/core/userrectsel.cpp | 20 +- kicker/kicker/core/userrectsel.h | 26 +- kicker/kicker/kicker-3.4-reverseLayout.cpp | 54 +- kicker/kicker/ui/addapplet.cpp | 138 +-- kicker/kicker/ui/addapplet.h | 22 +- kicker/kicker/ui/addapplet_mnu.cpp | 8 +- kicker/kicker/ui/addapplet_mnu.h | 6 +- kicker/kicker/ui/addappletvisualfeedback.cpp | 46 +- kicker/kicker/ui/addappletvisualfeedback.h | 28 +- kicker/kicker/ui/addbutton_mnu.cpp | 14 +- kicker/kicker/ui/addbutton_mnu.h | 10 +- kicker/kicker/ui/addextension_mnu.cpp | 8 +- kicker/kicker/ui/addextension_mnu.h | 6 +- kicker/kicker/ui/appletop_mnu.cpp | 28 +- kicker/kicker/ui/appletop_mnu.h | 10 +- kicker/kicker/ui/appletwidget.h | 24 +- kicker/kicker/ui/browser_dlg.cpp | 34 +- kicker/kicker/ui/browser_dlg.h | 10 +- kicker/kicker/ui/browser_mnu.cpp | 120 +-- kicker/kicker/ui/browser_mnu.h | 34 +- kicker/kicker/ui/client_mnu.cpp | 68 +- kicker/kicker/ui/client_mnu.h | 30 +- kicker/kicker/ui/dirdrop_mnu.cpp | 4 +- kicker/kicker/ui/dirdrop_mnu.h | 4 +- kicker/kicker/ui/exe_dlg.cpp | 70 +- kicker/kicker/ui/exe_dlg.h | 28 +- kicker/kicker/ui/extensionop_mnu.cpp | 4 +- kicker/kicker/ui/extensionop_mnu.h | 4 +- kicker/kicker/ui/hidebutton.cpp | 36 +- kicker/kicker/ui/hidebutton.h | 22 +- kicker/kicker/ui/k_mnu.cpp | 142 +-- kicker/kicker/ui/k_mnu.h | 34 +- kicker/kicker/ui/panelmenuiteminfo.h | 18 +- kicker/kicker/ui/popupmenutitle.cpp | 4 +- kicker/kicker/ui/popupmenutitle.h | 30 +- kicker/kicker/ui/quickbrowser_mnu.cpp | 10 +- kicker/kicker/ui/quickbrowser_mnu.h | 2 +- kicker/kicker/ui/recentapps.cpp | 38 +- kicker/kicker/ui/recentapps.h | 20 +- kicker/kicker/ui/removeapplet_mnu.cpp | 14 +- kicker/kicker/ui/removeapplet_mnu.h | 6 +- kicker/kicker/ui/removebutton_mnu.cpp | 18 +- kicker/kicker/ui/removebutton_mnu.h | 8 +- kicker/kicker/ui/removecontainer_mnu.cpp | 6 +- kicker/kicker/ui/removecontainer_mnu.h | 4 +- kicker/kicker/ui/removeextension_mnu.cpp | 18 +- kicker/kicker/ui/removeextension_mnu.h | 6 +- kicker/kicker/ui/service_mnu.cpp | 112 +- kicker/kicker/ui/service_mnu.h | 56 +- kicker/libkicker/appletinfo.cpp | 12 +- kicker/libkicker/appletinfo.h | 50 +- kicker/libkicker/global.cpp | 108 +- kicker/libkicker/global.h | 28 +- kicker/libkicker/kickertip.cpp | 110 +- kicker/libkicker/kickertip.h | 48 +- kicker/libkicker/kshadowengine.cpp | 40 +- kicker/libkicker/kshadowengine.h | 18 +- kicker/libkicker/kshadowsettings.cpp | 10 +- kicker/libkicker/kshadowsettings.h | 12 +- kicker/libkicker/menuinfo.cpp | 16 +- kicker/libkicker/menuinfo.h | 18 +- kicker/libkicker/panelbutton.cpp | 250 ++--- kicker/libkicker/panelbutton.h | 110 +- kicker/libkicker/paneldrag.cpp | 52 +- kicker/libkicker/paneldrag.h | 22 +- kicker/libkicker/panner.cpp | 118 +-- kicker/libkicker/panner.h | 48 +- kicker/libkicker/simplebutton.cpp | 84 +- kicker/libkicker/simplebutton.h | 38 +- kicker/menuext/find/findmenu.cpp | 12 +- kicker/menuext/find/findmenu.h | 4 +- kicker/menuext/kate/katesessionmenu.cpp | 24 +- kicker/menuext/kate/katesessionmenu.h | 6 +- kicker/menuext/kdeprint/print_mnu.cpp | 14 +- kicker/menuext/kdeprint/print_mnu.h | 2 +- kicker/menuext/konq-profiles/konqy_menu.cpp | 20 +- kicker/menuext/konq-profiles/konqy_menu.h | 6 +- kicker/menuext/konsole/konsole_mnu.cpp | 68 +- kicker/menuext/konsole/konsole_mnu.h | 12 +- kicker/menuext/konsole/konsolebookmarkhandler.cpp | 48 +- kicker/menuext/konsole/konsolebookmarkhandler.h | 24 +- kicker/menuext/konsole/konsolebookmarkmenu.cpp | 38 +- kicker/menuext/konsole/konsolebookmarkmenu.h | 8 +- kicker/menuext/prefmenu/prefmenu.cpp | 70 +- kicker/menuext/prefmenu/prefmenu.h | 30 +- kicker/menuext/recentdocs/recentdocsmenu.cpp | 30 +- kicker/menuext/recentdocs/recentdocsmenu.h | 10 +- kicker/menuext/remote/remotemenu.cpp | 38 +- kicker/menuext/remote/remotemenu.h | 8 +- kicker/menuext/system/systemmenu.cpp | 18 +- kicker/menuext/system/systemmenu.h | 8 +- kicker/menuext/tom/tom.cc | 224 ++-- kicker/menuext/tom/tom.h | 48 +- kicker/proxy/appletproxy.cpp | 100 +- kicker/proxy/appletproxy.h | 24 +- kicker/proxy/extensiondebugger.cpp | 42 +- kicker/proxy/extensiondebugger.h | 4 +- kicker/proxy/extensionproxy.cpp | 80 +- kicker/proxy/extensionproxy.h | 20 +- kicker/taskbar/taskbar.cpp | 150 +-- kicker/taskbar/taskbar.h | 30 +- kicker/taskbar/taskbarbindings.cpp | 4 +- kicker/taskbar/taskbarcontainer.cpp | 52 +- kicker/taskbar/taskbarcontainer.h | 10 +- kicker/taskbar/taskcontainer.cpp | 302 +++--- kicker/taskbar/taskcontainer.h | 68 +- kicker/taskmanager/tasklmbmenu.cpp | 72 +- kicker/taskmanager/tasklmbmenu.h | 34 +- kicker/taskmanager/taskmanager.cpp | 166 +-- kicker/taskmanager/taskmanager.h | 124 +-- kicker/taskmanager/taskrmbmenu.cpp | 66 +- kicker/taskmanager/taskrmbmenu.h | 12 +- kioslave/about/kio_about.cpp | 10 +- kioslave/about/kio_about.h | 4 +- kioslave/cgi/cgi.cpp | 46 +- kioslave/cgi/cgi.h | 8 +- kioslave/cgi/kcmcgi/kcmcgi.cpp | 42 +- kioslave/cgi/kcmcgi/kcmcgi.h | 12 +- kioslave/filter/filter.cc | 12 +- kioslave/filter/filter.h | 6 +- kioslave/finger/kio_finger.cpp | 48 +- kioslave/finger/kio_finger.h | 14 +- kioslave/fish/fish.cpp | 124 +-- kioslave/fish/fish.h | 46 +- kioslave/floppy/kio_floppy.cpp | 146 +-- kioslave/floppy/kio_floppy.h | 12 +- kioslave/floppy/program.cpp | 4 +- kioslave/floppy/program.h | 6 +- kioslave/home/homeimpl.cpp | 42 +- kioslave/home/homeimpl.h | 10 +- kioslave/home/kdedmodule/homedirnotify.cpp | 24 +- kioslave/home/kdedmodule/homedirnotify.h | 4 +- kioslave/home/kdedmodule/homedirnotifymodule.cpp | 4 +- kioslave/home/kdedmodule/homedirnotifymodule.h | 2 +- kioslave/home/kio_home.cpp | 12 +- kioslave/home/kio_home.h | 4 +- kioslave/home/testhome.cpp | 6 +- kioslave/info/info.cc | 28 +- kioslave/info/info.h | 16 +- kioslave/ldap/kio_ldap.cpp | 94 +- kioslave/ldap/kio_ldap.h | 28 +- kioslave/mac/kio_mac.cpp | 256 ++--- kioslave/mac/kio_mac.h | 28 +- kioslave/man/kio_man.cpp | 386 +++---- kioslave/man/kio_man.h | 60 +- kioslave/man/kio_man_test.cpp | 4 +- kioslave/man/kmanpart.cpp | 16 +- kioslave/man/kmanpart.h | 14 +- kioslave/man/man2html.cpp | 206 ++-- kioslave/man/man2html.h | 4 +- kioslave/media/kcmodule/main.cpp | 22 +- kioslave/media/kcmodule/main.h | 4 +- kioslave/media/kcmodule/managermodule.cpp | 8 +- kioslave/media/kcmodule/managermodule.h | 2 +- kioslave/media/kcmodule/mimetypelistboxitem.cpp | 6 +- kioslave/media/kcmodule/mimetypelistboxitem.h | 10 +- kioslave/media/kcmodule/notifiermodule.cpp | 50 +- kioslave/media/kcmodule/notifiermodule.h | 6 +- kioslave/media/kcmodule/serviceconfigdialog.cpp | 38 +- kioslave/media/kcmodule/serviceconfigdialog.h | 4 +- kioslave/media/kfile-plugin/kfilemediaplugin.cpp | 52 +- kioslave/media/kfile-plugin/kfilemediaplugin.h | 4 +- kioslave/media/kio_media.cpp | 30 +- kioslave/media/kio_media.h | 6 +- .../media/libmediacommon/actionlistboxitem.cpp | 8 +- kioslave/media/libmediacommon/actionlistboxitem.h | 6 +- kioslave/media/libmediacommon/medium.cpp | 94 +- kioslave/media/libmediacommon/medium.h | 84 +- kioslave/media/libmediacommon/notifieraction.cpp | 28 +- kioslave/media/libmediacommon/notifieraction.h | 30 +- .../media/libmediacommon/notifiernothingaction.cpp | 2 +- .../media/libmediacommon/notifiernothingaction.h | 2 +- .../media/libmediacommon/notifieropenaction.cpp | 4 +- kioslave/media/libmediacommon/notifieropenaction.h | 4 +- .../media/libmediacommon/notifierserviceaction.cpp | 54 +- .../media/libmediacommon/notifierserviceaction.h | 22 +- kioslave/media/libmediacommon/notifiersettings.cpp | 104 +- kioslave/media/libmediacommon/notifiersettings.h | 34 +- kioslave/media/mediaimpl.cpp | 66 +- kioslave/media/mediaimpl.h | 30 +- kioslave/media/mediamanager/fstabbackend.cpp | 104 +- kioslave/media/mediamanager/fstabbackend.h | 40 +- kioslave/media/mediamanager/halbackend.cpp | 324 +++--- kioslave/media/mediamanager/halbackend.h | 38 +- kioslave/media/mediamanager/linuxcdpolling.cpp | 96 +- kioslave/media/mediamanager/linuxcdpolling.h | 26 +- kioslave/media/mediamanager/mediadirnotify.cpp | 8 +- kioslave/media/mediamanager/medialist.cpp | 68 +- kioslave/media/mediamanager/medialist.h | 60 +- kioslave/media/mediamanager/mediamanager.cpp | 84 +- kioslave/media/mediamanager/mediamanager.h | 52 +- kioslave/media/mediamanager/removablebackend.cpp | 62 +- kioslave/media/mediamanager/removablebackend.h | 22 +- kioslave/media/medianotifier/medianotifier.cpp | 108 +- kioslave/media/medianotifier/medianotifier.h | 20 +- .../media/medianotifier/notificationdialog.cpp | 52 +- kioslave/media/medianotifier/notificationdialog.h | 4 +- kioslave/media/mounthelper/dialog.cpp | 14 +- kioslave/media/mounthelper/dialog.h | 14 +- .../media/mounthelper/kio_media_mounthelper.cpp | 40 +- kioslave/media/mounthelper/kio_media_mounthelper.h | 10 +- kioslave/media/propsdlgplugin/propertiespage.cpp | 76 +- kioslave/media/propsdlgplugin/propertiespage.h | 8 +- .../media/propsdlgplugin/propsdlgshareplugin.cpp | 20 +- .../media/propsdlgplugin/propsdlgshareplugin.h | 2 +- kioslave/media/testmedia.cpp | 6 +- kioslave/nfs/kio_nfs.cpp | 148 +-- kioslave/nfs/kio_nfs.h | 38 +- kioslave/nntp/nntp.cpp | 108 +- kioslave/nntp/nntp.h | 22 +- kioslave/pop3/pop3.cc | 90 +- kioslave/pop3/pop3.h | 16 +- kioslave/remote/kdedmodule/remotedirnotify.cpp | 6 +- .../remote/kdedmodule/remotedirnotifymodule.cpp | 4 +- kioslave/remote/kdedmodule/remotedirnotifymodule.h | 2 +- kioslave/remote/kio_remote.cpp | 12 +- kioslave/remote/kio_remote.h | 4 +- kioslave/remote/remoteimpl.cpp | 84 +- kioslave/remote/remoteimpl.h | 20 +- kioslave/remote/testremote.cpp | 6 +- kioslave/settings/kio_settings.cc | 32 +- kioslave/sftp/kio_sftp.cpp | 220 ++-- kioslave/sftp/kio_sftp.h | 44 +- kioslave/sftp/ksshprocess.cpp | 114 +- kioslave/sftp/ksshprocess.h | 50 +- kioslave/sftp/ksshprocesstest.cpp | 8 +- kioslave/sftp/process.cpp | 24 +- kioslave/sftp/process.h | 42 +- kioslave/sftp/sftpfileattr.cpp | 22 +- kioslave/sftp/sftpfileattr.h | 32 +- kioslave/smb/kio_smb.cpp | 2 +- kioslave/smb/kio_smb.h | 30 +- kioslave/smb/kio_smb_auth.cpp | 16 +- kioslave/smb/kio_smb_browse.cpp | 26 +- kioslave/smb/kio_smb_config.cpp | 14 +- kioslave/smb/kio_smb_file.cpp | 6 +- kioslave/smb/kio_smb_internal.cpp | 8 +- kioslave/smb/kio_smb_internal.h | 22 +- kioslave/smb/kio_smb_mount.cpp | 42 +- kioslave/smtp/capabilities.cc | 48 +- kioslave/smtp/capabilities.h | 30 +- kioslave/smtp/command.cc | 60 +- kioslave/smtp/command.h | 58 +- kioslave/smtp/interactivesmtpserver.cc | 74 +- kioslave/smtp/interactivesmtpserver.h | 38 +- kioslave/smtp/request.cc | 36 +- kioslave/smtp/request.h | 42 +- kioslave/smtp/response.cc | 16 +- kioslave/smtp/response.h | 8 +- kioslave/smtp/smtp.cc | 56 +- kioslave/smtp/smtp.h | 32 +- kioslave/smtp/test_commands.cc | 26 +- kioslave/smtp/test_headergeneration.cc | 4 +- kioslave/smtp/test_responseparser.cc | 6 +- kioslave/smtp/transactionstate.cc | 14 +- kioslave/smtp/transactionstate.h | 26 +- kioslave/system/kdedmodule/systemdirnotify.cpp | 28 +- kioslave/system/kdedmodule/systemdirnotify.h | 4 +- .../system/kdedmodule/systemdirnotifymodule.cpp | 4 +- kioslave/system/kdedmodule/systemdirnotifymodule.h | 2 +- kioslave/system/kio_system.cpp | 14 +- kioslave/system/kio_system.h | 4 +- kioslave/system/systemimpl.cpp | 94 +- kioslave/system/systemimpl.h | 22 +- kioslave/system/testsystem.cpp | 6 +- kioslave/tar/ktartest.cpp | 28 +- kioslave/tar/tar.cc | 56 +- kioslave/tar/tar.h | 6 +- kioslave/thumbnail/cursorcreator.cpp | 12 +- kioslave/thumbnail/cursorcreator.h | 2 +- kioslave/thumbnail/djvucreator.cpp | 12 +- kioslave/thumbnail/djvucreator.h | 2 +- kioslave/thumbnail/exrcreator.cpp | 10 +- kioslave/thumbnail/exrcreator.h | 2 +- kioslave/thumbnail/htmlcreator.cpp | 22 +- kioslave/thumbnail/htmlcreator.h | 6 +- kioslave/thumbnail/imagecreator.cpp | 4 +- kioslave/thumbnail/imagecreator.h | 2 +- kioslave/thumbnail/textcreator.cpp | 32 +- kioslave/thumbnail/textcreator.h | 6 +- kioslave/thumbnail/thumbnail.cpp | 70 +- kioslave/thumbnail/thumbnail.h | 12 +- kioslave/trash/kfile-plugin/kfile_trash.cpp | 22 +- kioslave/trash/kfile-plugin/kfile_trash.h | 4 +- kioslave/trash/kio_trash.cpp | 108 +- kioslave/trash/kio_trash.h | 16 +- kioslave/trash/ktrash.cpp | 14 +- kioslave/trash/testtrash.cpp | 414 ++++---- kioslave/trash/testtrash.h | 36 +- kioslave/trash/trashimpl.cpp | 242 ++--- kioslave/trash/trashimpl.h | 86 +- klipper/applet.cpp | 18 +- klipper/applet.h | 8 +- klipper/clipboardpoll.cpp | 12 +- klipper/clipboardpoll.h | 8 +- klipper/configdialog.cpp | 168 +-- klipper/configdialog.h | 64 +- klipper/history.cpp | 6 +- klipper/history.h | 10 +- klipper/historyimageitem.cpp | 12 +- klipper/historyimageitem.h | 18 +- klipper/historyitem.cpp | 38 +- klipper/historyitem.h | 22 +- klipper/historystringitem.cpp | 6 +- klipper/historystringitem.h | 16 +- klipper/historyurlitem.cpp | 16 +- klipper/historyurlitem.h | 12 +- klipper/klipperbindings.cpp | 4 +- klipper/klipperpopup.cpp | 40 +- klipper/klipperpopup.h | 16 +- klipper/popupproxy.cpp | 38 +- klipper/popupproxy.h | 12 +- klipper/toplevel.cpp | 188 ++-- klipper/toplevel.h | 50 +- klipper/urlgrabber.cpp | 76 +- klipper/urlgrabber.h | 70 +- kmenuedit/basictab.cpp | 144 +-- kmenuedit/basictab.h | 12 +- kmenuedit/khotkeys.cpp | 42 +- kmenuedit/khotkeys.h | 16 +- kmenuedit/kmenuedit.cpp | 36 +- kmenuedit/kmenuedit.h | 8 +- kmenuedit/main.cpp | 4 +- kmenuedit/menufile.cpp | 164 +-- kmenuedit/menufile.h | 40 +- kmenuedit/menuinfo.cpp | 70 +- kmenuedit/menuinfo.h | 54 +- kmenuedit/treeview.cpp | 318 +++--- kmenuedit/treeview.h | 66 +- knetattach/knetattach.ui.h | 32 +- konqueror/KonqMainWindowIface.cc | 22 +- konqueror/KonqMainWindowIface.h | 18 +- konqueror/KonqViewIface.cc | 20 +- konqueror/KonqViewIface.h | 22 +- konqueror/KonquerorIface.cc | 100 +- konqueror/KonquerorIface.h | 54 +- konqueror/about/konq_aboutpage.cc | 160 +-- konqueror/about/konq_aboutpage.h | 38 +- konqueror/client/kfmclient.cc | 144 +-- konqueror/client/kfmclient.h | 6 +- konqueror/delayedinitializer.cc | 10 +- konqueror/delayedinitializer.h | 6 +- konqueror/iconview/konq_iconview.cc | 286 ++--- konqueror/iconview/konq_iconview.h | 46 +- konqueror/keditbookmarks/actionsimpl.cpp | 160 +-- konqueror/keditbookmarks/actionsimpl.h | 2 +- konqueror/keditbookmarks/bookmarkinfo.cpp | 94 +- konqueror/keditbookmarks/bookmarkinfo.h | 16 +- konqueror/keditbookmarks/bookmarkiterator.cpp | 12 +- konqueror/keditbookmarks/bookmarkiterator.h | 10 +- konqueror/keditbookmarks/commands.cpp | 180 ++-- konqueror/keditbookmarks/commands.h | 148 +-- konqueror/keditbookmarks/dcop.cpp | 16 +- konqueror/keditbookmarks/dcop.h | 4 +- konqueror/keditbookmarks/exporters.cpp | 12 +- konqueror/keditbookmarks/exporters.h | 8 +- konqueror/keditbookmarks/favicons.cpp | 10 +- konqueror/keditbookmarks/favicons.h | 6 +- konqueror/keditbookmarks/importers.cpp | 58 +- konqueror/keditbookmarks/importers.h | 70 +- konqueror/keditbookmarks/kbookmarkmerger.cpp | 18 +- konqueror/keditbookmarks/kebsearchline.cpp | 14 +- konqueror/keditbookmarks/kebsearchline.h | 14 +- konqueror/keditbookmarks/listview.cpp | 250 ++--- konqueror/keditbookmarks/listview.h | 96 +- konqueror/keditbookmarks/main.cpp | 34 +- konqueror/keditbookmarks/testlink.cpp | 116 +- konqueror/keditbookmarks/testlink.h | 28 +- konqueror/keditbookmarks/toplevel.cpp | 64 +- konqueror/keditbookmarks/toplevel.h | 34 +- konqueror/keditbookmarks/updater.cpp | 48 +- konqueror/keditbookmarks/updater.h | 10 +- konqueror/konq_actions.cc | 102 +- konqueror/konq_actions.h | 52 +- konqueror/konq_combo.cc | 238 ++--- konqueror/konq_combo.h | 44 +- konqueror/konq_extensionmanager.cc | 24 +- konqueror/konq_extensionmanager.h | 2 +- konqueror/konq_factory.cc | 42 +- konqueror/konq_factory.h | 18 +- konqueror/konq_frame.cc | 202 ++-- konqueror/konq_frame.h | 124 +-- konqueror/konq_guiclients.cc | 88 +- konqueror/konq_guiclients.h | 20 +- konqueror/konq_main.cc | 46 +- konqueror/konq_mainwindow.cc | 1104 ++++++++++---------- konqueror/konq_mainwindow.h | 170 +-- konqueror/konq_mainwindow_p.h | 6 +- konqueror/konq_misc.cc | 54 +- konqueror/konq_misc.h | 28 +- konqueror/konq_openurlrequest.h | 16 +- konqueror/konq_profiledlg.cc | 82 +- konqueror/konq_profiledlg.h | 26 +- konqueror/konq_run.cc | 16 +- konqueror/konq_run.h | 10 +- konqueror/konq_tabs.cc | 182 ++-- konqueror/konq_tabs.h | 48 +- konqueror/konq_view.cc | 330 +++--- konqueror/konq_view.h | 98 +- konqueror/konq_viewmgr.cc | 244 ++--- konqueror/konq_viewmgr.h | 64 +- konqueror/kttsplugin/khtmlkttsd.cpp | 44 +- konqueror/kttsplugin/khtmlkttsd.h | 2 +- konqueror/listview/konq_infolistviewitem.cc | 54 +- konqueror/listview/konq_infolistviewitem.h | 12 +- konqueror/listview/konq_infolistviewwidget.cc | 70 +- konqueror/listview/konq_infolistviewwidget.h | 12 +- konqueror/listview/konq_listview.cc | 112 +- konqueror/listview/konq_listview.h | 20 +- konqueror/listview/konq_listviewitems.cc | 74 +- konqueror/listview/konq_listviewitems.h | 18 +- konqueror/listview/konq_listviewwidget.cc | 314 +++--- konqueror/listview/konq_listviewwidget.h | 104 +- konqueror/listview/konq_textviewitem.cc | 28 +- konqueror/listview/konq_textviewitem.h | 12 +- konqueror/listview/konq_textviewwidget.cc | 16 +- konqueror/listview/konq_textviewwidget.h | 12 +- konqueror/listview/konq_treeviewitem.cc | 8 +- konqueror/listview/konq_treeviewitem.h | 6 +- konqueror/listview/konq_treeviewwidget.cc | 40 +- konqueror/listview/konq_treeviewwidget.h | 14 +- konqueror/preloader/preloader.cc | 26 +- konqueror/preloader/preloader.h | 20 +- .../remoteencodingplugin/kremoteencodingplugin.cpp | 48 +- .../remoteencodingplugin/kremoteencodingplugin.h | 8 +- konqueror/shellcmdplugin/kshellcmddialog.cpp | 20 +- konqueror/shellcmdplugin/kshellcmddialog.h | 4 +- konqueror/shellcmdplugin/kshellcmdexecutor.cpp | 24 +- konqueror/shellcmdplugin/kshellcmdexecutor.h | 12 +- konqueror/shellcmdplugin/kshellcmdplugin.cpp | 12 +- konqueror/shellcmdplugin/kshellcmdplugin.h | 2 +- konqueror/sidebar/konqsidebar.cpp | 28 +- konqueror/sidebar/konqsidebar.h | 16 +- konqueror/sidebar/konqsidebarplugin.cpp | 6 +- konqueror/sidebar/konqsidebarplugin.h | 38 +- konqueror/sidebar/sidebar_widget.cpp | 354 +++---- konqueror/sidebar/sidebar_widget.h | 108 +- konqueror/sidebar/test/konqsidebartest.cpp | 2 +- konqueror/sidebar/test/konqsidebartest.h | 14 +- .../trees/bookmark_module/bookmark_item.cpp | 8 +- .../sidebar/trees/bookmark_module/bookmark_item.h | 6 +- .../trees/bookmark_module/bookmark_module.cpp | 134 +-- .../trees/bookmark_module/bookmark_module.h | 30 +- .../sidebar/trees/dirtree_module/dirtree_item.cpp | 38 +- .../sidebar/trees/dirtree_module/dirtree_item.h | 18 +- .../trees/dirtree_module/dirtree_module.cpp | 90 +- .../sidebar/trees/dirtree_module/dirtree_module.h | 12 +- .../sidebar/trees/history_module/history_item.cpp | 42 +- .../sidebar/trees/history_module/history_item.h | 26 +- .../trees/history_module/history_module.cpp | 76 +- .../sidebar/trees/history_module/history_module.h | 32 +- .../trees/history_module/history_settings.cpp | 22 +- .../trees/history_module/history_settings.h | 12 +- .../sidebar/trees/history_module/kcmhistory.cpp | 88 +- .../sidebar/trees/history_module/kcmhistory.h | 8 +- konqueror/sidebar/trees/konq_sidebartree.cpp | 254 ++--- konqueror/sidebar/trees/konq_sidebartree.h | 86 +- konqueror/sidebar/trees/konq_sidebartreeitem.cpp | 4 +- konqueror/sidebar/trees/konq_sidebartreeitem.h | 22 +- konqueror/sidebar/trees/konq_sidebartreemodule.h | 4 +- .../sidebar/trees/konq_sidebartreetoplevelitem.cpp | 30 +- .../sidebar/trees/konq_sidebartreetoplevelitem.h | 20 +- konqueror/sidebar/trees/konqsidebar_tree.cpp | 68 +- konqueror/sidebar/trees/konqsidebar_tree.h | 26 +- konqueror/sidebar/web_module/web_module.cpp | 70 +- konqueror/sidebar/web_module/web_module.h | 70 +- konsole/konsole/TECommon.h | 20 +- konsole/konsole/TEHistory.cpp | 10 +- konsole/konsole/TEHistory.h | 26 +- konsole/konsole/TEPty.cpp | 18 +- konsole/konsole/TEPty.h | 18 +- konsole/konsole/TEScreen.cpp | 30 +- konsole/konsole/TEScreen.h | 14 +- konsole/konsole/TEWidget.cpp | 410 ++++---- konsole/konsole/TEWidget.h | 136 +-- konsole/konsole/TEmuVt102.cpp | 42 +- konsole/konsole/TEmuVt102.h | 4 +- konsole/konsole/TEmulation.cpp | 118 +-- konsole/konsole/TEmulation.h | 32 +- konsole/konsole/fontembedder.cpp | 18 +- konsole/konsole/keytrans.cpp | 74 +- konsole/konsole/keytrans.h | 30 +- konsole/konsole/konsole.cpp | 1010 +++++++++--------- konsole/konsole/konsole.h | 160 +-- konsole/konsole/konsole_part.cpp | 228 ++-- konsole/konsole/konsole_part.h | 44 +- konsole/konsole/konsole_wcwidth.cpp | 2 +- konsole/konsole/konsole_wcwidth.h | 6 +- konsole/konsole/konsolebookmarkhandler.cpp | 26 +- konsole/konsole/konsolebookmarkhandler.h | 16 +- konsole/konsole/konsolebookmarkmenu.cpp | 20 +- konsole/konsole/konsolebookmarkmenu.h | 4 +- konsole/konsole/konsoleiface.h | 10 +- konsole/konsole/kwrited.cpp | 26 +- konsole/konsole/kwrited.h | 10 +- konsole/konsole/main.cpp | 140 +-- konsole/konsole/printsettings.cpp | 18 +- konsole/konsole/printsettings.h | 6 +- konsole/konsole/schema.cpp | 118 +-- konsole/konsole/schema.h | 52 +- konsole/konsole/session.cpp | 240 ++--- konsole/konsole/session.h | 118 +-- konsole/konsole/sessioniface.h | 24 +- konsole/konsole/zmodem_dialog.cpp | 10 +- konsole/konsole/zmodem_dialog.h | 6 +- kpager/config.cpp | 68 +- kpager/config.h | 16 +- kpager/desktop.cpp | 206 ++-- kpager/desktop.h | 50 +- kpager/kpager.cpp | 124 +-- kpager/kpager.h | 28 +- kpager/main.cpp | 4 +- kpager/windowdrag.cpp | 14 +- kpager/windowdrag.h | 8 +- kpersonalizer/kcountrypage.cpp | 84 +- kpersonalizer/kcountrypage.h | 8 +- kpersonalizer/keyecandypage.cpp | 144 +-- kpersonalizer/keyecandypage.h | 68 +- kpersonalizer/kfindlanguage.cpp | 50 +- kpersonalizer/kfindlanguage.h | 20 +- kpersonalizer/kospage.cpp | 28 +- kpersonalizer/kospage.h | 8 +- kpersonalizer/kpersonalizer.cpp | 68 +- kpersonalizer/kpersonalizer.h | 8 +- kpersonalizer/krefinepage.cpp | 8 +- kpersonalizer/krefinepage.h | 2 +- kpersonalizer/kstylepage.cpp | 110 +- kpersonalizer/kstylepage.h | 104 +- kpersonalizer/ksysinfo.cpp | 42 +- kpersonalizer/ksysinfo.h | 16 +- kpersonalizer/stylepreview.ui.h | 32 +- kreadconfig/kreadconfig.cpp | 10 +- kreadconfig/kwriteconfig.cpp | 16 +- kscreensaver/blankscrn.cpp | 24 +- kscreensaver/blankscrn.h | 14 +- kscreensaver/random.cpp | 40 +- kscreensaver/random.h | 8 +- ksmserver/KSMServerInterface.h | 12 +- ksmserver/client.cpp | 34 +- ksmserver/client.h | 32 +- ksmserver/legacy.cpp | 64 +- ksmserver/main.cpp | 32 +- ksmserver/server.cpp | 120 +-- ksmserver/server.h | 100 +- ksmserver/shutdown.cpp | 40 +- ksmserver/shutdowndlg.cpp | 230 ++-- ksmserver/shutdowndlg.h | 56 +- ksmserver/startup.cpp | 62 +- ksmserver/test.cpp | 2 +- ksplashml/kcmksplash/installer.cpp | 130 +-- ksplashml/kcmksplash/installer.h | 32 +- ksplashml/kcmksplash/main.cpp | 22 +- ksplashml/ksplashiface.h | 6 +- ksplashml/themeengine/default/themelegacy.cpp | 112 +- ksplashml/themeengine/default/themelegacy.h | 32 +- ksplashml/themeengine/objkstheme.cpp | 54 +- ksplashml/themeengine/objkstheme.h | 32 +- ksplashml/themeengine/redmond/main.cpp | 12 +- ksplashml/themeengine/redmond/previewredmond.cpp | 34 +- ksplashml/themeengine/redmond/previewredmond.h | 42 +- ksplashml/themeengine/redmond/themeredmond.cpp | 164 +-- ksplashml/themeengine/redmond/themeredmond.h | 56 +- ksplashml/themeengine/standard/themestandard.cpp | 44 +- ksplashml/themeengine/standard/themestandard.h | 22 +- ksplashml/themeengine/standard/wndicon.cpp | 38 +- ksplashml/themeengine/standard/wndicon.h | 10 +- ksplashml/themeengine/standard/wndstatus.cpp | 38 +- ksplashml/themeengine/standard/wndstatus.h | 14 +- ksplashml/themeengine/themeengine.cpp | 30 +- ksplashml/themeengine/themeengine.h | 24 +- ksplashml/wndmain.cpp | 88 +- ksplashml/wndmain.h | 38 +- kstart/kstart.cpp | 46 +- kstart/kstart.h | 4 +- ksysguard/gui/KSGAppletSettings.cc | 28 +- ksysguard/gui/KSGAppletSettings.h | 8 +- ksysguard/gui/KSysGuardApplet.cc | 122 +-- ksysguard/gui/KSysGuardApplet.h | 18 +- ksysguard/gui/SensorBrowser.cc | 126 +-- ksysguard/gui/SensorBrowser.h | 70 +- ksysguard/gui/SensorDisplayLib/BarGraph.cc | 28 +- ksysguard/gui/SensorDisplayLib/BarGraph.h | 24 +- ksysguard/gui/SensorDisplayLib/DancingBars.cc | 68 +- ksysguard/gui/SensorDisplayLib/DancingBars.h | 26 +- .../gui/SensorDisplayLib/DancingBarsSettings.cc | 138 +-- .../gui/SensorDisplayLib/DancingBarsSettings.h | 32 +- ksysguard/gui/SensorDisplayLib/DummyDisplay.cc | 18 +- ksysguard/gui/SensorDisplayLib/DummyDisplay.h | 8 +- ksysguard/gui/SensorDisplayLib/FancyPlotter.cc | 98 +- ksysguard/gui/SensorDisplayLib/FancyPlotter.h | 38 +- .../gui/SensorDisplayLib/FancyPlotterSettings.cc | 252 ++--- .../gui/SensorDisplayLib/FancyPlotterSettings.h | 54 +- ksysguard/gui/SensorDisplayLib/ListView.cc | 96 +- ksysguard/gui/SensorDisplayLib/ListView.h | 42 +- ksysguard/gui/SensorDisplayLib/ListViewSettings.cc | 18 +- ksysguard/gui/SensorDisplayLib/ListViewSettings.h | 22 +- .../SensorDisplayLib/ListViewSettingsWidget.ui.h | 16 +- ksysguard/gui/SensorDisplayLib/LogFile.cc | 92 +- ksysguard/gui/SensorDisplayLib/LogFile.h | 28 +- ksysguard/gui/SensorDisplayLib/MultiMeter.cc | 52 +- ksysguard/gui/SensorDisplayLib/MultiMeter.h | 26 +- .../gui/SensorDisplayLib/MultiMeterSettings.cc | 18 +- .../gui/SensorDisplayLib/MultiMeterSettings.h | 22 +- .../SensorDisplayLib/MultiMeterSettingsWidget.ui.h | 20 +- .../gui/SensorDisplayLib/ProcessController.cc | 122 +-- ksysguard/gui/SensorDisplayLib/ProcessController.h | 32 +- ksysguard/gui/SensorDisplayLib/ProcessList.cc | 298 +++--- ksysguard/gui/SensorDisplayLib/ProcessList.h | 66 +- ksysguard/gui/SensorDisplayLib/ReniceDlg.cc | 10 +- ksysguard/gui/SensorDisplayLib/ReniceDlg.h | 20 +- ksysguard/gui/SensorDisplayLib/SensorDisplay.cc | 132 +-- ksysguard/gui/SensorDisplayLib/SensorDisplay.h | 106 +- ksysguard/gui/SensorDisplayLib/SensorLogger.cc | 110 +- ksysguard/gui/SensorDisplayLib/SensorLogger.h | 88 +- ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc | 12 +- ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h | 10 +- .../SensorDisplayLib/SensorLoggerDlgWidget.ui.h | 8 +- .../gui/SensorDisplayLib/SensorLoggerSettings.cc | 18 +- .../gui/SensorDisplayLib/SensorLoggerSettings.h | 22 +- .../SensorLoggerSettingsWidget.ui.h | 16 +- ksysguard/gui/SensorDisplayLib/SignalPlotter.cc | 72 +- ksysguard/gui/SensorDisplayLib/SignalPlotter.h | 50 +- ksysguard/gui/WorkSheet.cc | 138 +-- ksysguard/gui/WorkSheet.h | 52 +- ksysguard/gui/WorkSheetSettings.cc | 48 +- ksysguard/gui/WorkSheetSettings.h | 6 +- ksysguard/gui/Workspace.cc | 90 +- ksysguard/gui/Workspace.h | 22 +- ksysguard/gui/ksgrd/HostConnector.cc | 96 +- ksysguard/gui/ksgrd/HostConnector.h | 30 +- ksysguard/gui/ksgrd/SensorAgent.cc | 22 +- ksysguard/gui/ksgrd/SensorAgent.h | 36 +- ksysguard/gui/ksgrd/SensorClient.h | 30 +- ksysguard/gui/ksgrd/SensorManager.cc | 238 ++--- ksysguard/gui/ksgrd/SensorManager.h | 54 +- ksysguard/gui/ksgrd/SensorShellAgent.cc | 28 +- ksysguard/gui/ksgrd/SensorShellAgent.h | 18 +- ksysguard/gui/ksgrd/SensorSocketAgent.cc | 22 +- ksysguard/gui/ksgrd/SensorSocketAgent.h | 8 +- ksysguard/gui/ksgrd/StyleEngine.cc | 48 +- ksysguard/gui/ksgrd/StyleEngine.h | 26 +- ksysguard/gui/ksgrd/StyleSettings.cc | 84 +- ksysguard/gui/ksgrd/StyleSettings.h | 32 +- ksysguard/gui/ksgrd/TimerSettings.cc | 28 +- ksysguard/gui/ksgrd/TimerSettings.h | 8 +- ksysguard/gui/ksysguard.cc | 124 +-- ksysguard/gui/ksysguard.h | 28 +- ksystraycmd/ksystraycmd.cpp | 38 +- ksystraycmd/ksystraycmd.h | 22 +- ksystraycmd/main.cpp | 10 +- ktip/ktipwindow.cpp | 6 +- kwin/KWinInterface.h | 2 +- kwin/activation.cpp | 10 +- kwin/atoms.cpp | 2 +- kwin/bridge.cpp | 32 +- kwin/bridge.h | 22 +- kwin/client.cpp | 154 +-- kwin/client.h | 188 ++-- kwin/clients/b2/b2client.cpp | 334 +++--- kwin/clients/b2/b2client.h | 90 +- kwin/clients/b2/config/config.cpp | 46 +- kwin/clients/b2/config/config.h | 22 +- kwin/clients/default/config/config.cpp | 42 +- kwin/clients/default/config/config.h | 20 +- kwin/clients/default/kdedefault.cpp | 134 +-- kwin/clients/default/kdedefault.h | 32 +- kwin/clients/keramik/config/config.cpp | 18 +- kwin/clients/keramik/config/config.h | 2 +- kwin/clients/keramik/embedtool.cpp | 56 +- kwin/clients/keramik/keramik.cpp | 376 +++---- kwin/clients/keramik/keramik.h | 72 +- kwin/clients/kwmtheme/cli_installer/main.cpp | 26 +- kwin/clients/kwmtheme/kwmthemeclient.cpp | 182 ++-- kwin/clients/kwmtheme/kwmthemeclient.h | 34 +- kwin/clients/laptop/laptopclient.cpp | 100 +- kwin/clients/laptop/laptopclient.h | 20 +- kwin/clients/modernsystem/config/config.cpp | 44 +- kwin/clients/modernsystem/config/config.h | 18 +- kwin/clients/modernsystem/modernsys.cpp | 142 +-- kwin/clients/modernsystem/modernsys.h | 26 +- kwin/clients/plastik/config/config.cpp | 50 +- kwin/clients/plastik/config/config.h | 4 +- kwin/clients/plastik/misc.cpp | 18 +- kwin/clients/plastik/misc.h | 6 +- kwin/clients/plastik/plastik.cpp | 90 +- kwin/clients/plastik/plastik.h | 26 +- kwin/clients/plastik/plastikbutton.cpp | 60 +- kwin/clients/plastik/plastikbutton.h | 18 +- kwin/clients/plastik/plastikclient.cpp | 98 +- kwin/clients/plastik/plastikclient.h | 24 +- kwin/clients/quartz/config/config.cpp | 24 +- kwin/clients/quartz/config/config.h | 12 +- kwin/clients/quartz/quartz.cpp | 76 +- kwin/clients/quartz/quartz.h | 20 +- kwin/clients/redmond/redmond.cpp | 84 +- kwin/clients/redmond/redmond.h | 24 +- kwin/clients/test/test.cpp | 54 +- kwin/clients/test/test.h | 12 +- kwin/clients/web/Web.cpp | 56 +- kwin/clients/web/Web.h | 14 +- kwin/clients/web/WebButton.cpp | 30 +- kwin/clients/web/WebButton.h | 12 +- kwin/data/update_default_rules.cpp | 10 +- kwin/data/update_window_settings.cpp | 62 +- kwin/events.cpp | 90 +- kwin/geometry.cpp | 354 +++---- kwin/geometrytip.cpp | 8 +- kwin/geometrytip.h | 4 +- kwin/group.cpp | 18 +- kwin/group.h | 4 +- kwin/kcmkwin/kwindecoration/buttons.cpp | 208 ++-- kwin/kcmkwin/kwindecoration/buttons.h | 90 +- kwin/kcmkwin/kwindecoration/kwindecoration.cpp | 174 +-- kwin/kcmkwin/kwindecoration/kwindecoration.h | 48 +- kwin/kcmkwin/kwindecoration/preview.cpp | 84 +- kwin/kcmkwin/kwindecoration/preview.h | 46 +- kwin/kcmkwin/kwinoptions/main.cpp | 44 +- kwin/kcmkwin/kwinoptions/main.h | 12 +- kwin/kcmkwin/kwinoptions/mouse.cpp | 278 ++--- kwin/kcmkwin/kwinoptions/mouse.h | 52 +- kwin/kcmkwin/kwinoptions/windows.cpp | 474 ++++----- kwin/kcmkwin/kwinoptions/windows.h | 104 +- kwin/kcmkwin/kwinrules/detectwidget.cpp | 28 +- kwin/kcmkwin/kwinrules/detectwidget.h | 28 +- kwin/kcmkwin/kwinrules/kcm.cpp | 12 +- kwin/kcmkwin/kwinrules/kcm.h | 4 +- kwin/kcmkwin/kwinrules/main.cpp | 34 +- kwin/kcmkwin/kwinrules/ruleslist.cpp | 56 +- kwin/kcmkwin/kwinrules/ruleslist.h | 8 +- kwin/kcmkwin/kwinrules/ruleswidget.cpp | 90 +- kwin/kcmkwin/kwinrules/ruleswidget.h | 14 +- kwin/killer/killer.cpp | 10 +- kwin/killwindow.cpp | 4 +- kwin/kwinbindings.cpp | 8 +- kwin/layers.cpp | 2 +- kwin/lib/kcommondecoration.cpp | 148 +-- kwin/lib/kcommondecoration.h | 52 +- kwin/lib/kdecoration.cpp | 48 +- kwin/lib/kdecoration.h | 62 +- kwin/lib/kdecoration_p.cpp | 36 +- kwin/lib/kdecoration_p.h | 38 +- kwin/lib/kdecoration_plugins_p.cpp | 22 +- kwin/lib/kdecoration_plugins_p.h | 16 +- kwin/lib/kdecorationfactory.cpp | 6 +- kwin/lib/kdecorationfactory.h | 4 +- kwin/main.cpp | 20 +- kwin/manage.cpp | 26 +- kwin/notifications.cpp | 14 +- kwin/notifications.h | 14 +- kwin/options.cpp | 28 +- kwin/options.h | 20 +- kwin/placement.cpp | 90 +- kwin/placement.h | 36 +- kwin/plugins.cpp | 6 +- kwin/plugins.h | 2 +- kwin/popupinfo.cpp | 40 +- kwin/popupinfo.h | 14 +- kwin/rules.cpp | 118 +-- kwin/rules.h | 80 +- kwin/sm.cpp | 120 +-- kwin/sm.h | 22 +- kwin/tabbox.cpp | 86 +- kwin/tabbox.h | 16 +- kwin/tools/decobenchmark/main.cpp | 14 +- kwin/tools/decobenchmark/main.h | 2 +- kwin/tools/decobenchmark/preview.cpp | 54 +- kwin/tools/decobenchmark/preview.h | 38 +- kwin/useractions.cpp | 132 +-- kwin/utils.cpp | 8 +- kwin/utils.h | 18 +- kwin/workspace.cpp | 238 ++--- kwin/workspace.h | 112 +- kxkb/extension.cpp | 68 +- kxkb/extension.h | 24 +- kxkb/kcmlayout.cpp | 290 ++--- kxkb/kcmlayout.h | 20 +- kxkb/kcmmisc.cpp | 46 +- kxkb/kcmmisc.h | 4 +- kxkb/kxkb.cpp | 36 +- kxkb/kxkb.h | 14 +- kxkb/kxkbbindings.cpp | 4 +- kxkb/kxkbconfig.cpp | 80 +- kxkb/kxkbconfig.h | 46 +- kxkb/kxkbtraywindow.cpp | 38 +- kxkb/kxkbtraywindow.h | 28 +- kxkb/layoutmap.cpp | 8 +- kxkb/layoutmap.h | 12 +- kxkb/pixmap.cpp | 70 +- kxkb/pixmap.h | 22 +- kxkb/rules.cpp | 40 +- kxkb/rules.h | 40 +- kxkb/x11helper.cpp | 86 +- kxkb/x11helper.h | 30 +- libkonq/favicons/favicons.cpp | 90 +- libkonq/favicons/favicons.h | 26 +- libkonq/kfileivi.cc | 136 +-- libkonq/kfileivi.h | 36 +- libkonq/kivdirectoryoverlay.cc | 22 +- libkonq/kivdirectoryoverlay.h | 8 +- libkonq/knewmenu.cc | 166 +-- libkonq/knewmenu.h | 34 +- libkonq/konq_bgnddlg.cc | 86 +- libkonq/konq_bgnddlg.h | 28 +- libkonq/konq_dirpart.cc | 134 +-- libkonq/konq_dirpart.h | 32 +- libkonq/konq_drag.cc | 102 +- libkonq/konq_drag.h | 42 +- libkonq/konq_events.h | 16 +- libkonq/konq_faviconmgr.cc | 18 +- libkonq/konq_faviconmgr.h | 10 +- libkonq/konq_filetip.cc | 96 +- libkonq/konq_filetip.h | 30 +- libkonq/konq_historycomm.cc | 10 +- libkonq/konq_historycomm.h | 34 +- libkonq/konq_historymgr.cc | 138 +-- libkonq/konq_historymgr.h | 68 +- libkonq/konq_iconviewwidget.cc | 342 +++--- libkonq/konq_iconviewwidget.h | 110 +- libkonq/konq_operations.cc | 152 +-- libkonq/konq_operations.h | 56 +- libkonq/konq_pixmapprovider.cc | 48 +- libkonq/konq_pixmapprovider.h | 18 +- libkonq/konq_popupmenu.cc | 208 ++-- libkonq/konq_popupmenu.h | 38 +- libkonq/konq_propsview.cc | 60 +- libkonq/konq_propsview.h | 46 +- libkonq/konq_settings.cc | 22 +- libkonq/konq_settings.h | 34 +- libkonq/konq_sound.cc | 20 +- libkonq/konq_sound.h | 4 +- libkonq/konq_undo.cc | 52 +- libkonq/konq_undo.h | 28 +- libkonq/konq_xmlguiclient.cc | 36 +- libkonq/konq_xmlguiclient.h | 20 +- libkonq/konqbookmarkmanager.h | 2 +- libkonq/libkonq_export.h | 2 +- libkonq/tests/konqdragtest.cpp | 6 +- nsplugins/NSPluginCallbackIface.h | 10 +- nsplugins/kcm_nsplugins.cpp | 36 +- nsplugins/nspluginloader.cpp | 102 +- nsplugins/nspluginloader.h | 50 +- nsplugins/plugin_part.cpp | 78 +- nsplugins/plugin_part.h | 54 +- nsplugins/plugin_paths.cpp | 10 +- nsplugins/plugin_paths.h | 4 +- nsplugins/pluginscan.cpp | 152 +-- nsplugins/sdk/npruntime.h | 2 +- nsplugins/test/testnsplugin.cpp | 38 +- nsplugins/test/testnsplugin.h | 14 +- nsplugins/viewer/NSPluginClassIface.h | 18 +- nsplugins/viewer/glibevents.cpp | 4 +- nsplugins/viewer/glibevents.h | 6 +- nsplugins/viewer/kxt.cpp | 72 +- nsplugins/viewer/kxt.h | 18 +- nsplugins/viewer/nsplugin.cpp | 242 ++--- nsplugins/viewer/nsplugin.h | 136 +-- nsplugins/viewer/qxteventloop.cpp | 74 +- nsplugins/viewer/qxteventloop.h | 14 +- nsplugins/viewer/viewer.cpp | 28 +- 1872 files changed, 46257 insertions(+), 46257 deletions(-) diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index 1bf48a4c1..8607c5b75 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -25,8 +25,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************/ -#include -#include +#include +#include #include #include @@ -39,9 +39,9 @@ #include "backtrace.h" #include "backtrace.moc" -BackTrace::BackTrace(const KrashConfig *krashconf, QObject *parent, +BackTrace::BackTrace(const KrashConfig *krashconf, TQObject *parent, const char *name) - : QObject(parent, name), + : TQObject(parent, name), m_krashconf(krashconf), m_temp(0) { m_proc = new KProcess; @@ -68,25 +68,25 @@ BackTrace::~BackTrace() void BackTrace::start() { - QString exec = m_krashconf->tryExec(); + TQString exec = m_krashconf->tryExec(); if ( !exec.isEmpty() && KStandardDirs::findExe(exec).isEmpty() ) { - QObject * o = parent(); + TQObject * o = parent(); - if (o && !o->inherits("QWidget")) + if (o && !o->inherits("TQWidget")) { o = NULL; } KMessageBox::error( - (QWidget *)o, + (TQWidget *)o, i18n("Could not generate a backtrace as the debugger '%1' was not found.").arg(exec)); return; } m_temp = new KTempFile; m_temp->setAutoDelete(TRUE); int handle = m_temp->handle(); - QString backtraceCommand = m_krashconf->backtraceCommand(); + TQString backtraceCommand = m_krashconf->backtraceCommand(); const char* bt = backtraceCommand.latin1(); ::write(handle, bt, strlen(bt)); // the command for a backtrace ::write(handle, "\n", 1); @@ -96,22 +96,22 @@ void BackTrace::start() m_proc = new KProcess; m_proc->setUseShell(true); - QString str = m_krashconf->debuggerBatch(); + TQString str = m_krashconf->debuggerBatch(); m_krashconf->expandString(str, true, m_temp->name()); *m_proc << str; - connect(m_proc, SIGNAL(receivedStdout(KProcess*, char*, int)), - SLOT(slotReadInput(KProcess*, char*, int))); - connect(m_proc, SIGNAL(processExited(KProcess*)), - SLOT(slotProcessExited(KProcess*))); + connect(m_proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), + TQT_SLOT(slotReadInput(KProcess*, char*, int))); + connect(m_proc, TQT_SIGNAL(processExited(KProcess*)), + TQT_SLOT(slotProcessExited(KProcess*))); m_proc->start ( KProcess::NotifyOnExit, KProcess::All ); } void BackTrace::slotReadInput(KProcess *, char* buf, int buflen) { - QString newstr = QString::fromLocal8Bit(buf, buflen); + TQString newstr = TQString::fromLocal8Bit(buf, buflen); m_strBt.append(newstr); emit append(newstr); @@ -137,25 +137,25 @@ bool BackTrace::usefulBacktrace() { // remove crap if( !m_krashconf->removeFromBacktraceRegExp().isEmpty()) - m_strBt.replace(QRegExp( m_krashconf->removeFromBacktraceRegExp()), QString::null); + m_strBt.replace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null); if( m_krashconf->disableChecks()) return true; // prepend and append newline, so that regexps like '\nwhatever\n' work on all lines - QString strBt = '\n' + m_strBt + '\n'; + TQString strBt = '\n' + m_strBt + '\n'; // how many " ?? " in the bt ? int unknown = 0; if( !m_krashconf->invalidStackFrameRegExp().isEmpty()) - unknown = strBt.contains( QRegExp( m_krashconf->invalidStackFrameRegExp())); + unknown = strBt.contains( TQRegExp( m_krashconf->invalidStackFrameRegExp())); // how many stack frames in the bt ? int frames = 0; if( !m_krashconf->frameRegExp().isEmpty()) - frames = strBt.contains( QRegExp( m_krashconf->frameRegExp())); + frames = strBt.contains( TQRegExp( m_krashconf->frameRegExp())); else frames = strBt.contains('\n'); bool tooShort = false; if( !m_krashconf->neededInValidBacktraceRegExp().isEmpty()) - tooShort = ( strBt.find( QRegExp( m_krashconf->neededInValidBacktraceRegExp())) == -1 ); + tooShort = ( strBt.find( TQRegExp( m_krashconf->neededInValidBacktraceRegExp())) == -1 ); return !m_strBt.isNull() && !tooShort && (unknown < frames); } @@ -164,7 +164,7 @@ void BackTrace::processBacktrace() { if( !m_krashconf->kcrashRegExp().isEmpty()) { - QRegExp kcrashregexp( m_krashconf->kcrashRegExp()); + TQRegExp kcrashregexp( m_krashconf->kcrashRegExp()); int pos = kcrashregexp.search( m_strBt ); if( pos >= 0 ) { @@ -175,7 +175,7 @@ void BackTrace::processBacktrace() --len; } m_strBt.remove( pos, len ); - m_strBt.insert( pos, QString::fromLatin1( "[KCrash handler]\n" )); + m_strBt.insert( pos, TQString::fromLatin1( "[KCrash handler]\n" )); } } } diff --git a/drkonqi/backtrace.h b/drkonqi/backtrace.h index 861548f69..b6779f3eb 100644 --- a/drkonqi/backtrace.h +++ b/drkonqi/backtrace.h @@ -32,24 +32,24 @@ class KProcess; class KrashConfig; class KTempFile; -#include +#include class BackTrace : public QObject { Q_OBJECT public: - BackTrace(const KrashConfig *krashconf, QObject *parent, + BackTrace(const KrashConfig *krashconf, TQObject *parent, const char *name = 0); ~BackTrace(); void start(); signals: - void append(const QString &str); // Just the new text + void append(const TQString &str); // Just the new text void someError(); - void done(const QString &); // replaces whole text + void done(const TQString &); // replaces whole text protected slots: void slotProcessExited(KProcess * proc); @@ -61,6 +61,6 @@ private: KProcess *m_proc; const KrashConfig *m_krashconf; KTempFile *m_temp; - QString m_strBt; + TQString m_strBt; }; #endif diff --git a/drkonqi/crashtest.cpp b/drkonqi/crashtest.cpp index 8d41e6325..a00fae6b0 100644 --- a/drkonqi/crashtest.cpp +++ b/drkonqi/crashtest.cpp @@ -17,7 +17,7 @@ enum CrashType { Crash, Malloc, Div0, Assert }; void do_crash() { KCmdLineArgs *args = 0; - QCString type = args->arg(0); + TQCString type = args->arg(0); printf("result = %s\n", type.data()); } @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) KApplication app(false, false); KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - QCString type = args->count() ? args->arg(0) : ""; + TQCString type = args->count() ? args->arg(0) : ""; int crashtype = Crash; if (type == "malloc") crashtype = Malloc; diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp index 95ec6c9ba..c6b073e4f 100644 --- a/drkonqi/debugger.cpp +++ b/drkonqi/debugger.cpp @@ -25,9 +25,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************/ -#include -#include -#include +#include +#include +#include #include #include @@ -45,29 +45,29 @@ #include "debugger.h" #include "debugger.moc" -KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, QWidget *parent, const char *name) - : QWidget( parent, name ), +KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent, const char *name) + : TQWidget( parent, name ), m_krashconf(krashconf), m_proctrace(0) { - QVBoxLayout *vbox = new QVBoxLayout( this, 0, KDialog::marginHint() ); + TQVBoxLayout *vbox = new TQVBoxLayout( this, 0, KDialog::marginHint() ); vbox->setAutoAdd(TRUE); m_backtrace = new KTextBrowser(this); m_backtrace->setTextFormat(Qt::PlainText); m_backtrace->setFont(KGlobalSettings::fixedFont()); - QWidget *w = new QWidget( this ); - ( new QHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true ); - m_status = new QLabel( w ); - m_status->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) ); + 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_copyButton = new KPushButton( KStdGuiItem::copy(), w ); - KGuiItem item( i18n( "C&opy" ), QString::fromLatin1( "editcopy" ) ); + KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "editcopy" ) ); m_copyButton = new KPushButton( item, w ); - connect( m_copyButton, SIGNAL( clicked() ), this, SLOT( slotCopy() ) ); + connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) ); m_copyButton->setEnabled( false ); m_saveButton = new KPushButton( m_krashconf->safeMode() ? KStdGuiItem::save() : KStdGuiItem::saveAs(), w ); - connect( m_saveButton, SIGNAL( clicked() ), this, SLOT( slotSave() ) ); + connect( m_saveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSave() ) ); m_saveButton->setEnabled( false ); } @@ -77,7 +77,7 @@ KrashDebugger :: ~KrashDebugger() // delete m_proctrace; } -void KrashDebugger :: slotDone(const QString& str) +void KrashDebugger :: slotDone(const TQString& str) { m_status->setText(i18n("Done.")); m_copyButton->setEnabled( true ); @@ -95,7 +95,7 @@ void KrashDebugger :: slotSave() { if (m_krashconf->safeMode()) { - KTempFile tf(QString::fromAscii("/tmp/"), QString::fromAscii(".kcrash"), 0600); + KTempFile tf(TQString::fromAscii("/tmp/"), TQString::fromAscii(".kcrash"), 0600); if (!tf.status()) { *tf.textStream() << m_backtrace->text(); @@ -109,13 +109,13 @@ void KrashDebugger :: slotSave() } else { - QString defname = m_krashconf->execName() + QString::fromLatin1( ".kcrash" ); + TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" ); if( defname.contains( '/' )) defname = defname.mid( defname.findRev( '/' ) + 1 ); - QString filename = KFileDialog::getSaveFileName(defname, QString::null, this, i18n("Select Filename")); + TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename")); if (!filename.isEmpty()) { - QFile f(filename); + TQFile f(filename); if (f.exists()) { if (KMessageBox::Cancel == @@ -129,7 +129,7 @@ void KrashDebugger :: slotSave() if (f.open(IO_WriteOnly)) { - QTextStream ts(&f); + TQTextStream ts(&f); ts << m_backtrace->text(); f.close(); } @@ -151,7 +151,7 @@ void KrashDebugger :: slotSomeError() + m_backtrace->text()); } -void KrashDebugger :: slotAppend(const QString &str) +void KrashDebugger :: slotAppend(const TQString &str) { m_status->setText(i18n("Loading backtrace...")); @@ -159,9 +159,9 @@ void KrashDebugger :: slotAppend(const QString &str) m_backtrace->setText(m_backtrace->text() + str); } -void KrashDebugger :: showEvent(QShowEvent *e) +void KrashDebugger :: showEvent(TQShowEvent *e) { - QWidget::showEvent(e); + TQWidget::showEvent(e); startDebugger(); } @@ -171,7 +171,7 @@ void KrashDebugger :: startDebugger() if (m_proctrace || !m_backtrace->text().isEmpty()) return; - QString msg; + TQString msg; bool checks = performChecks( &msg ); if( !checks && !m_krashconf->disableChecks()) { @@ -195,20 +195,20 @@ void KrashDebugger :: startDebugger() m_proctrace = new BackTrace(m_krashconf, this); - connect(m_proctrace, SIGNAL(append(const QString &)), - SLOT(slotAppend(const QString &))); - connect(m_proctrace, SIGNAL(done(const QString&)), SLOT(slotDone(const QString&))); - connect(m_proctrace, SIGNAL(someError()), SLOT(slotSomeError())); + connect(m_proctrace, TQT_SIGNAL(append(const TQString &)), + TQT_SLOT(slotAppend(const TQString &))); + connect(m_proctrace, TQT_SIGNAL(done(const TQString&)), TQT_SLOT(slotDone(const TQString&))); + connect(m_proctrace, TQT_SIGNAL(someError()), TQT_SLOT(slotSomeError())); m_proctrace->start(); } // this function check for "dangerous" settings, returns false // and message in case some of them are activated -bool KrashDebugger::performChecks( QString* msg ) +bool KrashDebugger::performChecks( TQString* msg ) { bool ret = true; - KConfig kdedcfg( QString::fromLatin1( "kdedrc" ), true ); + KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true ); kdedcfg.setGroup( "General" ); if( kdedcfg.readBoolEntry( "DelayedCheck", false )) { diff --git a/drkonqi/debugger.h b/drkonqi/debugger.h index ba1d87385..88f309284 100644 --- a/drkonqi/debugger.h +++ b/drkonqi/debugger.h @@ -34,26 +34,26 @@ class KrashConfig; class KTextBrowser; class BackTrace; -#include +#include class KrashDebugger : public QWidget { Q_OBJECT public: - KrashDebugger(const KrashConfig *krashconf, QWidget *parent = 0, const char *name = 0); + KrashDebugger(const KrashConfig *krashconf, TQWidget *parent = 0, const char *name = 0); ~KrashDebugger(); public slots: - void slotAppend(const QString &); - void slotDone(const QString&); + void slotAppend(const TQString &); + void slotDone(const TQString&); void slotSomeError(); protected: void startDebugger(); - bool performChecks( QString* msg ); + bool performChecks( TQString* msg ); - virtual void showEvent(QShowEvent *e); + virtual void showEvent(TQShowEvent *e); protected slots: void slotCopy(); @@ -62,11 +62,11 @@ protected slots: private: const KrashConfig *m_krashconf; BackTrace *m_proctrace; - QLabel *m_status; + TQLabel *m_status; KTextBrowser *m_backtrace; - QPushButton * m_copyButton; - QPushButton * m_saveButton; - QString m_prependText; + TQPushButton * m_copyButton; + TQPushButton * m_saveButton; + TQString m_prependText; }; #endif diff --git a/drkonqi/drbugreport.cpp b/drkonqi/drbugreport.cpp index 48ef71a3f..3ec731b01 100644 --- a/drkonqi/drbugreport.cpp +++ b/drkonqi/drbugreport.cpp @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************/ -#include +#include #include #include @@ -34,13 +34,13 @@ #include "drbugreport.moc" #include "drbugreport.h" -DrKBugReport::DrKBugReport(QWidget *parent, bool modal, +DrKBugReport::DrKBugReport(TQWidget *parent, bool modal, const KAboutData *aboutData) : KBugReport(parent, modal, aboutData) { } -void DrKBugReport::setText(const QString &str) +void DrKBugReport::setText(const TQString &str) { m_lineedit->setText(str); m_startstring = str.simplifyWhiteSpace(); @@ -51,7 +51,7 @@ void DrKBugReport::slotOk() if (!m_startstring.isEmpty() && m_lineedit->text().simplifyWhiteSpace() == m_startstring) { - QString msg = i18n("You have to edit the description " + TQString msg = i18n("You have to edit the description " "before the report can be sent."); KMessageBox::error(this, msg); return; diff --git a/drkonqi/drbugreport.h b/drkonqi/drbugreport.h index f2209ec23..d1e98e028 100644 --- a/drkonqi/drbugreport.h +++ b/drkonqi/drbugreport.h @@ -40,14 +40,14 @@ public: /** * Constructor. */ - DrKBugReport(QWidget *parent = 0, bool modal = true, + DrKBugReport(TQWidget *parent = 0, bool modal = true, const KAboutData *aboutData = 0); public: /** * Allows the debugger to set the default text in the editor. */ - void setText(const QString &str); + void setText(const TQString &str); protected slots: /** @@ -56,7 +56,7 @@ protected slots: virtual void slotOk( void ); private: - QString m_startstring; + TQString m_startstring; }; #endif diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index 62c5b2215..4faccc956 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -48,7 +48,7 @@ KrashConfig :: ~KrashConfig() delete m_aboutData; } -ASYNC KrashConfig :: registerDebuggingApplication(const QString& launchName) +ASYNC KrashConfig :: registerDebuggingApplication(const TQString& launchName) { emit newDebuggingApplication( launchName ); } @@ -69,7 +69,7 @@ void KrashConfig :: readConfig() if ( !args->getOption( "apppath" ).isEmpty() ) m_execname.prepend( args->getOption( "apppath" ) + '/' ); - QCString programname = args->getOption("programname"); + TQCString programname = args->getOption("programname"); if (programname.isEmpty()) programname.setStr(I18N_NOOP("unknown")); // leak some memory... Well. It's only done once anyway :-) @@ -80,7 +80,7 @@ void KrashConfig :: readConfig() 0, 0, 0, 0, 0, args->getOption("bugaddress")); - QCString startup_id( args->getOption( "startupid" )); + TQCString startup_id( args->getOption( "startupid" )); if (!startup_id.isEmpty()) { // stop startup notification KStartupInfoId id; @@ -92,13 +92,13 @@ void KrashConfig :: readConfig() config->setGroup("drkonqi"); // maybe we should check if it's relative? - QString configname = config->readEntry("ConfigName", - QString::fromLatin1("enduser")); + TQString configname = config->readEntry("ConfigName", + TQString::fromLatin1("enduser")); - QString debuggername = config->readEntry("Debugger", - QString::fromLatin1("gdb")); + TQString debuggername = config->readEntry("Debugger", + TQString::fromLatin1("gdb")); - KConfig debuggers(QString::fromLatin1("debuggers/%1rc").arg(debuggername), + KConfig debuggers(TQString::fromLatin1("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(QString::fromLatin1("presets/%1rc").arg(configname), + KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname), true, false, "appdata"); preset.setGroup("ErrorDescription"); @@ -135,10 +135,10 @@ void KrashConfig :: readConfig() bool b = preset.readBoolEntry("SignalDetails", true); - QString str = QString::number(m_signalnum); + TQString str = TQString::number(m_signalnum); // use group unknown if signal not found if (!preset.hasGroup(str)) - str = QString::fromLatin1("unknown"); + str = TQString::fromLatin1("unknown"); preset.setGroup(str); m_signalName = preset.readEntry("Name"); if (b) @@ -146,16 +146,16 @@ void KrashConfig :: readConfig() } // replace some of the strings -void KrashConfig :: expandString(QString &str, bool shell, const QString &tempFile) const +void KrashConfig :: expandString(TQString &str, bool shell, const TQString &tempFile) const { - QMap map; - map[QString::fromLatin1("appname")] = QString::fromLatin1(appName()); - map[QString::fromLatin1("execname")] = startedByKdeinit() ? QString::fromLatin1("kdeinit") : m_execname; - map[QString::fromLatin1("signum")] = QString::number(signalNumber()); - map[QString::fromLatin1("signame")] = signalName(); - map[QString::fromLatin1("progname")] = programName(); - map[QString::fromLatin1("pid")] = QString::number(pid()); - map[QString::fromLatin1("tempfile")] = tempFile; + 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; if (shell) str = KMacroExpander::expandMacrosShellQuote( str, map ); else diff --git a/drkonqi/krashconf.h b/drkonqi/krashconf.h index 5349b7165..236083f76 100644 --- a/drkonqi/krashconf.h +++ b/drkonqi/krashconf.h @@ -29,12 +29,12 @@ #define KRASHCONF_H #include -#include -#include +#include +#include #include "krashdcopinterface.h" -class KrashConfig : public QObject, public KrashDCOPInterface +class KrashConfig : public TQObject, public KrashDCOPInterface { Q_OBJECT @@ -43,42 +43,42 @@ public: virtual ~KrashConfig(); k_dcop: - virtual QString programName() const { return m_aboutData->programName(); }; - virtual QCString appName() const { return m_aboutData->appName(); }; + virtual TQString programName() const { return m_aboutData->programName(); }; + virtual TQCString appName() const { return m_aboutData->appName(); }; virtual int signalNumber() const { return m_signalnum; }; virtual int pid() const { return m_pid; }; virtual bool startedByKdeinit() const { return m_startedByKdeinit; }; virtual bool safeMode() const { return m_safeMode; }; - virtual QString signalName() const { return m_signalName; }; - virtual QString signalText() const { return m_signalText; }; - virtual QString whatToDoText() const { return m_whatToDoText; } - virtual QString errorDescriptionText() const { return m_errorDescriptionText; }; + virtual TQString signalName() const { return m_signalName; }; + virtual TQString signalText() const { return m_signalText; }; + virtual TQString whatToDoText() const { return m_whatToDoText; } + virtual TQString errorDescriptionText() const { return m_errorDescriptionText; }; - virtual ASYNC registerDebuggingApplication(const QString& launchName); + virtual ASYNC registerDebuggingApplication(const TQString& launchName); public: - QString debugger() const { return m_debugger; } - QString debuggerBatch() const { return m_debuggerBatch; } - QString tryExec() const { return m_tryExec; } - QString backtraceCommand() const { return m_backtraceCommand; } - QString removeFromBacktraceRegExp() const { return m_removeFromBacktraceRegExp; } - QString invalidStackFrameRegExp() const { return m_invalidStackFrameRegExp; } - QString frameRegExp() const { return m_frameRegExp; } - QString neededInValidBacktraceRegExp() const { return m_neededInValidBacktraceRegExp; } - QString kcrashRegExp() const { return m_kcrashRegExp; } + TQString debugger() const { return m_debugger; } + TQString debuggerBatch() const { return m_debuggerBatch; } + TQString tryExec() const { return m_tryExec; } + TQString backtraceCommand() const { return m_backtraceCommand; } + TQString removeFromBacktraceRegExp() const { return m_removeFromBacktraceRegExp; } + TQString invalidStackFrameRegExp() const { return m_invalidStackFrameRegExp; } + TQString frameRegExp() const { return m_frameRegExp; } + TQString neededInValidBacktraceRegExp() const { return m_neededInValidBacktraceRegExp; } + TQString kcrashRegExp() const { return m_kcrashRegExp; } bool showBacktrace() const { return m_showbacktrace; }; bool showDebugger() const { return m_showdebugger && !m_debugger.isNull(); }; bool showBugReport() const { return m_showbugreport; }; bool disableChecks() const { return m_disablechecks; }; const KAboutData *aboutData() const { return m_aboutData; } - QString execName() const { return m_execname; } + TQString execName() const { return m_execname; } - void expandString(QString &str, bool shell, const QString &tempFile = QString::null) const; + void expandString(TQString &str, bool shell, const TQString &tempFile = TQString::null) const; void acceptDebuggingApp(); signals: - void newDebuggingApplication(const QString& launchName); + void newDebuggingApplication(const TQString& launchName); private: void readConfig(); @@ -93,21 +93,21 @@ private: bool m_startedByKdeinit; bool m_safeMode; bool m_disablechecks; - QString m_signalName; - QString m_signalText; - QString m_whatToDoText; - QString m_errorDescriptionText; - QString m_execname; + TQString m_signalName; + TQString m_signalText; + TQString m_whatToDoText; + TQString m_errorDescriptionText; + TQString m_execname; - QString m_debugger; - QString m_debuggerBatch; - QString m_tryExec; - QString m_backtraceCommand; - QString m_removeFromBacktraceRegExp; - QString m_invalidStackFrameRegExp; - QString m_frameRegExp; - QString m_neededInValidBacktraceRegExp; - QString m_kcrashRegExp; + TQString m_debugger; + TQString m_debuggerBatch; + TQString m_tryExec; + TQString m_backtraceCommand; + TQString m_removeFromBacktraceRegExp; + TQString m_invalidStackFrameRegExp; + TQString m_frameRegExp; + TQString m_neededInValidBacktraceRegExp; + TQString m_kcrashRegExp; }; #endif diff --git a/drkonqi/krashdcopinterface.h b/drkonqi/krashdcopinterface.h index bf5f1a169..176756bf7 100644 --- a/drkonqi/krashdcopinterface.h +++ b/drkonqi/krashdcopinterface.h @@ -32,8 +32,8 @@ #include -#include -#include +#include +#include #include /** @@ -47,18 +47,18 @@ class KrashDCOPInterface : virtual public DCOPObject public: k_dcop: - virtual QString programName() const = 0; - virtual QCString appName() const = 0; + virtual TQString programName() const = 0; + virtual TQCString appName() const = 0; virtual int signalNumber() const = 0; virtual int pid() const = 0; virtual bool startedByKdeinit() const = 0; virtual bool safeMode() const = 0; - virtual QString signalName() const = 0; - virtual QString signalText() const = 0; - virtual QString whatToDoText() const = 0; - virtual QString errorDescriptionText() const = 0; + virtual TQString signalName() const = 0; + virtual TQString signalText() const = 0; + virtual TQString whatToDoText() const = 0; + virtual TQString errorDescriptionText() const = 0; - virtual ASYNC registerDebuggingApplication(const QString& launchName) = 0; + virtual ASYNC registerDebuggingApplication(const TQString& launchName) = 0; k_dcop_signals: void acceptDebuggingApplication(); diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp index a691b30c5..488edaebd 100644 --- a/drkonqi/toplevel.cpp +++ b/drkonqi/toplevel.cpp @@ -25,9 +25,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************/ -#include -#include -#include +#include +#include +#include #include "netwm.h" @@ -47,7 +47,7 @@ #include "toplevel.h" #include "toplevel.moc" -Toplevel :: Toplevel(KrashConfig *krashconf, QWidget *parent, const char *name) +Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name) : KDialogBase( Tabbed, krashconf->programName(), User3 | User2 | User1 | Close, @@ -61,17 +61,17 @@ Toplevel :: Toplevel(KrashConfig *krashconf, QWidget *parent, const char *name) ), m_krashconf(krashconf), m_bugreport(0) { - QHBox *page = addHBoxPage(i18n("&General")); + TQHBox *page = addHBoxPage(i18n("&General")); page->setSpacing(20); // picture of konqi - QLabel *lab = new QLabel(page); - lab->setFrameStyle(QFrame::Panel | QFrame::Sunken); - QPixmap pix(locate("appdata", QString::fromLatin1("pics/konqi.png"))); + TQLabel *lab = new TQLabel(page); + lab->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); + TQPixmap pix(locate("appdata", TQString::fromLatin1("pics/konqi.png"))); lab->setPixmap(pix); lab->setFixedSize( lab->sizeHint() ); - QLabel * info = new QLabel(generateText(), page); + TQLabel * info = new TQLabel(generateText(), page); info->setMinimumSize(info->sizeHint()); if (m_krashconf->showBacktrace()) @@ -84,8 +84,8 @@ Toplevel :: Toplevel(KrashConfig *krashconf, QWidget *parent, const char *name) showButton( User2, m_krashconf->showDebugger() ); showButton( User3, false ); - connect(this, SIGNAL(closeClicked()), SLOT(accept())); - connect(m_krashconf, SIGNAL(newDebuggingApplication(const QString&)), SLOT(slotNewDebuggingApp(const QString&))); + connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(accept())); + connect(m_krashconf, TQT_SIGNAL(newDebuggingApplication(const TQString&)), TQT_SLOT(slotNewDebuggingApp(const TQString&))); if ( !m_krashconf->safeMode() && kapp->dcopClient()->attach() ) kapp->dcopClient()->registerAs( kapp->name() ); @@ -95,9 +95,9 @@ Toplevel :: ~Toplevel() { } -QString Toplevel :: generateText() const +TQString Toplevel :: generateText() const { - QString str; + TQString str; if (!m_krashconf->errorDescriptionText().isEmpty()) str += i18n("

Short description

%1

") @@ -151,13 +151,13 @@ void Toplevel :: slotUser1() m_bugreport = new DrKBugReport(0, true, m_krashconf->aboutData()); if (i == KMessageBox::Yes) { - QApplication::setOverrideCursor ( waitCursor ); + TQApplication::setOverrideCursor ( waitCursor ); // generate the backtrace BackTrace *backtrace = new BackTrace(m_krashconf, this); - connect(backtrace, SIGNAL(someError()), SLOT(slotBacktraceSomeError())); - connect(backtrace, SIGNAL(done(const QString &)), - SLOT(slotBacktraceDone(const QString &))); + connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotBacktraceSomeError())); + connect(backtrace, TQT_SIGNAL(done(const TQString &)), + TQT_SLOT(slotBacktraceDone(const TQString &))); backtrace->start(); @@ -173,7 +173,7 @@ void Toplevel :: slotUser1() void Toplevel :: slotUser2() { - QString str = m_krashconf->debugger(); + TQString str = m_krashconf->debugger(); m_krashconf->expandString(str, true); KProcess proc; @@ -182,7 +182,7 @@ void Toplevel :: slotUser2() proc.start(KProcess::DontCare); } -void Toplevel :: slotNewDebuggingApp(const QString& launchName) +void Toplevel :: slotNewDebuggingApp(const TQString& launchName) { setButtonText( User3, launchName ); showButton( User3, true ); @@ -193,15 +193,15 @@ void Toplevel :: slotUser3() m_krashconf->acceptDebuggingApp(); } -void Toplevel :: slotBacktraceDone(const QString &str) +void Toplevel :: slotBacktraceDone(const TQString &str) { // Do not translate.. This will be included in the _MAIL_. - QString buf = QString::fromLatin1 + TQString buf = TQString::fromLatin1 ("\n\n\nHere is a backtrace generated by DrKonqi:\n") + str; m_bugreport->setText(buf); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); m_bugreport->exec(); delete m_bugreport; @@ -210,7 +210,7 @@ void Toplevel :: slotBacktraceDone(const QString &str) void Toplevel :: slotBacktraceSomeError() { - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); KMessageBox::sorry(0, i18n("It was not possible to generate a backtrace."), i18n("Backtrace Not Possible")); diff --git a/drkonqi/toplevel.h b/drkonqi/toplevel.h index 6476ac3d4..e6854bab5 100644 --- a/drkonqi/toplevel.h +++ b/drkonqi/toplevel.h @@ -41,22 +41,22 @@ class Toplevel : public KDialogBase Q_OBJECT public: - Toplevel(KrashConfig *krash, QWidget *parent = 0, const char * name = 0); + Toplevel(KrashConfig *krash, TQWidget *parent = 0, const char * name = 0); ~Toplevel(); private: // helper methods - QString generateText() const; + TQString generateText() const; protected slots: void slotUser1(); void slotUser2(); - void slotNewDebuggingApp(const QString& launchName); + void slotNewDebuggingApp(const TQString& launchName); void slotUser3(); protected slots: void slotBacktraceSomeError(); - void slotBacktraceDone(const QString &); + void slotBacktraceDone(const TQString &); private: KrashConfig *m_krashconf; diff --git a/kappfinder/common.cpp b/kappfinder/common.cpp index c6cd95a65..71ae2319e 100644 --- a/kappfinder/common.cpp +++ b/kappfinder/common.cpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #include @@ -33,11 +33,11 @@ #define DBG_CODE 1213 -void copyFile( const QString &inFileName, const QString &outFileName ) +void copyFile( const TQString &inFileName, const TQString &outFileName ) { - QFile inFile( inFileName ); + TQFile inFile( inFileName ); if ( inFile.open( IO_ReadOnly ) ) { - QFile outFile( outFileName ); + TQFile outFile( outFileName ); if ( outFile.open( IO_WriteOnly ) ) { outFile.writeBlock( inFile.readAll() ); outFile.close(); @@ -47,13 +47,13 @@ void copyFile( const QString &inFileName, const QString &outFileName ) } } -bool scanDesktopFile( QPtrList &appCache, const QString &templ, - QString destDir ) +bool scanDesktopFile( TQPtrList &appCache, const TQString &templ, + TQString destDir ) { KDesktopFile desktop( templ, true ); // find out where to put the .desktop files - QString destName; + TQString destName; if ( destDir.isNull() ) destDir = KGlobal::dirs()->saveLocation( "apps" ); else @@ -74,7 +74,7 @@ bool scanDesktopFile( QPtrList &appCache, const QString &templ, } // determine for which executable to look - QString exec = desktop.readPathEntry( "TryExec" ); + TQString exec = desktop.readPathEntry( "TryExec" ); if ( exec.isEmpty() ) exec = desktop.readPathEntry( "Exec" ); pos = exec.find( ' ' ); @@ -82,8 +82,8 @@ bool scanDesktopFile( QPtrList &appCache, const QString &templ, exec = exec.left( pos ); // try to locate the binary - QString pexec = KGlobal::dirs()->findExe( exec, - QString( ::getenv( "PATH" ) ) + ":/usr/X11R6/bin:/usr/games" ); + TQString pexec = KGlobal::dirs()->findExe( exec, + TQString( ::getenv( "PATH" ) ) + ":/usr/X11R6/bin:/usr/games" ); if ( pexec.isEmpty() ) { kdDebug(DBG_CODE) << "looking for " << exec.local8Bit() << "\t\tnot found" << endl; @@ -103,22 +103,22 @@ bool scanDesktopFile( QPtrList &appCache, const QString &templ, return true; } -void createDesktopFiles( QPtrList &appCache, int &added ) +void createDesktopFiles( TQPtrList &appCache, int &added ) { AppLnkCache* cache; for ( cache = appCache.first(); cache; cache = appCache.next() ) { if ( cache->item == 0 || ( cache->item && cache->item->isOn() ) ) { added++; - QString destDir = cache->destDir; - QString destName = cache->destName; - QString templ = cache->templ; + TQString destDir = cache->destDir; + TQString destName = cache->destName; + TQString templ = cache->templ; destDir += "/"; - QDir d; + TQDir d; int pos = -1; while ( ( pos = destDir.find( '/', pos + 1 ) ) >= 0 ) { - QString path = destDir.left( pos + 1 ); + TQString path = destDir.left( pos + 1 ); d = path; if ( !d.exists() ) d.mkdir( path ); @@ -130,7 +130,7 @@ void createDesktopFiles( QPtrList &appCache, int &added ) } } -void decorateDirs( QString destDir ) +void decorateDirs( TQString destDir ) { // find out where to put the .directory files if ( destDir.isNull() ) @@ -138,19 +138,19 @@ void decorateDirs( QString destDir ) else destDir += "/"; - QStringList dirs = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.directory", true ); + TQStringList dirs = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.directory", true ); - QStringList::Iterator it; + TQStringList::Iterator it; for ( it = dirs.begin(); it != dirs.end(); ++it ) { // find out the name of the file to store - QString destName = *it; + TQString destName = *it; int pos = destName.find( "kappfinder/apps/" ); if ( pos > 0 ) destName = destName.mid( pos + strlen( "kappfinder/apps/" ) ); destName = destDir + "/" + destName; - if ( !QFile::exists( destName ) ) { + if ( !TQFile::exists( destName ) ) { kdDebug(DBG_CODE) << "Copy " << *it << " to " << destName << endl; copyFile( *it, destName ); } diff --git a/kappfinder/common.h b/kappfinder/common.h index 699b9dfdc..f18139b3c 100644 --- a/kappfinder/common.h +++ b/kappfinder/common.h @@ -22,22 +22,22 @@ #ifndef COMMON_H #define COMMON_H -#include -#include -#include +#include +#include +#include class AppLnkCache { public: - QString destDir; - QString destName; - QString templ; - QCheckListItem *item; + TQString destDir; + TQString destName; + TQString templ; + TQCheckListItem *item; }; -bool scanDesktopFile( QPtrList &appCache, const QString &templ, - QString destDir = QString::null ); -void createDesktopFiles( QPtrList &appCache, int &added ); -void decorateDirs( QString destDir = QString::null ); +bool scanDesktopFile( TQPtrList &appCache, const TQString &templ, + TQString destDir = TQString::null ); +void createDesktopFiles( TQPtrList &appCache, int &added ); +void decorateDirs( TQString destDir = TQString::null ); #endif diff --git a/kappfinder/main_install.cpp b/kappfinder/main_install.cpp index 46bbaa06b..298ff06bb 100644 --- a/kappfinder/main_install.cpp +++ b/kappfinder/main_install.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include @@ -42,14 +42,14 @@ int main( int argc, char *argv[] ) return -1; } - QStringList templates = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true ); + TQStringList templates = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true ); - QString dir = QString( argv[ 1 ] ) + "/"; + TQString dir = TQString( argv[ 1 ] ) + "/"; - QPtrList appCache; + TQPtrList appCache; appCache.setAutoDelete( true ); - QStringList::Iterator it; + TQStringList::Iterator it; for ( it = templates.begin(); it != templates.end(); ++it ) scanDesktopFile( appCache, *it, dir ); diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp index dfae10938..660c5b498 100644 --- a/kappfinder/toplevel.cpp +++ b/kappfinder/toplevel.cpp @@ -35,22 +35,22 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "toplevel.h" -TopLevel::TopLevel( const QString &destDir, QWidget *parent, const char *name ) +TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name ) : KDialog( parent, name, true ) { setCaption( i18n( "KAppfinder" ) ); - QVBoxLayout *layout = new QVBoxLayout( this, marginHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, marginHint() ); - QLabel *label = new QLabel( i18n( "The application finder looks for non-KDE " + TQLabel *label = new TQLabel( i18n( "The application finder looks for non-KDE " "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); @@ -59,53 +59,53 @@ TopLevel::TopLevel( const QString &destDir, QWidget *parent, const char *name ) layout->addSpacing( 5 ); - mListView = new QListView( this ); + mListView = new TQListView( this ); mListView->addColumn( i18n( "Application" ) ); mListView->addColumn( i18n( "Description" ) ); mListView->addColumn( i18n( "Command" ) ); mListView->setMinimumSize( 300, 300 ); mListView->setRootIsDecorated( true ); mListView->setAllColumnsShowFocus( true ); - mListView->setSelectionMode(QListView::NoSelection); + mListView->setSelectionMode(TQListView::NoSelection); layout->addWidget( mListView ); mProgress = new KProgress( this ); mProgress->setPercentageVisible( false ); layout->addWidget( mProgress ); - mSummary = new QLabel( i18n( "Summary:" ), this ); + mSummary = new TQLabel( i18n( "Summary:" ), this ); layout->addWidget( mSummary ); KButtonBox* bbox = new KButtonBox( this ); - mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "find"), this, SLOT( slotScan() ) ); + mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "find"), this, TQT_SLOT( slotScan() ) ); bbox->addStretch( 5 ); mSelectButton = bbox->addButton( i18n( "Select All" ), this, - SLOT( slotSelectAll() ) ); + TQT_SLOT( slotSelectAll() ) ); mSelectButton->setEnabled( false ); mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), this, - SLOT( slotUnselectAll() ) ); + TQT_SLOT( slotUnselectAll() ) ); mUnSelectButton->setEnabled( false ); bbox->addStretch( 5 ); - mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, SLOT( slotCreate() ) ); + mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQT_SLOT( slotCreate() ) ); mApplyButton->setEnabled( false ); - bbox->addButton( KStdGuiItem::close(), kapp, SLOT( quit() ) ); + bbox->addButton( KStdGuiItem::close(), kapp, TQT_SLOT( quit() ) ); bbox->layout(); layout->addWidget( bbox ); - connect( kapp, SIGNAL( lastWindowClosed() ), kapp, SLOT( quit() ) ); + connect( kapp, TQT_SIGNAL( lastWindowClosed() ), kapp, TQT_SLOT( quit() ) ); mAppCache.setAutoDelete( true ); adjustSize(); mDestDir = destDir; - mDestDir = mDestDir.replace( QRegExp( "^~/" ), QDir::homeDirPath() + "/" ); + mDestDir = mDestDir.replace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" ); KStartupInfo::appStarted(); - QAccel *accel = new QAccel( this ); - accel->connectItem( accel->insertItem( Key_Q + CTRL ), kapp, SLOT( quit() ) ); + TQAccel *accel = new TQAccel( this ); + accel->connectItem( accel->insertItem( Key_Q + CTRL ), kapp, TQT_SLOT( quit() ) ); KAcceleratorManager::manage( this ); } @@ -116,8 +116,8 @@ TopLevel::~TopLevel() mAppCache.clear(); } -QListViewItem* TopLevel::addGroupItem( QListViewItem *parent, const QString &relPath, - const QString &name ) +TQListViewItem* TopLevel::addGroupItem( TQListViewItem *parent, const TQString &relPath, + const TQString &name ) { KServiceGroup::Ptr root = KServiceGroup::group( relPath ); if( !root ) @@ -129,8 +129,8 @@ QListViewItem* TopLevel::addGroupItem( QListViewItem *parent, const QString &rel KSycocaEntry *p = (*it); if ( p->isType( KST_KServiceGroup ) ) { KServiceGroup* serviceGroup = static_cast( p ); - if ( QString( "%1%2/" ).arg( relPath ).arg( name ) == serviceGroup->relPath() ) { - QListViewItem* retval; + if ( TQString( "%1%2/" ).arg( relPath ).arg( name ) == serviceGroup->relPath() ) { + TQListViewItem* retval; if ( parent ) retval = parent->firstChild(); else @@ -143,11 +143,11 @@ QListViewItem* TopLevel::addGroupItem( QListViewItem *parent, const QString &rel retval = retval->nextSibling(); } - QListViewItem *item; + TQListViewItem *item; if ( parent ) - item = new QListViewItem( parent, serviceGroup->caption() ); + item = new TQListViewItem( parent, serviceGroup->caption() ); else - item = new QListViewItem( mListView, serviceGroup->caption() ); + item = new TQListViewItem( mListView, serviceGroup->caption() ); item->setPixmap( 0, SmallIcon( serviceGroup->icon() ) ); item->setOpen( true ); @@ -177,12 +177,12 @@ void TopLevel::slotScan() mListView->clear(); - QStringList::Iterator it; + TQStringList::Iterator it; for ( it = mTemplates.begin(); it != mTemplates.end(); ++it ) { // eye candy mProgress->setProgress( mProgress->progress() + 1 ); - QString desktopName = *it; + TQString desktopName = *it; int i = desktopName.findRev('/'); desktopName = desktopName.mid(i+1); i = desktopName.findRev('.'); @@ -206,16 +206,16 @@ void TopLevel::slotScan() // copy over the desktop file, if exists if ( scanDesktopFile( mAppCache, *it, mDestDir ) ) { - QString relPath = *it; + TQString relPath = *it; int pos = relPath.find( "kappfinder/apps/" ); relPath = relPath.mid( pos + strlen( "kappfinder/apps/" ) ); relPath = relPath.left( relPath.findRev( '/' ) + 1 ); - QStringList dirList = QStringList::split( '/', relPath ); + TQStringList dirList = TQStringList::split( '/', relPath ); - QListViewItem *dirItem = 0; - QString tmpRelPath = QString::null; + TQListViewItem *dirItem = 0; + TQString tmpRelPath = TQString::null; - QStringList::Iterator tmpIt; + TQStringList::Iterator tmpIt; for ( tmpIt = dirList.begin(); tmpIt != dirList.end(); ++tmpIt ) { dirItem = addGroupItem( dirItem, tmpRelPath, *tmpIt ); tmpRelPath += *tmpIt + '/'; @@ -223,11 +223,11 @@ void TopLevel::slotScan() mFound++; - QCheckListItem *item; + TQCheckListItem *item; if ( dirItem ) - item = new QCheckListItem( dirItem, desktop.readName(), QCheckListItem::CheckBox ); + item = new TQCheckListItem( dirItem, desktop.readName(), TQCheckListItem::CheckBox ); else - item = new QCheckListItem( mListView, desktop.readName(), QCheckListItem::CheckBox ); + item = new TQCheckListItem( mListView, desktop.readName(), TQCheckListItem::CheckBox ); item->setPixmap( 0, loader->loadIcon( desktop.readIcon(), KIcon::Small ) ); item->setText( 1, desktop.readGenericName() ); @@ -241,7 +241,7 @@ void TopLevel::slotScan() } // update summary - QString sum( i18n( "Summary: found %n application", + TQString sum( i18n( "Summary: found %n application", "Summary: found %n applications", mFound ) ); mSummary->setText( sum ); } @@ -284,9 +284,9 @@ void TopLevel::slotCreate() KService::rebuildKSycoca(this); - QString message( i18n( "%n application was added to the KDE menu system.", + TQString message( i18n( "%n application was added to the KDE menu system.", "%n applications were added to the KDE menu system.", mAdded ) ); - KMessageBox::information( this, message, QString::null, "ShowInformation" ); + KMessageBox::information( this, message, TQString::null, "ShowInformation" ); } #include "toplevel.moc" diff --git a/kappfinder/toplevel.h b/kappfinder/toplevel.h index 972e5adfb..a1765444c 100644 --- a/kappfinder/toplevel.h +++ b/kappfinder/toplevel.h @@ -24,7 +24,7 @@ #include -#include +#include #include "common.h" @@ -38,7 +38,7 @@ class TopLevel : public KDialog Q_OBJECT public: - TopLevel( const QString &destDir, QWidget *parent = 0, const char *name = 0 ); + TopLevel( const TQString &destDir, TQWidget *parent = 0, const char *name = 0 ); ~TopLevel(); public slots: @@ -48,21 +48,21 @@ class TopLevel : public KDialog void slotUnselectAll(); private: - QListViewItem *addGroupItem( QListViewItem *parent, const QString &relPath, - const QString &name ); + TQListViewItem *addGroupItem( TQListViewItem *parent, const TQString &relPath, + const TQString &name ); KProgress *mProgress; - QLabel *mSummary; - QListView *mListView; - QPushButton *mApplyButton; - QPushButton *mQuitButton; - QPushButton *mScanButton; - QPushButton *mSelectButton; - QPushButton *mUnSelectButton; - QString mDestDir; - QStringList mTemplates; - - QPtrList mAppCache; + TQLabel *mSummary; + TQListView *mListView; + TQPushButton *mApplyButton; + TQPushButton *mQuitButton; + TQPushButton *mScanButton; + TQPushButton *mSelectButton; + TQPushButton *mUnSelectButton; + TQString mDestDir; + TQStringList mTemplates; + + TQPtrList mAppCache; int mFound, mAdded; }; diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index 00b58b8b5..70c81d465 100644 --- a/kate/app/kateapp.cpp +++ b/kate/app/kateapp.cpp @@ -42,10 +42,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -81,7 +81,7 @@ KateApp::KateApp (KCmdLineArgs *args) m_obj = new KateAppDCOPIface (this); kdDebug()<<"Setting KATE_PID: '"<setGroup("General"); - QString lastSession (sessionConfig()->readEntry ("Last Session", "default.katesession")); + TQString lastSession (sessionConfig()->readEntry ("Last Session", "default.katesession")); sessionManager()->activateSession (new KateSession (sessionManager(), lastSession, ""), false, false, false); m_docManager->restoreDocumentList (sessionConfig()); @@ -151,7 +151,7 @@ void KateApp::restoreKate () // restore all windows ;) for (int n=1; KMainWindow::canBeRestored(n); n++) - newMainWindow(sessionConfig(), QString ("%1").arg(n)); + newMainWindow(sessionConfig(), TQString ("%1").arg(n)); // oh, no mainwindow, create one, should not happen, but make sure ;) if (mainWindows() == 0) @@ -166,7 +166,7 @@ bool KateApp::startupKate () // user specified session to open if (m_args->isSet ("start")) { - sessionManager()->activateSession (sessionManager()->giveSession (QString::fromLocal8Bit(m_args->getOption("start"))), false, false); + sessionManager()->activateSession (sessionManager()->giveSession (TQString::fromLocal8Bit(m_args->getOption("start"))), false, false); } else { @@ -186,7 +186,7 @@ bool KateApp::startupKate () // notify about start KStartupInfo::setNewStartupId( activeMainWindow(), startupId()); - QTextCodec *codec = m_args->isSet("encoding") ? QTextCodec::codecForName(m_args->getOption("encoding")) : 0; + TQTextCodec *codec = m_args->isSet("encoding") ? TQTextCodec::codecForName(m_args->getOption("encoding")) : 0; bool tempfileSet = KCmdLineArgs::isTempFileSet(); @@ -195,7 +195,7 @@ bool KateApp::startupKate () for (int z=0; zcount(); z++) { // this file is no local dir, open it, else warn - bool noDir = !m_args->url(z).isLocalFile() || !QDir (m_args->url(z).path()).exists(); + bool noDir = !m_args->url(z).isLocalFile() || !TQDir (m_args->url(z).path()).exists(); if (noDir) { @@ -203,7 +203,7 @@ bool KateApp::startupKate () if (codec) id = activeMainWindow()->viewManager()->openURL( m_args->url(z), codec->name(), false, tempfileSet ); else - id = activeMainWindow()->viewManager()->openURL( m_args->url(z), QString::null, false, tempfileSet ); + id = activeMainWindow()->viewManager()->openURL( m_args->url(z), TQString::null, false, tempfileSet ); } else KMessageBox::sorry( activeMainWindow(), @@ -215,14 +215,14 @@ bool KateApp::startupKate () // handle stdin input if( m_args->isSet( "stdin" ) ) { - QTextIStream input(stdin); + TQTextIStream input(stdin); // set chosen codec if (codec) input.setCodec (codec); - QString line; - QString text; + TQString line; + TQString text; do { @@ -295,19 +295,19 @@ KateSessionManager *KateApp::sessionManager () return m_sessionManager; } -bool KateApp::openURL (const KURL &url, const QString &encoding, bool isTempFile) +bool KateApp::openURL (const KURL &url, const TQString &encoding, bool isTempFile) { KateMainWindow *mainWindow = activeMainWindow (); if (!mainWindow) return false; - QTextCodec *codec = encoding.isEmpty() ? 0 : QTextCodec::codecForName(encoding.latin1()); + TQTextCodec *codec = encoding.isEmpty() ? 0 : TQTextCodec::codecForName(encoding.latin1()); kdDebug () << "OPEN URL "<< encoding << endl; // this file is no local dir, open it, else warn - bool noDir = !url.isLocalFile() || !QDir (url.path()).exists(); + bool noDir = !url.isLocalFile() || !TQDir (url.path()).exists(); if (noDir) { @@ -315,7 +315,7 @@ bool KateApp::openURL (const KURL &url, const QString &encoding, bool isTempFile if (codec) mainWindow->viewManager()->openURL( url, codec->name(), true, isTempFile ); else - mainWindow->viewManager()->openURL( url, QString::null, true, isTempFile ); + mainWindow->viewManager()->openURL( url, TQString::null, true, isTempFile ); } else KMessageBox::sorry( mainWindow, @@ -336,7 +336,7 @@ bool KateApp::setCursor (int line, int column) return true; } -bool KateApp::openInput (const QString &text) +bool KateApp::openInput (const TQString &text) { activeMainWindow()->viewManager()->openURL( "", "", true ); @@ -348,7 +348,7 @@ bool KateApp::openInput (const QString &text) return true; } -KateMainWindow *KateApp::newMainWindow (KConfig *sconfig, const QString &sgroup) +KateMainWindow *KateApp::newMainWindow (KConfig *sconfig, const TQString &sgroup) { KateMainWindow *mainWindow = new KateMainWindow (sconfig, sgroup); m_mainWindows.push_back (mainWindow); diff --git a/kate/app/kateapp.h b/kate/app/kateapp.h index ff1d9d967..b67901cd9 100644 --- a/kate/app/kateapp.h +++ b/kate/app/kateapp.h @@ -24,7 +24,7 @@ #include -#include +#include class KateSessionManager; class KateAppDCOPIface; @@ -75,7 +75,7 @@ class KDE_EXPORT KateApp : public KApplication * @param fullVersion should full version be returned? * @return Kate version */ - static QString kateVersion (bool fullVersion = true); + static TQString kateVersion (bool fullVersion = true); /** * kate init @@ -140,7 +140,7 @@ class KDE_EXPORT KateApp : public KApplication * @param sgroup session group for this window * @return new constructed main window */ - KateMainWindow *newMainWindow (KConfig *sconfig = 0, const QString &sgroup = ""); + KateMainWindow *newMainWindow (KConfig *sconfig = 0, const TQString &sgroup = ""); /** * removes the mainwindow given, DOES NOT DELETE IT @@ -180,7 +180,7 @@ class KDE_EXPORT KateApp : public KApplication * @param isTempFile if set to true and the file is a local file, it will be deleted when the document is closed. * @return success */ - bool openURL (const KURL &url, const QString &encoding, bool isTempFile ); + bool openURL (const KURL &url, const TQString &encoding, bool isTempFile ); /** * position cursor in current active view @@ -196,7 +196,7 @@ class KDE_EXPORT KateApp : public KApplication * @param text text to fill in the new doc/view * @return success */ - bool openInput (const QString &text); + bool openInput (const TQString &text); private: /** @@ -227,7 +227,7 @@ class KDE_EXPORT KateApp : public KApplication /** * known main windows */ - QValueList m_mainWindows; + TQValueList m_mainWindows; /** * dcop interface diff --git a/kate/app/kateappIface.cpp b/kate/app/kateappIface.cpp index b70be960a..259e48b89 100644 --- a/kate/app/kateappIface.cpp +++ b/kate/app/kateappIface.cpp @@ -69,12 +69,12 @@ DCOPRef KateAppDCOPIface::mainWindow (uint n) return DCOPRef (); } -bool KateAppDCOPIface::openURL (KURL url, QString encoding) +bool KateAppDCOPIface::openURL (KURL url, TQString encoding) { return m_app->openURL (url, encoding, false); } -bool KateAppDCOPIface::openURL (KURL url, QString encoding, bool isTempFile) +bool KateAppDCOPIface::openURL (KURL url, TQString encoding, bool isTempFile) { return m_app->openURL (url, encoding, isTempFile); } @@ -84,19 +84,19 @@ bool KateAppDCOPIface::setCursor (int line, int column) return m_app->setCursor (line, column); } -bool KateAppDCOPIface::openInput (QString text) +bool KateAppDCOPIface::openInput (TQString text) { return m_app->openInput (text); } -bool KateAppDCOPIface::activateSession (QString session) +bool KateAppDCOPIface::activateSession (TQString session) { m_app->sessionManager()->activateSession (m_app->sessionManager()->giveSession (session)); return true; } -const QString & KateAppDCOPIface::session() const +const TQString & KateAppDCOPIface::session() const { return m_app->sessionManager()->activeSession()->sessionName(); } diff --git a/kate/app/kateappIface.h b/kate/app/kateappIface.h index 577c36e41..c57e788c8 100644 --- a/kate/app/kateappIface.h +++ b/kate/app/kateappIface.h @@ -49,7 +49,7 @@ class KateAppDCOPIface : public DCOPObject * @param encoding encoding name * @return success */ - bool openURL (KURL url, QString encoding); + bool openURL (KURL url, TQString encoding); /** * Like the above, but adds an option to let the documentManager know @@ -57,7 +57,7 @@ class KateAppDCOPIface : public DCOPObject * @p isTempFile should be set to true with the --tempfile option set ONLY, * files opened with this set to true will be deleted when closed. */ - bool openURL(KURL url, QString encoding, bool isTempFile); + bool openURL(KURL url, TQString encoding, bool isTempFile); /** * set cursor of active view in active main window @@ -73,19 +73,19 @@ class KateAppDCOPIface : public DCOPObject * @param text text to fill in the new doc/view * @return success */ - bool openInput (QString text); + bool openInput (TQString text); /** * activate a given session * @param session session name * @return success */ - bool activateSession (QString session); + bool activateSession (TQString session); /** * @return the name of the active session */ - const QString & session() const; + const TQString & session() const; private: KateApp *m_app; diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp index 62d86054b..47a7de19c 100644 --- a/kate/app/kateconfigdialog.cpp +++ b/kate/app/kateconfigdialog.cpp @@ -32,17 +32,17 @@ #include "katefilelist.h" #include "kateexternaltools.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -83,7 +83,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) pluginPages.setAutoDelete (false); editorPages.setAutoDelete (false); - QStringList path; + TQStringList path; setShowIconsInTreeList(true); @@ -95,75 +95,75 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) //BEGIN General page path << i18n("Application") << i18n("General"); - QFrame* frGeneral = addPage(path, i18n("General Options"), BarIcon("gohome", KIcon::SizeSmall)); + TQFrame* frGeneral = addPage(path, i18n("General Options"), BarIcon("gohome", KIcon::SizeSmall)); - QVBoxLayout *lo = new QVBoxLayout( frGeneral ); + TQVBoxLayout *lo = new TQVBoxLayout( frGeneral ); lo->setSpacing(KDialog::spacingHint()); config->setGroup("General"); // GROUP with the one below: "Appearance" - QButtonGroup *bgStartup = new QButtonGroup( 1, Qt::Horizontal, i18n("&Appearance"), frGeneral ); + TQButtonGroup *bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("&Appearance"), frGeneral ); lo->addWidget( bgStartup ); // show full path in title config->setGroup("General"); - cb_fullPath = new QCheckBox( i18n("&Show full path in title"), bgStartup); + cb_fullPath = new TQCheckBox( i18n("&Show full path in title"), bgStartup); cb_fullPath->setChecked( mainWindow->viewManager()->getShowFullPath() ); - QWhatsThis::add(cb_fullPath,i18n("If this option is checked, the full document path will be shown in the window caption.")); - connect( cb_fullPath, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) ); + TQWhatsThis::add(cb_fullPath,i18n("If this option is checked, the full document path will be shown in the window caption.")); + connect( cb_fullPath, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); // GROUP with the one below: "Behavior" - bgStartup = new QButtonGroup( 1, Qt::Horizontal, i18n("&Behavior"), frGeneral ); + bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("&Behavior"), frGeneral ); lo->addWidget( bgStartup ); // sync the konsole ? - cb_syncKonsole = new QCheckBox(bgStartup); + cb_syncKonsole = new TQCheckBox(bgStartup); cb_syncKonsole->setText(i18n("Sync &terminal emulator with active document")); cb_syncKonsole->setChecked(parent->syncKonsole); - QWhatsThis::add( cb_syncKonsole, i18n( + TQWhatsThis::add( cb_syncKonsole, i18n( "If this is checked, the built in Konsole will cd to the directory " "of the active document when started and whenever the active document changes, " "if the document is a local file.") ); - connect( cb_syncKonsole, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) ); + connect( cb_syncKonsole, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); // modified files notification - cb_modNotifications = new QCheckBox( + cb_modNotifications = new TQCheckBox( i18n("Wa&rn about files modified by foreign processes"), bgStartup ); cb_modNotifications->setChecked( parent->modNotification ); - QWhatsThis::add( cb_modNotifications, i18n( + TQWhatsThis::add( cb_modNotifications, i18n( "If enabled, when Kate receives focus you will be asked what to do with " "files that have been modified on the hard disk. If not enabled, you will " "be asked what to do with a file that has been modified on the hard disk only " "when that file gains focus inside Kate.") ); - connect( cb_modNotifications, SIGNAL( toggled( bool ) ), - this, SLOT( slotChanged() ) ); + connect( cb_modNotifications, TQT_SIGNAL( toggled( bool ) ), + this, TQT_SLOT( slotChanged() ) ); // GROUP with the one below: "Meta-informations" - bgStartup = new QButtonGroup( 1, Qt::Horizontal, i18n("Meta-Information"), frGeneral ); + bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Meta-Information"), frGeneral ); lo->addWidget( bgStartup ); // save meta infos - cb_saveMetaInfos = new QCheckBox( bgStartup ); + cb_saveMetaInfos = new TQCheckBox( bgStartup ); cb_saveMetaInfos->setText(i18n("Keep &meta-information past sessions")); cb_saveMetaInfos->setChecked(KateDocManager::self()->getSaveMetaInfos()); - QWhatsThis::add(cb_saveMetaInfos, i18n( + TQWhatsThis::add(cb_saveMetaInfos, i18n( "Check this if you want document configuration like for example " "bookmarks to be saved past editor sessions. The configuration will be " "restored if the document has not changed when reopened.")); - connect( cb_saveMetaInfos, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) ); + connect( cb_saveMetaInfos, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); // meta infos days - QHBox *hbDmf = new QHBox( bgStartup ); + TQHBox *hbDmf = new TQHBox( bgStartup ); hbDmf->setEnabled(KateDocManager::self()->getSaveMetaInfos()); - QLabel *lDmf = new QLabel( i18n("&Delete unused meta-information after:"), hbDmf ); - sb_daysMetaInfos = new QSpinBox( 0, 180, 1, hbDmf ); + TQLabel *lDmf = new TQLabel( i18n("&Delete unused meta-information after:"), hbDmf ); + sb_daysMetaInfos = new TQSpinBox( 0, 180, 1, hbDmf ); sb_daysMetaInfos->setSpecialValueText(i18n("(never)")); sb_daysMetaInfos->setSuffix(i18n(" day(s)")); sb_daysMetaInfos->setValue( KateDocManager::self()->getDaysMetaInfos() ); lDmf->setBuddy( sb_daysMetaInfos ); - connect( cb_saveMetaInfos, SIGNAL( toggled( bool ) ), hbDmf, SLOT( setEnabled( bool ) ) ); - connect( sb_daysMetaInfos, SIGNAL( valueChanged ( int ) ), this, SLOT( slotChanged() ) ); + connect( cb_saveMetaInfos, TQT_SIGNAL( toggled( bool ) ), hbDmf, TQT_SLOT( setEnabled( bool ) ) ); + connect( sb_daysMetaInfos, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); lo->addStretch(1); // :-] works correct without autoadd //END General page @@ -172,36 +172,36 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) //BEGIN Session page path << i18n("Application") << i18n("Sessions"); - QFrame* frSessions = addPage(path, i18n("Session Management"), BarIcon("history", KIcon::SizeSmall)); + TQFrame* frSessions = addPage(path, i18n("Session Management"), BarIcon("history", KIcon::SizeSmall)); - lo = new QVBoxLayout( frSessions ); + lo = new TQVBoxLayout( frSessions ); lo->setSpacing(KDialog::spacingHint()); // GROUP with the one below: "Startup" - bgStartup = new QButtonGroup( 1, Qt::Horizontal, i18n("Elements of Sessions"), frSessions ); + bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Elements of Sessions"), frSessions ); lo->addWidget( bgStartup ); // restore view config - cb_restoreVC = new QCheckBox( bgStartup ); + cb_restoreVC = new TQCheckBox( bgStartup ); cb_restoreVC->setText(i18n("Include &window configuration")); config->setGroup("General"); cb_restoreVC->setChecked( config->readBoolEntry("Restore Window Configuration", true) ); - QWhatsThis::add(cb_restoreVC, i18n( + TQWhatsThis::add(cb_restoreVC, i18n( "Check this if you want all your views and frames restored each time you open Kate")); - connect( cb_restoreVC, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) ); + connect( cb_restoreVC, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); - QRadioButton *rb1, *rb2, *rb3; + TQRadioButton *rb1, *rb2, *rb3; - sessions_start = new QButtonGroup( 1, Qt::Horizontal, i18n("Behavior on Application Startup"), frSessions ); + sessions_start = new TQButtonGroup( 1, Qt::Horizontal, i18n("Behavior on Application Startup"), frSessions ); lo->add (sessions_start); sessions_start->setRadioButtonExclusive( true ); - sessions_start->insert( rb1=new QRadioButton( i18n("&Start new session"), sessions_start ), 0 ); - sessions_start->insert( rb2=new QRadioButton( i18n("&Load last-used session"), sessions_start ), 1 ); - sessions_start->insert( rb3=new QRadioButton( i18n("&Manually choose a session"), sessions_start ), 2 ); + sessions_start->insert( rb1=new TQRadioButton( i18n("&Start new session"), sessions_start ), 0 ); + sessions_start->insert( rb2=new TQRadioButton( i18n("&Load last-used session"), sessions_start ), 1 ); + sessions_start->insert( rb3=new TQRadioButton( i18n("&Manually choose a session"), sessions_start ), 2 ); config->setGroup("General"); - QString sesStart (config->readEntry ("Startup Session", "manual")); + TQString sesStart (config->readEntry ("Startup Session", "manual")); if (sesStart == "new") sessions_start->setButton (0); else if (sesStart == "last") @@ -209,20 +209,20 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) else sessions_start->setButton (2); - connect(rb1, SIGNAL(toggled(bool)), this, SLOT(slotChanged())); - connect(rb2, SIGNAL(toggled(bool)), this, SLOT(slotChanged())); - connect(rb3, SIGNAL(toggled(bool)), this, SLOT(slotChanged())); + connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(rb3, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - sessions_exit = new QButtonGroup( 1, Qt::Horizontal, i18n("Behavior on Application Exit or Session Switch"), frSessions ); + sessions_exit = new TQButtonGroup( 1, Qt::Horizontal, i18n("Behavior on Application Exit or Session Switch"), frSessions ); lo->add (sessions_exit); sessions_exit->setRadioButtonExclusive( true ); - sessions_exit->insert( rb1=new QRadioButton( i18n("&Do not save session"), sessions_exit ), 0 ); - sessions_exit->insert( rb2=new QRadioButton( i18n("&Save session"), sessions_exit ), 1 ); - sessions_exit->insert( rb3=new QRadioButton( i18n("&Ask user"), sessions_exit ), 2 ); + sessions_exit->insert( rb1=new TQRadioButton( i18n("&Do not save session"), sessions_exit ), 0 ); + sessions_exit->insert( rb2=new TQRadioButton( i18n("&Save session"), sessions_exit ), 1 ); + sessions_exit->insert( rb3=new TQRadioButton( i18n("&Ask user"), sessions_exit ), 2 ); config->setGroup("General"); - QString sesExit (config->readEntry ("Session Exit", "save")); + TQString sesExit (config->readEntry ("Session Exit", "save")); if (sesExit == "discard") sessions_exit->setButton (0); else if (sesExit == "save") @@ -230,9 +230,9 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) else sessions_exit->setButton (2); - connect(rb1, SIGNAL(toggled(bool)), this, SLOT(slotChanged())); - connect(rb2, SIGNAL(toggled(bool)), this, SLOT(slotChanged())); - connect(rb3, SIGNAL(toggled(bool)), this, SLOT(slotChanged())); + connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(rb3, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); lo->addStretch(1); // :-] works correct without autoadd //END Session page @@ -242,11 +242,11 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) // file selector page path << i18n("Application") << i18n("File Selector"); - QVBox *page = addVBoxPage( path, i18n("File Selector Settings"), + TQVBox *page = addVBoxPage( path, i18n("File Selector Settings"), BarIcon("fileopen", KIcon::SizeSmall) ); fileSelConfigPage = new KFSConfigPage( page, "file selector config page", mainWindow->fileselector ); - connect( fileSelConfigPage, SIGNAL( changed() ), this, SLOT( slotChanged() ) ); + connect( fileSelConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); path.clear(); path << i18n("Application") << i18n("Document List"); @@ -254,14 +254,14 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) BarIcon("view_text", KIcon::SizeSmall) ); filelistConfigPage = new KFLConfigPage( page, "file list config page", mainWindow->filelist ); - connect( filelistConfigPage, SIGNAL( changed() ), this, SLOT( slotChanged() ) ); + connect( filelistConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); path.clear(); path << i18n("Application") << i18n("Plugins"); - /*QVBox **/page=addVBoxPage(path,i18n("Plugin Manager"), + /*TQVBox **/page=addVBoxPage(path,i18n("Plugin Manager"), BarIcon("connect_established",KIcon::SizeSmall)); KateConfigPluginPage *configPluginPage = new KateConfigPluginPage(page, this); - connect( configPluginPage, SIGNAL( changed() ), this, SLOT( slotChanged() ) ); + connect( configPluginPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); // Tools->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, SIGNAL(changed()), this, SLOT(slotChanged()) ); + connect( configExternalToolsPage, TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()) ); // editor widgets from kwrite/kwdialog path.clear(); @@ -280,11 +280,11 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) { path.clear(); path << i18n("Editor") << KTextEditor::configInterfaceExtension (v->document())->configPageName (i); - /*QVBox **/page = addVBoxPage(path, KTextEditor::configInterfaceExtension (v->document())->configPageFullName (i), + /*TQVBox **/page = addVBoxPage(path, KTextEditor::configInterfaceExtension (v->document())->configPageFullName (i), KTextEditor::configInterfaceExtension (v->document())->configPagePixmap(i, KIcon::SizeSmall) ); KTextEditor::ConfigPage *cPage = KTextEditor::configInterfaceExtension (v->document())->configPage(i, page); - connect( cPage, SIGNAL( changed() ), this, SLOT( slotChanged() ) ); + connect( cPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); editorPages.append (cPage); } @@ -312,15 +312,15 @@ void KateConfigDialog::addPluginPage (Kate::Plugin *plugin) for (uint i=0; iconfigPages(); i++) { - QStringList path; + TQStringList path; path.clear(); path << i18n("Application")<configPageName(i); - QVBox *page=addVBoxPage(path, Kate::pluginConfigInterfaceExtension(plugin)->configPageFullName(i), Kate::pluginConfigInterfaceExtension(plugin)->configPagePixmap(i, KIcon::SizeSmall)); + TQVBox *page=addVBoxPage(path, Kate::pluginConfigInterfaceExtension(plugin)->configPageFullName(i), Kate::pluginConfigInterfaceExtension(plugin)->configPagePixmap(i, KIcon::SizeSmall)); PluginPageListItem *info=new PluginPageListItem; info->plugin = plugin; info->page = Kate::pluginConfigInterfaceExtension(plugin)->configPage (i, page); - connect( info->page, SIGNAL( changed() ), this, SLOT( slotChanged() ) ); + connect( info->page, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); pluginPages.append(info); } } @@ -334,7 +334,7 @@ void KateConfigDialog::removePluginPage (Kate::Plugin *plugin) { if ( pluginPages.at(i)->plugin == plugin ) { - QWidget *w = pluginPages.at(i)->page->parentWidget(); + TQWidget *w = pluginPages.at(i)->page->parentWidget(); delete pluginPages.at(i)->page; delete w; pluginPages.remove(pluginPages.at(i)); diff --git a/kate/app/kateconfigdialog.h b/kate/app/kateconfigdialog.h index 3fb523b61..1d8c38a96 100644 --- a/kate/app/kateconfigdialog.h +++ b/kate/app/kateconfigdialog.h @@ -64,19 +64,19 @@ class KateConfigDialog : public KDialogBase Kate::View* v; bool dataChanged; - QCheckBox *cb_fullPath; - QCheckBox *cb_syncKonsole; - QCheckBox *cb_modNotifications; - QCheckBox *cb_saveMetaInfos; - QSpinBox *sb_daysMetaInfos; - QCheckBox* cb_restoreVC; - QButtonGroup *sessions_start; - QButtonGroup *sessions_exit; + TQCheckBox *cb_fullPath; + TQCheckBox *cb_syncKonsole; + TQCheckBox *cb_modNotifications; + TQCheckBox *cb_saveMetaInfos; + TQSpinBox *sb_daysMetaInfos; + TQCheckBox* cb_restoreVC; + TQButtonGroup *sessions_start; + TQButtonGroup *sessions_exit; Kate::ConfigPage *fileSelConfigPage; Kate::ConfigPage *filelistConfigPage; Kate::ConfigPage *configExternalToolsPage; - QPtrList pluginPages; - QPtrList editorPages; + TQPtrList pluginPages; + TQPtrList editorPages; }; #endif diff --git a/kate/app/kateconfigplugindialogpage.cpp b/kate/app/kateconfigplugindialogpage.cpp index 7269d5f5b..4aa56c78d 100644 --- a/kate/app/kateconfigplugindialogpage.cpp +++ b/kate/app/kateconfigplugindialogpage.cpp @@ -24,19 +24,19 @@ #include "kateconfigdialog.h" #include #include "kateapp.h" -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include -#include +#include class KatePluginListItem : public QCheckListItem { public: - KatePluginListItem(bool checked, KatePluginInfo *info, QListView *parent); + KatePluginListItem(bool checked, KatePluginInfo *info, TQListView *parent); KatePluginInfo *info() const { return mInfo; } protected: @@ -47,8 +47,8 @@ class KatePluginListItem : public QCheckListItem bool silentStateChange; }; -KatePluginListItem::KatePluginListItem(bool checked, KatePluginInfo *info, QListView *parent) - : QCheckListItem(parent, info->service->name(), CheckBox) +KatePluginListItem::KatePluginListItem(bool checked, KatePluginInfo *info, TQListView *parent) + : TQCheckListItem(parent, info->service->name(), CheckBox) , mInfo(info) , silentStateChange(false) { @@ -63,7 +63,7 @@ void KatePluginListItem::stateChange(bool b) static_cast(listView())->stateChanged(this, b); } -KatePluginListView::KatePluginListView(QWidget *parent, const char *name) +KatePluginListView::KatePluginListView(TQWidget *parent, const char *name) : KListView(parent, name) { } @@ -73,16 +73,16 @@ void KatePluginListView::stateChanged(KatePluginListItem *item, bool b) emit stateChange(item, b); } -KateConfigPluginPage::KateConfigPluginPage(QWidget *parent, KateConfigDialog *dialog):QVBox(parent) +KateConfigPluginPage::KateConfigPluginPage(TQWidget *parent, KateConfigDialog *dialog):TQVBox(parent) { myDialog=dialog; KatePluginListView* listView = new KatePluginListView(this); listView->addColumn(i18n("Name")); listView->addColumn(i18n("Comment")); - QWhatsThis::add(listView,i18n("Here you can see all available Kate plugins. Those with a check mark are loaded, and will be loaded again the next time Kate is started.")); + TQWhatsThis::add(listView,i18n("Here you can see all available Kate plugins. Those with a check mark are loaded, and will be loaded again the next time Kate is started.")); - connect(listView, SIGNAL(stateChange(KatePluginListItem *, bool)), this, SLOT(stateChange(KatePluginListItem *, bool))); + connect(listView, TQT_SIGNAL(stateChange(KatePluginListItem *, bool)), this, TQT_SLOT(stateChange(KatePluginListItem *, bool))); KatePluginList &pluginList (KatePluginManager::self()->pluginList()); for (unsigned int i=0; i < pluginList.size(); ++i) diff --git a/kate/app/kateconfigplugindialogpage.h b/kate/app/kateconfigplugindialogpage.h index f65da880b..c02c0411b 100644 --- a/kate/app/kateconfigplugindialogpage.h +++ b/kate/app/kateconfigplugindialogpage.h @@ -25,7 +25,7 @@ #include -#include +#include class KatePluginListItem; @@ -36,7 +36,7 @@ class KatePluginListView : public KListView friend class KatePluginListItem; public: - KatePluginListView (QWidget *parent = 0, const char *name = 0); + KatePluginListView (TQWidget *parent = 0, const char *name = 0); signals: void stateChange(KatePluginListItem *, bool); @@ -50,7 +50,7 @@ class KateConfigPluginPage: public QVBox Q_OBJECT public: - KateConfigPluginPage(QWidget *parent, class KateConfigDialog *dialog); + KateConfigPluginPage(TQWidget *parent, class KateConfigDialog *dialog); ~KateConfigPluginPage(){;}; private: diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp index 5220859b2..a160162db 100644 --- a/kate/app/kateconsole.cpp +++ b/kate/app/kateconsole.cpp @@ -40,7 +40,7 @@ #include KateConsole::KateConsole (KateMainWindow *mw, KateMDI::ToolView* parent) - : QVBox (parent) + : TQVBox (parent) , m_part (0) , m_mw (mw) , m_toolView (parent) @@ -50,7 +50,7 @@ KateConsole::KateConsole (KateMainWindow *mw, KateMDI::ToolView* parent) KateConsole::~KateConsole () { if (m_part) - disconnect ( m_part, SIGNAL(destroyed()), this, SLOT(slotDestroyed()) ); + disconnect ( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); } void KateConsole::loadConsoleIfNeeded() @@ -74,7 +74,7 @@ void KateConsole::loadConsoleIfNeeded() m_part->widget()->show(); - connect ( m_part, SIGNAL(destroyed()), this, SLOT(slotDestroyed()) ); + connect ( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); if (m_mw->viewManager()->activeView()) if (m_mw->viewManager()->activeView()->getDoc()->url().isValid()) @@ -93,7 +93,7 @@ void KateConsole::slotDestroyed () } } -void KateConsole::showEvent(QShowEvent *) +void KateConsole::showEvent(TQShowEvent *) { if (m_part) return; @@ -109,7 +109,7 @@ void KateConsole::cd (const KURL &url) m_part->openURL (url); } -void KateConsole::sendInput( const QString& text ) +void KateConsole::sendInput( const TQString& text ) { loadConsoleIfNeeded(); diff --git a/kate/app/kateconsole.h b/kate/app/kateconsole.h index 1750df11d..e308f1df2 100644 --- a/kate/app/kateconsole.h +++ b/kate/app/kateconsole.h @@ -25,7 +25,7 @@ #include -#include +#include namespace KParts { class ReadOnlyPart; @@ -69,7 +69,7 @@ class KateConsole : public QVBox * send given text to console * @param text commands for console */ - void sendInput( const QString& text ); + void sendInput( const TQString& text ); public slots: /** @@ -94,7 +94,7 @@ class KateConsole : public QVBox * the konsole get shown * @param ev show event */ - void showEvent(QShowEvent *ev); + void showEvent(TQShowEvent *ev); private: /** diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp index fe6491f78..f60c09783 100644 --- a/kate/app/katedocmanager.cpp +++ b/kate/app/katedocmanager.cpp @@ -42,12 +42,12 @@ #include #include -#include -#include -#include +#include +#include +#include -KateDocManager::KateDocManager (QObject *parent) - : QObject (parent) +KateDocManager::KateDocManager (TQObject *parent) + : TQObject (parent) , m_saveMetaInfos(true) , m_daysMetaInfos(0) { @@ -80,13 +80,13 @@ KateDocManager::~KateDocManager () // purge saved filesessions if (m_daysMetaInfos > 0) { - QStringList groups = m_metaInfos->groupList(); - QDateTime *def = new QDateTime(QDate(1970, 1, 1)); - for (QStringList::Iterator it = groups.begin(); it != groups.end(); ++it) + TQStringList groups = m_metaInfos->groupList(); + TQDateTime *def = new TQDateTime(TQDate(1970, 1, 1)); + for (TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it) { m_metaInfos->setGroup(*it); - QDateTime last = m_metaInfos->readDateTimeEntry("Time", def); - if (last.daysTo(QDateTime::currentDateTime()) > m_daysMetaInfos) + TQDateTime last = m_metaInfos->readDateTimeEntry("Time", def); + if (last.daysTo(TQDateTime::currentDateTime()) > m_daysMetaInfos) m_metaInfos->deleteGroup(*it); } delete def; @@ -116,7 +116,7 @@ Kate::Document *KateDocManager::createDoc () emit documentCreated ((Kate::Document *)doc); emit m_documentManager->documentCreated ((Kate::Document *)doc); - connect(doc,SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char))); + connect(doc,TQT_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,TQT_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char))); return (Kate::Document *)doc; } @@ -204,7 +204,7 @@ uint KateDocManager::documents () int KateDocManager::findDocument ( KURL url ) { - QPtrListIterator it(m_docList); + TQPtrListIterator it(m_docList); for (; it.current(); ++it) { @@ -216,7 +216,7 @@ int KateDocManager::findDocument ( KURL url ) Kate::Document *KateDocManager::findDocumentByUrl( KURL url ) { - for (QPtrListIterator it(m_docList); it.current(); ++it) + for (TQPtrListIterator it(m_docList); it.current(); ++it) { if ( it.current()->url() == url) return it.current(); @@ -231,7 +231,7 @@ bool KateDocManager::isOpen(KURL url) return findDocumentByUrl (url) != 0; } -Kate::Document *KateDocManager::openURL (const KURL& url,const QString &encoding, uint *id, bool isTempFile) +Kate::Document *KateDocManager::openURL (const KURL& url,const TQString &encoding, uint *id, bool isTempFile) { // special handling if still only the first initial doc is there if (!documentList().isEmpty() && (documentList().count() == 1) && (!documentList().at(0)->isModified() && documentList().at(0)->url().isEmpty())) @@ -248,7 +248,7 @@ Kate::Document *KateDocManager::openURL (const KURL& url,const QString &encoding if ( isTempFile && !url.isEmpty() && url.isLocalFile() ) { - QFileInfo fi( url.path() ); + TQFileInfo fi( url.path() ); if ( fi.exists() ) { m_tempFiles[ doc->documentNumber() ] = qMakePair(url, fi.lastModified()); @@ -256,7 +256,7 @@ Kate::Document *KateDocManager::openURL (const KURL& url,const QString &encoding } } - connect(doc, SIGNAL(modStateChanged(Kate::Document *)), this, SLOT(slotModChanged(Kate::Document *))); + connect(doc, TQT_SIGNAL(modStateChanged(Kate::Document *)), this, TQT_SLOT(slotModChanged(Kate::Document *))); emit initialDocumentReplaced(); @@ -279,7 +279,7 @@ Kate::Document *KateDocManager::openURL (const KURL& url,const QString &encoding if ( isTempFile && !url.isEmpty() && url.isLocalFile() ) { - QFileInfo fi( url.path() ); + TQFileInfo fi( url.path() ); if ( fi.exists() ) { m_tempFiles[ doc->documentNumber() ] = qMakePair(url, fi.lastModified()); @@ -298,7 +298,7 @@ bool KateDocManager::closeDocument(class Kate::Document *doc,bool closeURL) if (closeURL) if (!doc->closeURL()) return false; - QPtrList closeList; + TQPtrList closeList; uint documentNumber = doc->documentNumber(); for (uint i=0; i < KateApp::self()->mainWindows (); i++ ) @@ -308,7 +308,7 @@ bool KateDocManager::closeDocument(class Kate::Document *doc,bool closeURL) if ( closeURL && m_tempFiles.contains( documentNumber ) ) { - QFileInfo fi( m_tempFiles[ documentNumber ].first.path() ); + TQFileInfo fi( m_tempFiles[ documentNumber ].first.path() ); if ( fi.lastModified() <= m_tempFiles[ documentNumber ].second /*|| KMessageBox::questionYesNo( KateApp::self()->activeMainWindow(), i18n("The supposedly temporary file %1 has been modified. " @@ -346,7 +346,7 @@ bool KateDocManager::closeAllDocuments(bool closeURL) { bool res = true; - QPtrList docs = m_docList; + TQPtrList docs = m_docList; for (uint i=0; i < KateApp::self()->mainWindows (); i++ ) { @@ -370,9 +370,9 @@ bool KateDocManager::closeAllDocuments(bool closeURL) return res; } -QPtrList KateDocManager::modifiedDocumentList() { - QPtrList modified; - for (QPtrListIterator it(m_docList); it.current(); ++it) { +TQPtrList KateDocManager::modifiedDocumentList() { + TQPtrList modified; + for (TQPtrListIterator it(m_docList); it.current(); ++it) { Kate::Document *doc = it.current(); if (doc->isModified()) { modified.append(doc); @@ -385,7 +385,7 @@ QPtrList KateDocManager::modifiedDocumentList() { bool KateDocManager::queryCloseDocuments(KateMainWindow *w) { uint docCount = m_docList.count(); - for (QPtrListIterator it(m_docList); it.current(); ++it) + for (TQPtrListIterator it(m_docList); it.current(); ++it) { Kate::Document *doc = it.current(); @@ -402,7 +402,7 @@ bool KateDocManager::queryCloseDocuments(KateMainWindow *w) if (msgres==KMessageBox::Yes) { KEncodingFileDialog::Result r=KEncodingFileDialog::getSaveURLAndEncoding( - KTextEditor::encodingInterface(doc)->encoding(),QString::null,QString::null,w,i18n("Save As")); + KTextEditor::encodingInterface(doc)->encoding(),TQString::null,TQString::null,w,i18n("Save As")); doc->setEncoding( r.encoding ); @@ -439,23 +439,23 @@ bool KateDocManager::queryCloseDocuments(KateMainWindow *w) void KateDocManager::saveAll() { - for (QPtrListIterator it(m_docList); it.current(); ++it) + for (TQPtrListIterator it(m_docList); it.current(); ++it) if ( it.current()->isModified() && it.current()->views().count() ) ((Kate::View*)it.current()->views().first())->save(); } void KateDocManager::saveDocumentList (KConfig* config) { - QString prevGrp=config->group(); + TQString prevGrp=config->group(); config->setGroup ("Open Documents"); - QString grp = config->group(); + TQString grp = config->group(); config->writeEntry ("Count", m_docList.count()); int i=0; for ( Kate::Document *doc = m_docList.first(); doc; doc = m_docList.next() ) { - config->setGroup(QString("Document %1").arg(i)); + config->setGroup(TQString("Document %1").arg(i)); doc->writeSessionConfig(config); config->setGroup(grp); @@ -467,9 +467,9 @@ void KateDocManager::saveDocumentList (KConfig* config) void KateDocManager::restoreDocumentList (KConfig* config) { - QString prevGrp=config->group(); + TQString prevGrp=config->group(); config->setGroup ("Open Documents"); - QString grp = config->group(); + TQString grp = config->group(); unsigned int count = config->readUnsignedNumEntry("Count", 0); @@ -479,9 +479,9 @@ void KateDocManager::restoreDocumentList (KConfig* config) return; } - QProgressDialog *pd = new QProgressDialog( + TQProgressDialog *pd = new TQProgressDialog( i18n("Reopening files from the last session..."), - QString::null, + TQString::null, count, 0, "openprog"); @@ -492,7 +492,7 @@ void KateDocManager::restoreDocumentList (KConfig* config) bool first = true; for (unsigned int i=0; i < count; i++) { - config->setGroup(QString("Document %1").arg(i)); + config->setGroup(TQString("Document %1").arg(i)); Kate::Document *doc = 0; if (first) @@ -540,13 +540,13 @@ bool KateDocManager::loadMetaInfos(Kate::Document *doc, const KURL &url) if (!m_metaInfos->hasGroup(url.prettyURL())) return false; - QCString md5; + TQCString md5; bool ok = true; if (computeUrlMD5(url, md5)) { m_metaInfos->setGroup(url.prettyURL()); - QString old_md5 = m_metaInfos->readEntry("MD5"); + TQString old_md5 = m_metaInfos->readEntry("MD5"); if ((const char *)md5 == old_md5) doc->readSessionConfig(m_metaInfos); @@ -567,7 +567,7 @@ bool KateDocManager::loadMetaInfos(Kate::Document *doc, const KURL &url) */ void KateDocManager::saveMetaInfos(Kate::Document *doc) { - QCString md5; + TQCString md5; if (!m_saveMetaInfos) return; @@ -583,14 +583,14 @@ 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", QDateTime::currentDateTime()); + m_metaInfos->writeEntry("Time", TQDateTime::currentDateTime()); m_metaInfos->sync(); } } -bool KateDocManager::computeUrlMD5(const KURL &url, QCString &result) +bool KateDocManager::computeUrlMD5(const KURL &url, TQCString &result) { - QFile f(url.path()); + TQFile f(url.path()); if (f.open(IO_ReadOnly)) { diff --git a/kate/app/katedocmanager.h b/kate/app/katedocmanager.h index 45931b655..b35d0a65f 100644 --- a/kate/app/katedocmanager.h +++ b/kate/app/katedocmanager.h @@ -25,14 +25,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace KParts { class Factory; } @@ -52,14 +52,14 @@ class KateDocumentInfo unsigned char modifiedOnDiscReason; }; -typedef QPair TPair; +typedef QPair TPair; class KateDocManager : public QObject { Q_OBJECT public: - KateDocManager (QObject *parent); + KateDocManager (TQObject *parent); ~KateDocManager (); static KateDocManager *self (); @@ -92,16 +92,16 @@ class KateDocManager : public QObject uint documents (); - QPtrList &documentList () { return m_docList; }; + TQPtrList &documentList () { return m_docList; }; - Kate::Document *openURL(const KURL&,const QString &encoding=QString::null,uint *id =0,bool isTempFile=false); + Kate::Document *openURL(const KURL&,const TQString &encoding=TQString::null,uint *id =0,bool isTempFile=false); bool closeDocument(class Kate::Document *,bool closeURL=true); bool closeDocument(uint); bool closeDocumentWithID(uint); bool closeAllDocuments(bool closeURL=true); - QPtrList modifiedDocumentList(); + TQPtrList modifiedDocumentList(); bool queryCloseDocuments(KateMainWindow *w); void saveDocumentList (class KConfig *config); @@ -135,14 +135,14 @@ class KateDocManager : public QObject private: bool loadMetaInfos(Kate::Document *doc, const KURL &url); void saveMetaInfos(Kate::Document *doc); - bool computeUrlMD5(const KURL &url, QCString &result); + bool computeUrlMD5(const KURL &url, TQCString &result); Kate::DocumentManager *m_documentManager; - QPtrList m_docList; - QIntDict m_docDict; - QPtrDict m_docInfos; - QMap m_tempFiles; - QGuardedPtr m_currentDoc; + TQPtrList m_docList; + TQIntDict m_docDict; + TQPtrDict m_docInfos; + TQMap m_tempFiles; + TQGuardedPtr m_currentDoc; KConfig *m_metaInfos; bool m_saveMetaInfos; int m_daysMetaInfos; diff --git a/kate/app/katedocmanageriface.cpp b/kate/app/katedocmanageriface.cpp index 9c2eabc03..5ef01a1df 100644 --- a/kate/app/katedocmanageriface.cpp +++ b/kate/app/katedocmanageriface.cpp @@ -83,7 +83,7 @@ DCOPRef KateDocManagerDCOPIface::documentWithID (uint id) return DCOPRef (obj); } -DCOPRef KateDocManagerDCOPIface::openURL (KURL url, QString encoding) +DCOPRef KateDocManagerDCOPIface::openURL (KURL url, TQString encoding) { Kate::Document *doc = m_dm->openURL (url, encoding); diff --git a/kate/app/katedocmanageriface.h b/kate/app/katedocmanageriface.h index 7a2cb5506..353818c03 100644 --- a/kate/app/katedocmanageriface.h +++ b/kate/app/katedocmanageriface.h @@ -48,7 +48,7 @@ class KateDocManagerDCOPIface : public DCOPObject uint documents (); - DCOPRef openURL (KURL url, QString encoding); + DCOPRef openURL (KURL url, TQString encoding); bool closeDocument (uint n); diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp index 50c07709b..6680e26a4 100644 --- a/kate/app/kateexternaltools.cpp +++ b/kate/app/kateexternaltools.cpp @@ -44,19 +44,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -65,13 +65,13 @@ KateExternalToolsCommand *KateExternalToolsCommand::s_self=0; //BEGIN KateExternalTool -KateExternalTool::KateExternalTool( const QString &name, - const QString &command, - const QString &icon, - const QString &tryexec, - const QStringList &mimetypes, - const QString &acname, - const QString &cmdname, +KateExternalTool::KateExternalTool( const TQString &name, + const TQString &command, + const TQString &icon, + const TQString &tryexec, + const TQStringList &mimetypes, + const TQString &acname, + const TQString &cmdname, int save ) : name ( name ), command ( command ), @@ -90,12 +90,12 @@ bool KateExternalTool::checkExec() { // if tryexec is empty, it is the first word of command if ( tryexec.isEmpty() ) - tryexec = command.section( " ", 0, 0, QString::SectionSkipEmpty ); + tryexec = command.section( " ", 0, 0, TQString::SectionSkipEmpty ); // NOTE this code is modified taken from kdesktopfile.cpp, from KDesktopFile::tryExec() if (!tryexec.isEmpty()) { if (tryexec[0] == '/') { - if (::access(QFile::encodeName(tryexec), R_OK | X_OK)) + if (::access(TQFile::encodeName(tryexec), R_OK | X_OK)) return false; m_exec = tryexec; @@ -103,13 +103,13 @@ bool KateExternalTool::checkExec() // !!! Sergey A. Sukiyazov !!! // Environment PATH may contain filenames in 8bit locale cpecified // encoding (Like a filenames). - QStringList dirs = QStringList::split(':', QFile::decodeName(::getenv("PATH"))); - QStringList::Iterator it(dirs.begin()); + TQStringList dirs = TQStringList::split(':', TQFile::decodeName(::getenv("PATH"))); + TQStringList::Iterator it(dirs.begin()); bool match = false; for (; it != dirs.end(); ++it) { - QString fName = *it + "/" + tryexec; - if (::access(QFile::encodeName(fName), R_OK | X_OK) == 0) + TQString fName = *it + "/" + tryexec; + if (::access(TQFile::encodeName(fName), R_OK | X_OK) == 0) { match = true; m_exec = fName; @@ -125,7 +125,7 @@ bool KateExternalTool::checkExec() return false; } -bool KateExternalTool::valid( const QString &mt ) const +bool KateExternalTool::valid( const TQString &mt ) const { return mimetypes.isEmpty() || mimetypes.contains( mt ); } @@ -137,7 +137,7 @@ KateExternalToolsCommand::KateExternalToolsCommand() : Kate::Command() { reload(); } -QStringList KateExternalToolsCommand::cmds () { +TQStringList KateExternalToolsCommand::cmds () { return m_list; } @@ -153,10 +153,10 @@ void KateExternalToolsCommand::reload () { KConfig config("externaltools", false, false, "appdata"); config.setGroup("Global"); - QStringList tools = config.readListEntry("tools"); + TQStringList tools = config.readListEntry("tools"); - for( QStringList::Iterator it = tools.begin(); it != tools.end(); ++it ) + for( TQStringList::Iterator it = tools.begin(); it != tools.end(); ++it ) { if ( *it == "---" ) continue; @@ -185,8 +185,8 @@ void KateExternalToolsCommand::reload () { else m_inited=true; } -bool KateExternalToolsCommand::exec (Kate::View *view, const QString &cmd, QString &) { - QWidget *wv=dynamic_cast(view); +bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQString &) { + TQWidget *wv=dynamic_cast(view); if (!wv) { // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<icon.isEmpty() ) setIconSet( SmallIconSet( t->icon ) ); - connect( this ,SIGNAL(activated()), this, SLOT(slotRun()) ); + connect( this ,TQT_SIGNAL(activated()), this, TQT_SLOT(slotRun()) ); } -bool KateExternalToolAction::expandMacro( const QString &str, QStringList &ret ) +bool KateExternalToolAction::expandMacro( const TQString &str, TQStringList &ret ) { KateMainWindow *mw = (KateMainWindow*)parent()->parent(); @@ -244,9 +244,9 @@ bool KateExternalToolAction::expandMacro( const QString &str, QStringList &ret ) else if ( str == "filename" ) ret += mw->activeDocumentUrl().fileName(); else if ( str == "line" ) // cursor line of current doc - ret += QString::number( view->cursorLine() ); + ret += TQString::number( view->cursorLine() ); else if ( str == "col" ) // cursor col of current doc - ret += QString::number( view->cursorColumn() ); + ret += TQString::number( view->cursorColumn() ); else if ( str == "selection" ) // selection of current doc if any ret += view->getDoc()->selection(); else if ( str == "text" ) // text of current doc @@ -268,7 +268,7 @@ void KateExternalToolAction::slotRun() { // expand the macros in command if any, // and construct a command with an absolute path - QString cmd = tool->command; + TQString cmd = tool->command; if ( ! expandMacrosShellQuote( cmd ) ) { @@ -291,8 +291,8 @@ void KateExternalToolAction::slotRun() //END KateExternalToolAction //BEGIN KateExternalToolsMenuAction -KateExternalToolsMenuAction::KateExternalToolsMenuAction( const QString &text, - QObject *parent, +KateExternalToolsMenuAction::KateExternalToolsMenuAction( const TQString &text, + TQObject *parent, const char* name, KateMainWindow *mw ) : KActionMenu( text, parent, name ), @@ -301,7 +301,7 @@ KateExternalToolsMenuAction::KateExternalToolsMenuAction( const QString &text, m_actionCollection = new KActionCollection( mainwindow ); - connect(KateDocManager::self(),SIGNAL(documentChanged()),this,SLOT(slotDocumentChanged())); + connect(KateDocManager::self(),TQT_SIGNAL(documentChanged()),this,TQT_SLOT(slotDocumentChanged())); reload(); } @@ -314,21 +314,21 @@ void KateExternalToolsMenuAction::reload() // load all the tools, and create a action for each of them KConfig *config = new KConfig( "externaltools", false, false, "appdata" ); config->setGroup( "Global" ); - QStringList tools = config->readListEntry( "tools" ); + TQStringList tools = config->readListEntry( "tools" ); // if there are tools that are present but not explicitly removed, // add them to the end of the list config->setReadDefaults( true ); - QStringList dtools = config->readListEntry( "tools" ); + TQStringList dtools = config->readListEntry( "tools" ); int gver = config->readNumEntry( "version", 1 ); config->setReadDefaults( false ); int ver = config->readNumEntry( "version" ); if ( ver <= gver ) { - QStringList removed = config->readListEntry( "removed" ); + TQStringList removed = config->readListEntry( "removed" ); bool sepadded = false; - for (QStringList::iterator itg = dtools.begin(); itg != dtools.end(); ++itg ) + for (TQStringList::iterator itg = dtools.begin(); itg != dtools.end(); ++itg ) { if ( ! tools.contains( *itg ) && ! removed.contains( *itg ) ) @@ -347,7 +347,7 @@ void KateExternalToolsMenuAction::reload() config->writeEntry( "version", gver ); } - for( QStringList::Iterator it = tools.begin(); it != tools.end(); ++it ) + for( TQStringList::Iterator it = tools.begin(); it != tools.end(); ++it ) { if ( *it == "---" ) { @@ -383,8 +383,8 @@ void KateExternalToolsMenuAction::slotDocumentChanged() Kate::DocumentExt *de = documentExt( KateDocManager::self()->activeDocument() ); if ( de ) { - QString mt = de->mimeType(); - QStringList l; + TQString mt = de->mimeType(); + TQStringList l; bool b; KActionPtrList actions = m_actionCollection->actions(); @@ -404,14 +404,14 @@ void KateExternalToolsMenuAction::slotDocumentChanged() //BEGIN ToolItem /** - * This is a QListBoxItem, that has a KateExternalTool. The text is the Name + * This is a TQListBoxItem, that has a KateExternalTool. The text is the Name * of the tool. */ class ToolItem : public QListBoxPixmap { public: - ToolItem( QListBox *lb, const QPixmap &icon, KateExternalTool *tool ) - : QListBoxPixmap( lb, icon, tool->name ), + ToolItem( TQListBox *lb, const TQPixmap &icon, KateExternalTool *tool ) + : TQListBoxPixmap( lb, icon, tool->name ), tool ( tool ) {;} @@ -423,26 +423,26 @@ class ToolItem : public QListBoxPixmap //BEGIN KateExternalToolServiceEditor KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *tool, - QWidget *parent, const char *name ) + TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n("Edit External Tool"), KDialogBase::Ok|KDialogBase::Cancel ), tool( tool ) { // create a entry for each property // fill in the values from the service if available - QWidget *w = new QWidget( this ); + TQWidget *w = new TQWidget( this ); setMainWidget( w ); - QGridLayout *lo = new QGridLayout( w ); + TQGridLayout *lo = new TQGridLayout( w ); lo->setSpacing( KDialogBase::spacingHint() ); - QLabel *l; + TQLabel *l; - leName = new QLineEdit( w ); + leName = new TQLineEdit( w ); lo->addWidget( leName, 1, 2 ); - l = new QLabel( leName, i18n("&Label:"), w ); + l = new TQLabel( leName, i18n("&Label:"), w ); l->setAlignment( l->alignment()|Qt::AlignRight ); lo->addWidget( l, 1, 1 ); if ( tool ) leName->setText( tool->name ); - QWhatsThis::add( leName, i18n( + TQWhatsThis::add( leName, i18n( "The name will be displayed in the 'Tools->External' menu") ); btnIcon = new KIconButton( w ); @@ -451,13 +451,13 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * if ( tool && !tool->icon.isEmpty() ) btnIcon->setIcon( tool->icon ); - teCommand = new QTextEdit( w ); + teCommand = new TQTextEdit( w ); lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 ); - l = new QLabel( teCommand, i18n("S&cript:"), w ); + l = new TQLabel( teCommand, i18n("S&cript:"), w ); l->setAlignment( Qt::AlignTop|Qt::AlignRight ); lo->addWidget( l, 2, 1 ); if ( tool ) teCommand->setText( tool->command ); - QWhatsThis::add( teCommand, i18n( + TQWhatsThis::add( teCommand, i18n( "

The script to execute to invoke the tool. The script is passed " "to /bin/sh for execution. The following macros " "will be expanded:

" @@ -474,57 +474,57 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * "
  • %text - the text of the current document." ) ); - leExecutable = new QLineEdit( w ); + leExecutable = new TQLineEdit( w ); lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 ); - l = new QLabel( leExecutable, i18n("&Executable:"), w ); + l = new TQLabel( leExecutable, i18n("&Executable:"), w ); l->setAlignment( l->alignment()|Qt::AlignRight ); lo->addWidget( l, 3, 1 ); if ( tool ) leExecutable->setText( tool->tryexec ); - QWhatsThis::add( leExecutable, i18n( + TQWhatsThis::add( leExecutable, i18n( "The executable used by the command. This is used to check if a tool " "should be displayed; if not set, the first word of command " "will be used.") ); - leMimetypes = new QLineEdit( w ); + leMimetypes = new TQLineEdit( w ); lo->addWidget( leMimetypes, 4, 2 ); - l = new QLabel( leMimetypes, i18n("&Mime types:"), w ); + l = new TQLabel( leMimetypes, i18n("&Mime types:"), w ); l->setAlignment( l->alignment()|Qt::AlignRight ); lo->addWidget( l, 4, 1 ); if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") ); - QWhatsThis::add( leMimetypes, i18n( + TQWhatsThis::add( leMimetypes, i18n( "A semicolon-separated list of mime types for which this tool should " "be available; if this is left empty, the tool is always available. " "To choose from known mimetypes, press the button on the right.") ); - QToolButton *btnMTW = new QToolButton(w); + TQToolButton *btnMTW = new TQToolButton(w); lo->addWidget( btnMTW, 4, 3 ); - btnMTW->setIconSet(QIconSet(SmallIcon("wizard"))); - connect(btnMTW, SIGNAL(clicked()), this, SLOT(showMTDlg())); - QWhatsThis::add( btnMTW, i18n( + btnMTW->setIconSet(TQIconSet(SmallIcon("wizard"))); + connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg())); + TQWhatsThis::add( btnMTW, i18n( "Click for a dialog that can help you creating a list of mimetypes.") ); - cmbSave = new QComboBox(w); + cmbSave = new TQComboBox(w); lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 ); - l = new QLabel( cmbSave, i18n("&Save:"), w ); + l = new TQLabel( cmbSave, i18n("&Save:"), w ); l->setAlignment( l->alignment()|Qt::AlignRight ); lo->addWidget( l, 5, 1 ); - QStringList sl; + TQStringList sl; sl << i18n("None") << i18n("Current Document") << i18n("All Documents"); cmbSave->insertStringList( sl ); if ( tool ) cmbSave->setCurrentItem( tool->save ); - QWhatsThis::add( cmbSave, i18n( + TQWhatsThis::add( cmbSave, i18n( "You can elect to save the current or all [modified] documents prior to " "running the command. This is helpful if you want to pass URLs to " "an application like, for example, an FTP client.") ); - leCmdLine = new QLineEdit( w ); + leCmdLine = new TQLineEdit( w ); lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 ); - l = new QLabel( leCmdLine, i18n("&Command line name:"), w ); + l = new TQLabel( leCmdLine, i18n("&Command line name:"), w ); l->setAlignment( l->alignment()|Qt::AlignRight ); lo->addWidget( l, 6, 1 ); if ( tool ) leCmdLine->setText( tool->cmdname ); - QWhatsThis::add( leCmdLine, i18n( + TQWhatsThis::add( leCmdLine, i18n( "If you specify a name here, you can invoke the command from the view " "command lines with exttool-the_name_you_specified_here. " "Please do not use spaces or tabs in the name.")); @@ -545,8 +545,8 @@ void KateExternalToolServiceEditor::slotOk() void KateExternalToolServiceEditor::showMTDlg() { - QString text = i18n("Select the MimeTypes for which to enable this tool."); - QStringList list = QStringList::split( QRegExp("\\s*;\\s*"), leMimetypes->text() ); + TQString text = i18n("Select the MimeTypes for which to enable this tool."); + TQStringList list = TQStringList::split( TQRegExp("\\s*;\\s*"), leMimetypes->text() ); KMimeTypeChooserDialog d( i18n("Select Mime Types"), text, list, "text", this ); if ( d.exec() == KDialogBase::Accepted ) { leMimetypes->setText( d.chooser()->mimeTypes().join(";") ); @@ -555,41 +555,41 @@ void KateExternalToolServiceEditor::showMTDlg() //END KateExternalToolServiceEditor //BEGIN KateExternalToolsConfigWidget -KateExternalToolsConfigWidget::KateExternalToolsConfigWidget( QWidget *parent, const char* name ) +KateExternalToolsConfigWidget::KateExternalToolsConfigWidget( TQWidget *parent, const char* name ) : Kate::ConfigPage( parent, name ), m_changed( false ) { - QGridLayout *lo = new QGridLayout( this, 5, 5, 0, KDialog::spacingHint() ); + TQGridLayout *lo = new TQGridLayout( this, 5, 5, 0, KDialog::spacingHint() ); lbTools = new KListBox( this ); lo->addMultiCellWidget( lbTools, 1, 4, 0, 3 ); - connect( lbTools, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged()) ); + connect( lbTools, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); - btnNew = new QPushButton( i18n("&New..."), this ); + btnNew = new TQPushButton( i18n("&New..."), this ); lo->addWidget( btnNew, 5, 0 ); - connect( btnNew, SIGNAL(clicked()), this, SLOT(slotNew()) ); + connect( btnNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()) ); - btnRemove = new QPushButton( i18n("&Remove"), this ); + btnRemove = new TQPushButton( i18n("&Remove"), this ); lo->addWidget( btnRemove, 5, 2 ); - connect( btnRemove, SIGNAL(clicked()), this, SLOT(slotRemove()) ); + connect( btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemove()) ); - btnEdit = new QPushButton( i18n("&Edit..."), this ); + btnEdit = new TQPushButton( i18n("&Edit..."), this ); lo->addWidget( btnEdit, 5, 1 ); - connect( btnEdit, SIGNAL(clicked()), this, SLOT(slotEdit()) ); + connect( btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit()) ); - QPushButton *b = new QPushButton( i18n("Insert &Separator"), this ); + TQPushButton *b = new TQPushButton( i18n("Insert &Separator"), this ); lo->addWidget( b, 5, 3 ); - connect( b, SIGNAL(clicked()), this, SLOT(slotInsertSeparator()) ); + connect( b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInsertSeparator()) ); - btnMoveUp = new QPushButton( SmallIconSet("up"), "", this ); + btnMoveUp = new TQPushButton( SmallIconSet("up"), "", this ); lo->addWidget( btnMoveUp, 2, 4 ); - connect( btnMoveUp, SIGNAL(clicked()), this, SLOT(slotMoveUp()) ); + connect( btnMoveUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveUp()) ); - btnMoveDwn = new QPushButton( SmallIconSet("down"), "", this ); + btnMoveDwn = new TQPushButton( SmallIconSet("down"), "", this ); lo->addWidget( btnMoveDwn, 3, 4 ); - connect( btnMoveDwn, SIGNAL(clicked()), this, SLOT(slotMoveDown()) ); + connect( btnMoveDwn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDown()) ); - connect( lbTools, SIGNAL( doubleClicked ( QListBoxItem * ) ), this, SLOT( slotEdit() ) ); + connect( lbTools, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), this, TQT_SLOT( slotEdit() ) ); lo->setRowStretch( 1, 1 ); lo->setRowStretch( 4, 1 ); @@ -598,7 +598,7 @@ KateExternalToolsConfigWidget::KateExternalToolsConfigWidget( QWidget *parent, c lo->setColStretch( 2, 1 ); - QWhatsThis::add( lbTools, i18n( + TQWhatsThis::add( lbTools, i18n( "This list shows all the configured tools, represented by their menu text.") ); config = new KConfig("externaltools", false, false, "appdata"); @@ -618,13 +618,13 @@ void KateExternalToolsConfigWidget::reload() // load the files from a KConfig config->setGroup( "Global" ); - QStringList tools = config->readListEntry("tools"); + TQStringList tools = config->readListEntry("tools"); - for( QStringList::Iterator it = tools.begin(); it != tools.end(); ++it ) + for( TQStringList::Iterator it = tools.begin(); it != tools.end(); ++it ) { if ( *it == "---" ) { - new QListBoxText( lbTools, "---" ); + new TQListBoxText( lbTools, "---" ); } else { @@ -647,9 +647,9 @@ void KateExternalToolsConfigWidget::reload() m_changed = false; } -QPixmap KateExternalToolsConfigWidget::blankIcon() +TQPixmap KateExternalToolsConfigWidget::blankIcon() { - QPixmap pm( KIcon::SizeSmall, KIcon::SizeSmall ); + TQPixmap pm( KIcon::SizeSmall, KIcon::SizeSmall ); pm.fill(); pm.setMask( pm.createHeuristicMask() ); return pm; @@ -663,7 +663,7 @@ void KateExternalToolsConfigWidget::apply() // save a new list // save each item - QStringList tools; + TQStringList tools; for ( uint i = 0; i < lbTools->count(); i++ ) { if ( lbTools->text( i ) == "---" ) @@ -693,18 +693,18 @@ void KateExternalToolsConfigWidget::apply() // add the group names to the list of removed items. if ( m_removed.count() ) { - for ( QStringList::iterator it = m_removed.begin(); it != m_removed.end(); ++it ) + for ( TQStringList::iterator it = m_removed.begin(); it != m_removed.end(); ++it ) { if ( config->hasGroup( *it ) ) config->deleteGroup( *it ); } - QStringList removed = config->readListEntry( "removed" ); + TQStringList removed = config->readListEntry( "removed" ); removed += m_removed; // clean up the list of removed items, so that it does not contain // non-existing groups (we can't remove groups from a non-owned global file). config->sync(); - QStringList::iterator it1 = removed.begin(); + TQStringList::iterator it1 = removed.begin(); while( it1 != removed.end() ) { if ( ! config->hasGroup( *it1 ) ) @@ -741,11 +741,11 @@ void KateExternalToolsConfigWidget::slotNew() editor.teCommand->text(), editor.btnIcon->icon(), editor.leExecutable->text(), - QStringList::split( QRegExp("\\s*;\\s*"), editor.leMimetypes->text() ) ); + TQStringList::split( TQRegExp("\\s*;\\s*"), editor.leMimetypes->text() ) ); // This is sticky, it does not change again, so that shortcuts sticks // TODO check for dups - t->acname = "externaltool_" + QString(t->name).replace( QRegExp("\\W+"), "" ); + t->acname = "externaltool_" + TQString(t->name).replace( TQRegExp("\\W+"), "" ); new ToolItem ( lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon( t->icon ), t ); @@ -787,7 +787,7 @@ void KateExternalToolsConfigWidget::slotEdit() t->command = editor.teCommand->text(); t->icon = editor.btnIcon->icon(); t->tryexec = editor.leExecutable->text(); - t->mimetypes = QStringList::split( QRegExp("\\s*;\\s*"), editor.leMimetypes->text() ); + t->mimetypes = TQStringList::split( TQRegExp("\\s*;\\s*"), editor.leMimetypes->text() ); t->save = editor.cmbSave->currentItem(); //if the icon has changed or name changed, I have to renew the listbox item :S @@ -817,7 +817,7 @@ void KateExternalToolsConfigWidget::slotInsertSeparator() void KateExternalToolsConfigWidget::slotMoveUp() { // move the current item in the listbox upwards if possible - QListBoxItem *item = lbTools->selectedItem(); + TQListBoxItem *item = lbTools->selectedItem(); if ( ! item ) return; int idx = lbTools->index( item ); @@ -833,7 +833,7 @@ void KateExternalToolsConfigWidget::slotMoveUp() else // a separator! { lbTools->removeItem( idx ); - lbTools->insertItem( new QListBoxText( 0, "---" ), idx-1 ); + lbTools->insertItem( new TQListBoxText( 0, "---" ), idx-1 ); } lbTools->setCurrentItem( idx - 1 ); @@ -845,7 +845,7 @@ void KateExternalToolsConfigWidget::slotMoveUp() void KateExternalToolsConfigWidget::slotMoveDown() { // move the current item in the listbox downwards if possible - QListBoxItem *item = lbTools->selectedItem(); + TQListBoxItem *item = lbTools->selectedItem(); if ( ! item ) return; uint idx = lbTools->index( item ); @@ -861,7 +861,7 @@ void KateExternalToolsConfigWidget::slotMoveDown() else // a separator! { lbTools->removeItem( idx ); - lbTools->insertItem( new QListBoxText( 0, "---" ), idx+1 ); + lbTools->insertItem( new TQListBoxText( 0, "---" ), idx+1 ); } lbTools->setCurrentItem( idx+1 ); diff --git a/kate/app/kateexternaltools.h b/kate/app/kateexternaltools.h index 4a5ecdacc..507e1cfca 100644 --- a/kate/app/kateexternaltools.h +++ b/kate/app/kateexternaltools.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include /** * The external tools action @@ -57,7 +57,7 @@ class KateExternalToolsMenuAction : public KActionMenu Q_OBJECT public: - KateExternalToolsMenuAction( const QString &text=QString::null, QObject *parent=0, const char* name=0, class KateMainWindow *mw=0 ); + KateExternalToolsMenuAction( const TQString &text=TQString::null, TQObject *parent=0, const char* name=0, class KateMainWindow *mw=0 ); ~KateExternalToolsMenuAction() {}; /** @@ -82,10 +82,10 @@ class KateExternalToolAction : public KAction, public KWordMacroExpander { Q_OBJECT public: - KateExternalToolAction( QObject *parent, const char *name, class KateExternalTool *t ); + KateExternalToolAction( TQObject *parent, const char *name, class KateExternalTool *t ); ~KateExternalToolAction(); protected: - virtual bool expandMacro( const QString &str, QStringList &ret ); + virtual bool expandMacro( const TQString &str, TQStringList &ret ); private slots: void slotRun(); @@ -100,30 +100,30 @@ class KateExternalToolAction : public KAction, public KWordMacroExpander class KateExternalTool { public: - KateExternalTool( const QString &name=QString::null, - const QString &command=QString::null, - const QString &icon=QString::null, - const QString &tryexec=QString::null, - const QStringList &mimetypes=QStringList(), - const QString &acname=QString::null, - const QString &cmdname=QString::null, + KateExternalTool( const TQString &name=TQString::null, + const TQString &command=TQString::null, + const TQString &icon=TQString::null, + const TQString &tryexec=TQString::null, + const TQStringList &mimetypes=TQStringList(), + const TQString &acname=TQString::null, + const TQString &cmdname=TQString::null, int save=0 ); ~KateExternalTool() {}; - QString name; ///< The name used in the menu. - QString command; ///< The command to execute. - QString icon; ///< the icon to use in the menu. - QString tryexec; ///< The name or path of the executable. - QStringList mimetypes; ///< Optional list of mimetypes for which this action is valid. + TQString name; ///< The name used in the menu. + TQString command; ///< The command to execute. + TQString icon; ///< the icon to use in the menu. + TQString tryexec; ///< The name or path of the executable. + TQStringList mimetypes; ///< Optional list of mimetypes for which this action is valid. bool hasexec; ///< This is set by the constructor by calling checkExec(), if a value is present. - QString acname; ///< The name for the action. This is generated first time the action is is created. - QString cmdname; ///< The name for the commandline. + TQString acname; ///< The name for the action. This is generated first time the action is is created. + TQString cmdname; ///< The name for the commandline. int save; ///< We can save documents prior to activating the tool command: 0 = nothing, 1 = current document, 2 = all documents. /** * @return true if mimetypes is empty, or the @p mimetype matches. */ - bool valid( const QString &mimetype ) const; + bool valid( const TQString &mimetype ) const; /** * @return true if "tryexec" exists and has the executable bit set, or is * empty. @@ -132,7 +132,7 @@ class KateExternalTool bool checkExec(); private: - QString m_exec; ///< The fully qualified path of the executable. + TQString m_exec; ///< The fully qualified path of the executable. }; /** @@ -144,7 +144,7 @@ class KateExternalToolsConfigWidget : public Kate::ConfigPage { Q_OBJECT public: - KateExternalToolsConfigWidget( QWidget *parent, const char* name); + KateExternalToolsConfigWidget( TQWidget *parent, const char* name); virtual ~KateExternalToolsConfigWidget(); virtual void apply(); @@ -164,12 +164,12 @@ class KateExternalToolsConfigWidget : public Kate::ConfigPage void slotSelectionChanged(); private: - QPixmap blankIcon(); + TQPixmap blankIcon(); - QStringList m_removed; + TQStringList m_removed; class KListBox *lbTools; - class QPushButton *btnNew, *btnRemove, *btnEdit, *btnMoveUp, *btnMoveDwn; + class TQPushButton *btnNew, *btnRemove, *btnEdit, *btnMoveUp, *btnMoveDwn; class KConfig *config; @@ -186,13 +186,13 @@ class KateExternalToolsConfigWidget : public Kate::ConfigPage static KateExternalToolsCommand *self(); void reload(); public: - virtual QStringList cmds (); - virtual bool exec (Kate::View *view, const QString &cmd, QString &msg); - virtual bool help (Kate::View *view, const QString &cmd, QString &msg); + virtual TQStringList cmds (); + virtual bool exec (Kate::View *view, const TQString &cmd, TQString &msg); + virtual bool help (Kate::View *view, const TQString &cmd, TQString &msg); private: static KateExternalToolsCommand *s_self; - QStringList m_list; - QMap m_map; + TQStringList m_list; + TQMap m_map; bool m_inited; }; @@ -206,12 +206,12 @@ class KateExternalToolServiceEditor : public KDialogBase public: KateExternalToolServiceEditor( KateExternalTool *tool=0, - QWidget *parent=0, const char *name=0 ); + TQWidget *parent=0, const char *name=0 ); - class QLineEdit *leName, *leExecutable, *leMimetypes,*leCmdLine; - class QTextEdit *teCommand; + class TQLineEdit *leName, *leExecutable, *leMimetypes,*leCmdLine; + class TQTextEdit *teCommand; class KIconButton *btnIcon; - class QComboBox *cmbSave; + class TQComboBox *cmbSave; private slots: /** diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp index 8c350d45a..47c8aa75b 100644 --- a/kate/app/katefilelist.cpp +++ b/kate/app/katefilelist.cpp @@ -26,17 +26,17 @@ #include "kateviewmanager.h" #include "katemainwindow.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -54,16 +54,16 @@ class ToolTip : public QToolTip { public: - ToolTip( QWidget *parent, KateFileList *lv ) - : QToolTip( parent ), + ToolTip( TQWidget *parent, KateFileList *lv ) + : TQToolTip( parent ), m_listView( lv ) { } virtual ~ToolTip() {}; - void maybeTip( const QPoint &pos ) + void maybeTip( const TQPoint &pos ) { - QListViewItem *i = m_listView->itemAt( pos ); + TQListViewItem *i = m_listView->itemAt( pos ); if ( ! i ) return; KateFileListItem *item = ((KateFileListItem*)i); @@ -82,7 +82,7 @@ class ToolTip : public QToolTip //BEGIN KateFileList KateFileList::KateFileList (KateMainWindow *main, KateViewManager *_viewManager, - QWidget * parent, const char * name ) + TQWidget * parent, const char * name ) : KListView (parent, name) , m_sort( KateFileList::sortByID ) { @@ -90,18 +90,18 @@ KateFileList::KateFileList (KateMainWindow *main, m_tooltip = new ToolTip( viewport(), this ); // default colors - m_viewShade = QColor( 51, 204, 255 ); - m_editShade = QColor( 255, 102, 153 ); + m_viewShade = TQColor( 51, 204, 255 ); + m_editShade = TQColor( 255, 102, 153 ); m_enableBgShading = false; - setFocusPolicy ( QWidget::NoFocus ); + setFocusPolicy ( TQWidget::NoFocus ); viewManager = _viewManager; header()->hide(); addColumn("Document Name"); - setSelectionMode( QListView::Single ); + setSelectionMode( TQListView::Single ); setSorting( 0, true ); setShowToolTips( false ); @@ -113,18 +113,18 @@ KateFileList::KateFileList (KateMainWindow *main, slotModChanged (KateDocManager::self()->document(i)); } - connect(KateDocManager::self(),SIGNAL(documentCreated(Kate::Document *)), - this,SLOT(slotDocumentCreated(Kate::Document *))); - connect(KateDocManager::self(),SIGNAL(documentDeleted(uint)), - this,SLOT(slotDocumentDeleted(uint))); + connect(KateDocManager::self(),TQT_SIGNAL(documentCreated(Kate::Document *)), + this,TQT_SLOT(slotDocumentCreated(Kate::Document *))); + connect(KateDocManager::self(),TQT_SIGNAL(documentDeleted(uint)), + this,TQT_SLOT(slotDocumentDeleted(uint))); // don't Honour KDE single/double click setting, this files are already open, // no need for hassle of considering double-click - connect(this,SIGNAL(selectionChanged(QListViewItem *)), - this,SLOT(slotActivateView(QListViewItem *))); - connect(viewManager,SIGNAL(viewChanged()), this,SLOT(slotViewChanged())); - connect(this,SIGNAL(contextMenuRequested( QListViewItem *, const QPoint &, int )), - this,SLOT(slotMenu ( QListViewItem *, const QPoint &, int ))); + connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem *)), + this,TQT_SLOT(slotActivateView(TQListViewItem *))); + connect(viewManager,TQT_SIGNAL(viewChanged()), this,TQT_SLOT(slotViewChanged())); + connect(this,TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint &, int )), + this,TQT_SLOT(slotMenu ( TQListViewItem *, const TQPoint &, int ))); } KateFileList::~KateFileList () @@ -134,14 +134,14 @@ KateFileList::~KateFileList () void KateFileList::setupActions () { - windowNext = KStdAction::back(this, SLOT(slotPrevDocument()), m_main->actionCollection()); - windowPrev = KStdAction::forward(this, SLOT(slotNextDocument()), m_main->actionCollection()); + windowNext = KStdAction::back(this, TQT_SLOT(slotPrevDocument()), m_main->actionCollection()); + windowPrev = KStdAction::forward(this, TQT_SLOT(slotNextDocument()), m_main->actionCollection()); sortAction = new KSelectAction( i18n("Sort &By"), 0, m_main->actionCollection(), "filelist_sortby" ); - QStringList l; + TQStringList l; l << i18n("Opening Order") << i18n("Document Name") << i18n("URL"); sortAction->setItems( l ); - connect( sortAction, SIGNAL(activated(int)), this, SLOT(setSortType(int)) ); + connect( sortAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setSortType(int)) ); } void KateFileList::updateActions () @@ -150,7 +150,7 @@ void KateFileList::updateActions () windowPrev->setEnabled(KateDocManager::self()->documents() > 1); } -void KateFileList::keyPressEvent(QKeyEvent *e) { +void KateFileList::keyPressEvent(TQKeyEvent *e) { if ( ( e->key() == Key_Return ) || ( e->key() == Key_Enter ) ) { e->accept(); @@ -166,7 +166,7 @@ void KateFileList::keyPressEvent(QKeyEvent *e) { // leftclick outside items. // ### if we get to accept keyboard navigation, set focus before // returning -void KateFileList::contentsMousePressEvent( QMouseEvent *e ) +void KateFileList::contentsMousePressEvent( TQMouseEvent *e ) { if ( ! itemAt( contentsToViewport( e->pos() ) ) ) return; @@ -174,7 +174,7 @@ void KateFileList::contentsMousePressEvent( QMouseEvent *e ) KListView::contentsMousePressEvent( e ); } -void KateFileList::resizeEvent( QResizeEvent *e ) +void KateFileList::resizeEvent( TQResizeEvent *e ) { KListView::resizeEvent( e ); @@ -217,9 +217,9 @@ void KateFileList::slotPrevDocument() void KateFileList::slotDocumentCreated (Kate::Document *doc) { new KateFileListItem( this, doc/*, doc->documentNumber()*/ ); - connect(doc,SIGNAL(modStateChanged(Kate::Document *)),this,SLOT(slotModChanged(Kate::Document *))); - connect(doc,SIGNAL(nameChanged(Kate::Document *)),this,SLOT(slotNameChanged(Kate::Document *))); - connect(doc,SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char))); + connect(doc,TQT_SIGNAL(modStateChanged(Kate::Document *)),this,TQT_SLOT(slotModChanged(Kate::Document *))); + connect(doc,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(slotNameChanged(Kate::Document *))); + connect(doc,TQT_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,TQT_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char))); sort(); updateActions (); @@ -227,7 +227,7 @@ void KateFileList::slotDocumentCreated (Kate::Document *doc) void KateFileList::slotDocumentDeleted (uint documentNumber) { - QListViewItem * item = firstChild(); + TQListViewItem * item = firstChild(); while( item ) { if ( ((KateFileListItem *)item)->documentNumber() == documentNumber ) { @@ -244,7 +244,7 @@ void KateFileList::slotDocumentDeleted (uint documentNumber) updateActions (); } -void KateFileList::slotActivateView( QListViewItem *item ) +void KateFileList::slotActivateView( TQListViewItem *item ) { if ( ! item || item->rtti() != RTTI_KateFileListItem ) return; @@ -256,7 +256,7 @@ void KateFileList::slotModChanged (Kate::Document *doc) { if (!doc) return; - QListViewItem * item = firstChild(); + TQListViewItem * item = firstChild(); while( item ) { if ( ((KateFileListItem *)item)->documentNumber() == doc->documentNumber() ) @@ -291,7 +291,7 @@ void KateFileList::slotNameChanged (Kate::Document *doc) // ### using nextSibling to *only* look at toplevel items. // child items could be marks for example - QListViewItem * item = firstChild(); + TQListViewItem * item = firstChild(); while( item ) { if ( ((KateFileListItem*)item)->document() == doc ) { @@ -311,7 +311,7 @@ void KateFileList::slotViewChanged () Kate::View *view = viewManager->activeView(); uint dn = view->getDoc()->documentNumber(); - QListViewItem * i = firstChild(); + TQListViewItem * i = firstChild(); while( i ) { if ( ((KateFileListItem *)i)->documentNumber() == dn ) { @@ -348,23 +348,23 @@ void KateFileList::slotViewChanged () } -void KateFileList::slotMenu ( QListViewItem *item, const QPoint &p, int /*col*/ ) +void KateFileList::slotMenu ( TQListViewItem *item, const TQPoint &p, int /*col*/ ) { if (!item) return; - QPopupMenu *menu = (QPopupMenu*) ((viewManager->mainWindow())->factory()->container("filelist_popup", viewManager->mainWindow())); + TQPopupMenu *menu = (TQPopupMenu*) ((viewManager->mainWindow())->factory()->container("filelist_popup", viewManager->mainWindow())); if (menu) menu->exec(p); } -QString KateFileList::tooltip( QListViewItem *item, int ) +TQString KateFileList::tooltip( TQListViewItem *item, int ) { KateFileListItem *i = ((KateFileListItem*)item); - if ( ! i ) return QString::null; + if ( ! i ) return TQString::null; - QString str; + TQString str; const KateDocumentInfo *info = KateDocManager::self()->documentInfo(i->document()); if (info && info->modifiedOnDisc) @@ -393,9 +393,9 @@ void KateFileList::updateSort () sort (); } -void KateFileList::readConfig( KConfig *config, const QString &group ) +void KateFileList::readConfig( KConfig *config, const TQString &group ) { - QString oldgroup = config->group(); + TQString oldgroup = config->group(); config->setGroup( group ); setSortType( config->readNumEntry( "Sort Type", sortByID ) ); @@ -408,9 +408,9 @@ void KateFileList::readConfig( KConfig *config, const QString &group ) config->setGroup( oldgroup ); } -void KateFileList::writeConfig( KConfig *config, const QString &group ) +void KateFileList::writeConfig( KConfig *config, const TQString &group ) { - QString oldgroup = config->group(); + TQString oldgroup = config->group(); config->setGroup( group ); config->writeEntry( "Sort Type", m_sort ); @@ -421,21 +421,21 @@ void KateFileList::writeConfig( KConfig *config, const QString &group ) config->setGroup( oldgroup ); } -void KateFileList::takeItem( QListViewItem *item ) +void KateFileList::takeItem( TQListViewItem *item ) { if ( item->rtti() == RTTI_KateFileListItem ) { m_editHistory.removeRef( (KateFileListItem*)item ); m_viewHistory.removeRef( (KateFileListItem*)item ); } - QListView::takeItem( item ); + TQListView::takeItem( item ); } //END KateFileList //BEGIN KateFileListItem -KateFileListItem::KateFileListItem( QListView* lv, +KateFileListItem::KateFileListItem( TQListView* lv, Kate::Document *_doc ) - : QListViewItem( lv, _doc->docName() ), + : TQListViewItem( lv, _doc->docName() ), doc( _doc ), m_viewhistpos( 0 ), m_edithistpos( 0 ), @@ -447,13 +447,13 @@ KateFileListItem::~KateFileListItem() { } -const QPixmap *KateFileListItem::pixmap ( int column ) const +const TQPixmap *KateFileListItem::pixmap ( int column ) const { if ( column == 0) { - static QPixmap noPm = SmallIcon ("null"); - static QPixmap modPm = SmallIcon("modified"); - static QPixmap discPm = SmallIcon("modonhd"); - static QPixmap modmodPm = SmallIcon("modmod"); + static TQPixmap noPm = SmallIcon ("null"); + static TQPixmap modPm = SmallIcon("modified"); + static TQPixmap discPm = SmallIcon("modonhd"); + static TQPixmap modmodPm = SmallIcon("modmod"); const KateDocumentInfo *info = KateDocManager::self()->documentInfo(doc); @@ -466,22 +466,22 @@ const QPixmap *KateFileListItem::pixmap ( int column ) const return 0; } -void KateFileListItem::paintCell( QPainter *painter, const QColorGroup & cg, int column, int width, int align ) +void KateFileListItem::paintCell( TQPainter *painter, const TQColorGroup & cg, int column, int width, int align ) { KateFileList *fl = (KateFileList*)listView(); if ( ! fl ) return; if ( column == 0 ) { - QColorGroup cgNew = cg; + TQColorGroup cgNew = cg; // replace the base color with a different shading if necessary... if ( fl->shadingEnabled() && m_viewhistpos > 1 ) { - QColor b( cg.base() ); + TQColor b( cg.base() ); - QColor shade = fl->viewShade(); - QColor eshade = fl->editShade(); + TQColor shade = fl->viewShade(); + TQColor eshade = fl->editShade(); int hc = fl->histCount(); // If this file is in the edit history, blend in the eshade // color. The blend is weighted by the position in the editing history @@ -507,16 +507,16 @@ void KateFileListItem::paintCell( QPainter *painter, const QColorGroup & cg, int (int)((b.blue()*(1-t)) + (shade.blue()*t)) ); - cgNew.setColor(QColorGroup::Base, b); + cgNew.setColor(TQColorGroup::Base, b); } - QListViewItem::paintCell( painter, cgNew, column, width, align ); + TQListViewItem::paintCell( painter, cgNew, column, width, align ); } else - QListViewItem::paintCell( painter, cg, column, width, align ); + TQListViewItem::paintCell( painter, cg, column, width, align ); } -int KateFileListItem::compare ( QListViewItem * i, int col, bool ascending ) const +int KateFileListItem::compare ( TQListViewItem * i, int col, bool ascending ) const { if ( i->rtti() == RTTI_KateFileListItem ) { @@ -533,7 +533,7 @@ int KateFileListItem::compare ( QListViewItem * i, int col, bool ascending ) con return doc->url().prettyURL().compare( ((KateFileListItem*)i)->document()->url().prettyURL() ); break; default: - return QListViewItem::compare( i, col, ascending ); + return TQListViewItem::compare( i, col, ascending ); } } return 0; @@ -541,68 +541,68 @@ int KateFileListItem::compare ( QListViewItem * i, int col, bool ascending ) con //END KateFileListItem //BEGIN KFLConfigPage -KFLConfigPage::KFLConfigPage( QWidget* parent, const char *name, KateFileList *fl ) +KFLConfigPage::KFLConfigPage( TQWidget* parent, const char *name, KateFileList *fl ) : Kate::ConfigPage( parent, name ), m_filelist( fl ), m_changed( false ) { - QVBoxLayout *lo1 = new QVBoxLayout( this ); + TQVBoxLayout *lo1 = new TQVBoxLayout( this ); int spacing = KDialog::spacingHint(); lo1->setSpacing( spacing ); - QGroupBox *gb = new QGroupBox( 1, Qt::Horizontal, i18n("Background Shading"), this ); + TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Background Shading"), this ); lo1->addWidget( gb ); - QWidget *g = new QWidget( gb ); - QGridLayout *lo = new QGridLayout( g, 2, 2 ); + TQWidget *g = new TQWidget( gb ); + TQGridLayout *lo = new TQGridLayout( g, 2, 2 ); lo->setSpacing( KDialog::spacingHint() ); - cbEnableShading = new QCheckBox( i18n("&Enable background shading"), g ); + cbEnableShading = new TQCheckBox( i18n("&Enable background shading"), g ); lo->addMultiCellWidget( cbEnableShading, 1, 1, 0, 1 ); kcbViewShade = new KColorButton( g ); - lViewShade = new QLabel( kcbViewShade, i18n("&Viewed documents' shade:"), g ); + lViewShade = new TQLabel( kcbViewShade, i18n("&Viewed documents' shade:"), g ); lo->addWidget( lViewShade, 2, 0 ); lo->addWidget( kcbViewShade, 2, 1 ); kcbEditShade = new KColorButton( g ); - lEditShade = new QLabel( kcbEditShade, i18n("&Modified documents' shade:"), g ); + lEditShade = new TQLabel( kcbEditShade, i18n("&Modified documents' shade:"), g ); lo->addWidget( lEditShade, 3, 0 ); lo->addWidget( kcbEditShade, 3, 1 ); // sorting - QHBox *hbSorting = new QHBox( this ); + TQHBox *hbSorting = new TQHBox( this ); lo1->addWidget( hbSorting ); - lSort = new QLabel( i18n("&Sort by:"), hbSorting ); - cmbSort = new QComboBox( hbSorting ); + lSort = new TQLabel( i18n("&Sort by:"), hbSorting ); + cmbSort = new TQComboBox( hbSorting ); lSort->setBuddy( cmbSort ); - QStringList l; + TQStringList l; l << i18n("Opening Order") << i18n("Document Name") << i18n("URL"); cmbSort->insertStringList( l ); lo1->insertStretch( -1, 10 ); - QWhatsThis::add( cbEnableShading, i18n( + TQWhatsThis::add( cbEnableShading, i18n( "When background shading is enabled, documents that have been viewed " "or edited within the current session will have a shaded background. " "The most recent documents have the strongest shade.") ); - QWhatsThis::add( kcbViewShade, i18n( + TQWhatsThis::add( kcbViewShade, i18n( "Set the color for shading viewed documents.") ); - QWhatsThis::add( kcbEditShade, i18n( + TQWhatsThis::add( kcbEditShade, i18n( "Set the color for modified documents. This color is blended into " "the color for viewed files. The most recently edited documents get " "most of this color.") ); - QWhatsThis::add( cmbSort, i18n( + TQWhatsThis::add( cmbSort, i18n( "Set the sorting method for the documents.") ); reload(); slotEnableChanged(); - connect( cbEnableShading, SIGNAL(toggled(bool)), this, SLOT(slotMyChanged()) ); - connect( cbEnableShading, SIGNAL(toggled(bool)), this, SLOT(slotEnableChanged()) ); - connect( kcbViewShade, SIGNAL(changed(const QColor&)), this, SLOT(slotMyChanged()) ); - connect( kcbEditShade, SIGNAL(changed(const QColor&)), this, SLOT(slotMyChanged()) ); - connect( cmbSort, SIGNAL(activated(int)), this, SLOT(slotMyChanged()) ); + connect( cbEnableShading, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotMyChanged()) ); + connect( cbEnableShading, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableChanged()) ); + connect( kcbViewShade, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotMyChanged()) ); + connect( kcbEditShade, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotMyChanged()) ); + connect( cmbSort, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMyChanged()) ); } void KFLConfigPage::apply() diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h index 7615eb63d..e90281558 100644 --- a/kate/app/katefilelist.h +++ b/kate/app/katefilelist.h @@ -27,9 +27,9 @@ #include -#include -#include -#include +#include +#include +#include #define RTTI_KateFileListItem 1001 @@ -41,7 +41,7 @@ class KSelectAction; class KateFileListItem : public QListViewItem { public: - KateFileListItem( QListView *lv, + KateFileListItem( TQListView *lv, Kate::Document *doc ); ~KateFileListItem(); @@ -60,12 +60,12 @@ class KateFileListItem : public QListViewItem void setEditHistPos( int p ) { m_edithistpos = p; } protected: - virtual const QPixmap *pixmap ( int column ) const; - void paintCell( QPainter *painter, const QColorGroup & cg, int column, int width, int align ); + virtual const TQPixmap *pixmap ( int column ) const; + void paintCell( TQPainter *painter, const TQColorGroup & cg, int column, int width, int align ); /** * Reimplemented so we can sort by a number of different document properties. */ - int compare ( QListViewItem * i, int col, bool ascending ) const; + int compare ( TQListViewItem * i, int col, bool ascending ) const; private: Kate::Document *doc; @@ -81,7 +81,7 @@ class KateFileList : public KListView friend class KFLConfigPage; public: - KateFileList (KateMainWindow *main, KateViewManager *_viewManager, QWidget * parent = 0, const char * name = 0 ); + KateFileList (KateMainWindow *main, KateViewManager *_viewManager, TQWidget * parent = 0, const char * name = 0 ); ~KateFileList (); int sortType () const { return m_sort; }; @@ -93,21 +93,21 @@ class KateFileList : public KListView sortByURL = 2 }; - QString tooltip( QListViewItem *item, int ); + TQString tooltip( TQListViewItem *item, int ); uint histCount() const { return m_viewHistory.count(); } uint editHistCount() const { return m_editHistory.count(); } - QColor editShade() const { return m_editShade; } - QColor viewShade() const { return m_viewShade; } + TQColor editShade() const { return m_editShade; } + TQColor viewShade() const { return m_viewShade; } bool shadingEnabled() { return m_enableBgShading; } - void readConfig( class KConfig *config, const QString &group ); - void writeConfig( class KConfig *config, const QString &group ); + void readConfig( class KConfig *config, const TQString &group ); + void writeConfig( class KConfig *config, const TQString &group ); /** * reimplemented to remove the item from the history stacks */ - void takeItem( QListViewItem * ); + void takeItem( TQListViewItem * ); public slots: void setSortType (int s); @@ -117,25 +117,25 @@ class KateFileList : public KListView private slots: void slotDocumentCreated (Kate::Document *doc); void slotDocumentDeleted (uint documentNumber); - void slotActivateView( QListViewItem *item ); + void slotActivateView( TQListViewItem *item ); void slotModChanged (Kate::Document *doc); void slotModifiedOnDisc (Kate::Document *doc, bool b, unsigned char reason); void slotNameChanged (Kate::Document *doc); void slotViewChanged (); - void slotMenu ( QListViewItem *item, const QPoint &p, int col ); + void slotMenu ( TQListViewItem *item, const TQPoint &p, int col ); protected: - virtual void keyPressEvent( QKeyEvent *e ); + virtual void keyPressEvent( TQKeyEvent *e ); /** * Reimplemented to force Single mode for real: * don't let a mouse click outside items deselect. */ - virtual void contentsMousePressEvent( QMouseEvent *e ); + virtual void contentsMousePressEvent( TQMouseEvent *e ); /** * Reimplemented to make sure the first (and only) column is at least * the width of the viewport */ - virtual void resizeEvent( QResizeEvent *e ); + virtual void resizeEvent( TQResizeEvent *e ); private: void setupActions (); @@ -152,10 +152,10 @@ class KateFileList : public KListView KAction* windowPrev; KSelectAction* sortAction; - QPtrList m_viewHistory; - QPtrList m_editHistory; + TQPtrList m_viewHistory; + TQPtrList m_editHistory; - QColor m_viewShade, m_editShade; + TQColor m_viewShade, m_editShade; bool m_enableBgShading; class ToolTip *m_tooltip; @@ -164,7 +164,7 @@ class KateFileList : public KListView class KFLConfigPage : public Kate::ConfigPage { Q_OBJECT public: - KFLConfigPage( QWidget* parent=0, const char *name=0, KateFileList *fl=0 ); + KFLConfigPage( TQWidget* parent=0, const char *name=0, KateFileList *fl=0 ); virtual ~KFLConfigPage() {}; virtual void apply(); @@ -177,10 +177,10 @@ class KFLConfigPage : public Kate::ConfigPage { void slotMyChanged(); private: - class QCheckBox *cbEnableShading; + class TQCheckBox *cbEnableShading; class KColorButton *kcbViewShade, *kcbEditShade; - class QLabel *lEditShade, *lViewShade, *lSort; - class QComboBox *cmbSort; + class TQLabel *lEditShade, *lViewShade, *lSort; + class TQComboBox *cmbSort; KateFileList *m_filelist; bool m_changed; diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp index bdc39fc9a..5ab42a289 100644 --- a/kate/app/katefileselector.cpp +++ b/kate/app/katefileselector.cpp @@ -28,24 +28,24 @@ #include "kactionselector.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include @@ -70,7 +70,7 @@ static void silenceQToolBar(QtMsgType, const char *){} // helper classes to be able to have a toolbar without move handle -KateFileSelectorToolBar::KateFileSelectorToolBar(QWidget *parent) +KateFileSelectorToolBar::KateFileSelectorToolBar(TQWidget *parent) : KToolBar( parent, "Kate FileSelector Toolbar", true ) { setMinimumWidth(10); @@ -84,15 +84,15 @@ void KateFileSelectorToolBar::setMovingEnabled( bool) } -KateFileSelectorToolBarParent::KateFileSelectorToolBarParent(QWidget *parent) - :QFrame(parent),m_tb(0){} +KateFileSelectorToolBarParent::KateFileSelectorToolBarParent(TQWidget *parent) + :TQFrame(parent),m_tb(0){} KateFileSelectorToolBarParent::~KateFileSelectorToolBarParent(){} void KateFileSelectorToolBarParent::setToolBar(KateFileSelectorToolBar *tb) { m_tb=tb; } -void KateFileSelectorToolBarParent::resizeEvent ( QResizeEvent * ) +void KateFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) { if (m_tb) { @@ -106,8 +106,8 @@ void KateFileSelectorToolBarParent::resizeEvent ( QResizeEvent * ) KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, KateViewManager *viewManager, - QWidget * parent, const char * name ) - : QVBox (parent, name), + TQWidget * parent, const char * name ) + : TQVBox (parent, name), mainwin(mainWindow), viewmanager(viewManager) { @@ -123,7 +123,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, qInstallMsgHandler( oldHandler ); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed )); + cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion); cmbPath->setCompletionObject( cmpl ); cmbPath->setAutoDeleteCompletionObject( true ); @@ -132,8 +132,8 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, dir = new KDirOperator(KURL(), this, "operator"); dir->setView(KFile::/* Simple */Detail); dir->view()->setSelectionMode(KFile::Extended); - connect ( dir, SIGNAL( viewChanged(KFileView *) ), - this, SLOT( selectorViewChanged(KFileView *) ) ); + connect ( dir, TQT_SIGNAL( viewChanged(KFileView *) ), + this, TQT_SLOT( selectorViewChanged(KFileView *) ) ); setStretchFactor(dir, 2); KActionCollection *coll = dir->actionCollection(); @@ -151,59 +151,59 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, mActionCollection, "bookmarks" ); acmBookmarks->setDelayed( false ); bookmarkHandler = new KBookmarkHandler( this, acmBookmarks->popupMenu() ); - QHBox* filterBox = new QHBox(this); + TQHBox* filterBox = new TQHBox(this); - btnFilter = new QToolButton( filterBox ); + btnFilter = new TQToolButton( filterBox ); btnFilter->setIconSet( SmallIconSet("filter" ) ); btnFilter->setToggleButton( true ); filter = new KHistoryCombo( true, filterBox, "filter"); - filter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed )); + filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); - connect( btnFilter, SIGNAL( clicked() ), this, SLOT( btnFilterClick() ) ); + connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) ); - connect( filter, SIGNAL( activated(const QString&) ), - SLOT( slotFilterChange(const QString&) ) ); - connect( filter, SIGNAL( returnPressed(const QString&) ), - filter, SLOT( addToHistory(const QString&) ) ); + connect( filter, TQT_SIGNAL( activated(const TQString&) ), + TQT_SLOT( slotFilterChange(const TQString&) ) ); + connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ), + filter, TQT_SLOT( addToHistory(const TQString&) ) ); // kaction for the dir sync method acSyncDir = new KAction( i18n("Current Document Folder"), "curfiledir", 0, - this, SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); + this, TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); toolbar->setIconText( KToolBar::IconOnly ); toolbar->setIconSize( 16 ); toolbar->setEnableContextMenu( false ); - connect( cmbPath, SIGNAL( urlActivated( const KURL& )), - this, SLOT( cmbPathActivated( const KURL& ) )); - connect( cmbPath, SIGNAL( returnPressed( const QString& )), - this, SLOT( cmbPathReturnPressed( const QString& ) )); - connect(dir, SIGNAL(urlEntered(const KURL&)), - this, SLOT(dirUrlEntered(const KURL&)) ); + connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL& )), + this, TQT_SLOT( cmbPathActivated( const KURL& ) )); + connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString& )), + this, TQT_SLOT( cmbPathReturnPressed( const TQString& ) )); + connect(dir, TQT_SIGNAL(urlEntered(const KURL&)), + this, TQT_SLOT(dirUrlEntered(const KURL&)) ); - connect(dir, SIGNAL(finishedLoading()), - this, SLOT(dirFinishedLoading()) ); + connect(dir, TQT_SIGNAL(finishedLoading()), + this, TQT_SLOT(dirFinishedLoading()) ); // enable dir sync button if current doc has a valid URL - connect ( viewmanager, SIGNAL( viewChanged() ), - this, SLOT( kateViewChanged() ) ); + connect ( viewmanager, TQT_SIGNAL( viewChanged() ), + this, TQT_SLOT( kateViewChanged() ) ); // Connect the bookmark handler - connect( bookmarkHandler, SIGNAL( openURL( const QString& )), - this, SLOT( setDir( const QString& ) ) ); + connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), + this, TQT_SLOT( setDir( const TQString& ) ) ); - waitingUrl = QString::null; + waitingUrl = TQString::null; // whatsthis help - QWhatsThis::add( cmbPath, + TQWhatsThis::add( cmbPath, i18n("

    Here you can enter a path for a folder to display." "

    To go to a folder previously entered, press the arrow on " "the right and choose one.

    The entry has folder " "completion. Right-click to choose how completion should behave.") ); - QWhatsThis::add( filter, + TQWhatsThis::add( filter, i18n("

    Here you can enter a name filter to limit which files are displayed." "

    To clear the filter, toggle off the filter button to the left." "

    To reapply the last filter used, toggle on the filter button." ) ); - QWhatsThis::add( btnFilter, + TQWhatsThis::add( btnFilter, i18n("

    This button clears the name filter when toggled off, or " "reapplies the last filter used when toggled on.") ); @@ -216,7 +216,7 @@ KateFileSelector::~KateFileSelector() //BEGIN Public Methods -void KateFileSelector::readConfig(KConfig *config, const QString & name) +void KateFileSelector::readConfig(KConfig *config, const TQString & name) { dir->setViewConfig( config, name + ":view" ); dir->readConfig(config, name + ":dir"); @@ -231,10 +231,10 @@ void KateFileSelector::readConfig(KConfig *config, const QString & name) cmbPath->setURLs( config->readPathListEntry( "dir history" ) ); // if we restore history if ( config->readBoolEntry( "restore location", true ) || kapp->isRestored() ) { - QString loc( config->readPathEntry( "location" ) ); + TQString loc( config->readPathEntry( "location" ) ); if ( ! loc.isEmpty() ) { // waitingDir = loc; -// QTimer::singleShot(0, this, SLOT(initialDirChangeHack())); +// TQTimer::singleShot(0, this, TQT_SLOT(initialDirChangeHack())); setDir( loc ); } } @@ -244,7 +244,7 @@ void KateFileSelector::readConfig(KConfig *config, const QString & name) filter->setMaxCount( config->readNumEntry( "filter history len", 9 ) ); filter->setHistoryItems( config->readListEntry("filter history"), true ); lastFilter = config->readEntry( "last filter" ); - QString flt(""); + TQString flt(""); if ( config->readBoolEntry( "restore last filter", true ) || kapp->isRestored() ) flt = config->readEntry("current filter"); filter->lineEdit()->setText( flt ); @@ -261,7 +261,7 @@ void KateFileSelector::initialDirChangeHack() void KateFileSelector::setupToolbar( KConfig *config ) { toolbar->clear(); - QStringList tbactions = config->readListEntry( "toolbar actions", ',' ); + TQStringList tbactions = config->readListEntry( "toolbar actions", ',' ); if ( tbactions.isEmpty() ) { // reasonable collection for default toolbar tbactions << "up" << "back" << "forward" << "home" << @@ -269,7 +269,7 @@ void KateFileSelector::setupToolbar( KConfig *config ) "bookmarks" << "sync_dir"; } KAction *ac; - for ( QStringList::Iterator it=tbactions.begin(); it != tbactions.end(); ++it ) { + for ( TQStringList::Iterator it=tbactions.begin(); it != tbactions.end(); ++it ) { if ( *it == "bookmarks" || *it == "sync_dir" ) ac = mActionCollection->action( (*it).latin1() ); else @@ -279,13 +279,13 @@ void KateFileSelector::setupToolbar( KConfig *config ) } } -void KateFileSelector::writeConfig(KConfig *config, const QString & name) +void KateFileSelector::writeConfig(KConfig *config, const TQString & name) { dir->writeConfig(config,name + ":dir"); config->setGroup( name ); config->writeEntry( "pathcombo history len", cmbPath->maxItems() ); - QStringList l; + TQStringList l; for (int i = 0; i < cmbPath->count(); i++) { l.append( cmbPath->text( i ) ); } @@ -309,21 +309,21 @@ void KateFileSelector::setView(KFile::FileView view) //BEGIN Public Slots -void KateFileSelector::slotFilterChange( const QString & nf ) +void KateFileSelector::slotFilterChange( const TQString & nf ) { - QString f = nf.stripWhiteSpace(); + TQString f = nf.stripWhiteSpace(); bool empty = f.isEmpty() || f == "*"; - QToolTip::remove( btnFilter ); + TQToolTip::remove( btnFilter ); if ( empty ) { dir->clearFilter(); - filter->lineEdit()->setText( QString::null ); - QToolTip::add( btnFilter, - QString( i18n("Apply last filter (\"%1\")") ).arg( lastFilter ) ); + filter->lineEdit()->setText( TQString::null ); + TQToolTip::add( btnFilter, + TQString( i18n("Apply last filter (\"%1\")") ).arg( lastFilter ) ); } else { dir->setNameFilter( f ); lastFilter = f; - QToolTip::add( btnFilter, i18n("Clear filter") ); + TQToolTip::add( btnFilter, i18n("Clear filter") ); } btnFilter->setOn( !empty ); dir->updateDir(); @@ -337,7 +337,7 @@ bool kateFileSelectorIsReadable ( const KURL& url ) if ( !url.isLocalFile() ) return true; // what else can we say? - QDir dir (url.path()); + TQDir dir (url.path()); return dir.exists (); } @@ -346,18 +346,18 @@ void KateFileSelector::setDir( KURL u ) KURL newurl; if ( !u.isValid() ) - newurl.setPath( QDir::homeDirPath() ); + newurl.setPath( TQDir::homeDirPath() ); else newurl = u; - QString pathstr = newurl.path(+1); + TQString pathstr = newurl.path(+1); newurl.setPath(pathstr); if ( !kateFileSelectorIsReadable ( newurl ) ) - newurl.cd(QString::fromLatin1("..")); + newurl.cd(TQString::fromLatin1("..")); if ( !kateFileSelectorIsReadable (newurl) ) - newurl.setPath( QDir::homeDirPath() ); + newurl.setPath( TQDir::homeDirPath() ); dir->setURL(newurl, true); } @@ -371,13 +371,13 @@ void KateFileSelector::cmbPathActivated( const KURL& u ) cmbPathReturnPressed( u.url() ); } -void KateFileSelector::cmbPathReturnPressed( const QString& u ) +void KateFileSelector::cmbPathReturnPressed( const TQString& u ) { KURL typedURL( u ); if ( typedURL.hasPass() ) - typedURL.setPass( QString::null ); + typedURL.setPass( TQString::null ); - QStringList urls = cmbPath->urls(); + TQStringList urls = cmbPath->urls(); urls.remove( typedURL.url() ); urls.prepend( typedURL.url() ); cmbPath->setURLs( urls, KURLComboBox::RemoveBottom ); @@ -405,7 +405,7 @@ void KateFileSelector::dirFinishedLoading() void KateFileSelector::btnFilterClick() { if ( !btnFilter->isOn() ) { - slotFilterChange( QString::null ); + slotFilterChange( TQString::null ); } else { filter->lineEdit()->setText( lastFilter ); @@ -432,7 +432,7 @@ void KateFileSelector::kateViewChanged() // if visible, sync if ( isVisible() ) { setActiveDocumentDir(); - waitingUrl = QString::null; + waitingUrl = TQString::null; } // else set waiting url else { @@ -456,37 +456,37 @@ void KateFileSelector::selectorViewChanged( KFileView * newView ) //BEGIN Protected -void KateFileSelector::focusInEvent( QFocusEvent * ) +void KateFileSelector::focusInEvent( TQFocusEvent * ) { dir->setFocus(); } -void KateFileSelector::showEvent( QShowEvent * ) +void KateFileSelector::showEvent( TQShowEvent * ) { // sync if we should if ( autoSyncEvents & GotVisible ) { // kdDebug(13001)<<"syncing fs on show"<setVariableWidth() does not yield a satisfying result, something is wrong with the handling of the sizehint. And the popup is rather useless, if the paths are only partly visible. */ - QListBox *lb = cmbPath->listBox(); - if ( o == lb && e->type() == QEvent::Show ) { + TQListBox *lb = cmbPath->listBox(); + if ( o == 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() ); @@ -495,7 +495,7 @@ bool KateFileSelector::eventFilter( QObject* o, QEvent *e ) // are changed. } // TODO - same thing for the completion popup? - return QWidget::eventFilter( o, e ); + return TQWidget::eventFilter( o, e ); } //END Protected @@ -505,17 +505,17 @@ bool KateFileSelector::eventFilter( QObject* o, QEvent *e ) QListboxItem that can store and return a string, used for the toolbar action selector. */ -class ActionLBItem : public QListBoxPixmap { +class ActionLBItem : public TQListBoxPixmap { public: - ActionLBItem( QListBox *lb=0, - const QPixmap &pm = QPixmap(), - const QString &text=QString::null, - const QString &str=QString::null ) : - QListBoxPixmap( lb, pm, text ), + ActionLBItem( TQListBox *lb=0, + const TQPixmap &pm = TQPixmap(), + const TQString &text=TQString::null, + const TQString &str=TQString::null ) : + TQListBoxPixmap( lb, pm, text ), _str(str) {}; - QString idstring() { return _str; }; + TQString idstring() { return _str; }; private: - QString _str; + TQString _str; }; //END ActionLBItem @@ -523,82 +523,82 @@ class ActionLBItem : public QListBoxPixmap { //////////////////////////////////////////////////////////////////////////////// // KFSConfigPage implementation //////////////////////////////////////////////////////////////////////////////// -KFSConfigPage::KFSConfigPage( QWidget *parent, const char *name, KateFileSelector *kfs ) +KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KateFileSelector *kfs ) : Kate::ConfigPage( parent, name ), fileSelector( kfs ), m_changed( false ) { - QVBoxLayout *lo = new QVBoxLayout( this ); + TQVBoxLayout *lo = new TQVBoxLayout( this ); int spacing = KDialog::spacingHint(); lo->setSpacing( spacing ); // Toolbar - a lot for a little... - QGroupBox *gbToolbar = new QGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this ); + TQGroupBox *gbToolbar = new TQGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this ); acSel = new KActionSelector( gbToolbar ); acSel->setAvailableLabel( i18n("A&vailable actions:") ); acSel->setSelectedLabel( i18n("S&elected actions:") ); lo->addWidget( gbToolbar ); - connect( acSel, SIGNAL( added( QListBoxItem * ) ), this, SLOT( slotMyChanged() ) ); - connect( acSel, SIGNAL( removed( QListBoxItem * ) ), this, SLOT( slotMyChanged() ) ); - connect( acSel, SIGNAL( movedUp( QListBoxItem * ) ), this, SLOT( slotMyChanged() ) ); - connect( acSel, SIGNAL( movedDown( QListBoxItem * ) ), this, SLOT( slotMyChanged() ) ); + connect( acSel, TQT_SIGNAL( added( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) ); + connect( acSel, TQT_SIGNAL( removed( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) ); + connect( acSel, TQT_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) ); + connect( acSel, TQT_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) ); // Sync - QGroupBox *gbSync = new QGroupBox( 1, Qt::Horizontal, i18n("Auto Synchronization"), this ); - cbSyncActive = new QCheckBox( i18n("When a docu&ment becomes active"), gbSync ); - cbSyncShow = new QCheckBox( i18n("When the file selector becomes visible"), gbSync ); + TQGroupBox *gbSync = new TQGroupBox( 1, Qt::Horizontal, i18n("Auto Synchronization"), this ); + cbSyncActive = new TQCheckBox( i18n("When a docu&ment becomes active"), gbSync ); + cbSyncShow = new TQCheckBox( i18n("When the file selector becomes visible"), gbSync ); lo->addWidget( gbSync ); - connect( cbSyncActive, SIGNAL( toggled( bool ) ), this, SLOT( slotMyChanged() ) ); - connect( cbSyncShow, SIGNAL( toggled( bool ) ), this, SLOT( slotMyChanged() ) ); + connect( cbSyncActive, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) ); + connect( cbSyncShow, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) ); // Histories - QHBox *hbPathHist = new QHBox ( this ); - QLabel *lbPathHist = new QLabel( i18n("Remember &locations:"), hbPathHist ); - sbPathHistLength = new QSpinBox( hbPathHist ); + TQHBox *hbPathHist = new TQHBox ( this ); + TQLabel *lbPathHist = new TQLabel( i18n("Remember &locations:"), hbPathHist ); + sbPathHistLength = new TQSpinBox( hbPathHist ); lbPathHist->setBuddy( sbPathHistLength ); lo->addWidget( hbPathHist ); - connect( sbPathHistLength, SIGNAL( valueChanged ( int ) ), this, SLOT( slotMyChanged() ) ); + connect( sbPathHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotMyChanged() ) ); - QHBox *hbFilterHist = new QHBox ( this ); - QLabel *lbFilterHist = new QLabel( i18n("Remember &filters:"), hbFilterHist ); - sbFilterHistLength = new QSpinBox( hbFilterHist ); + TQHBox *hbFilterHist = new TQHBox ( this ); + TQLabel *lbFilterHist = new TQLabel( i18n("Remember &filters:"), hbFilterHist ); + sbFilterHistLength = new TQSpinBox( hbFilterHist ); lbFilterHist->setBuddy( sbFilterHistLength ); lo->addWidget( hbFilterHist ); - connect( sbFilterHistLength, SIGNAL( valueChanged ( int ) ), this, SLOT( slotMyChanged() ) ); + connect( sbFilterHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotMyChanged() ) ); // Session - QGroupBox *gbSession = new QGroupBox( 1, Qt::Horizontal, i18n("Session"), this ); - cbSesLocation = new QCheckBox( i18n("Restore loca&tion"), gbSession ); - cbSesFilter = new QCheckBox( i18n("Restore last f&ilter"), gbSession ); + TQGroupBox *gbSession = new TQGroupBox( 1, Qt::Horizontal, i18n("Session"), this ); + cbSesLocation = new TQCheckBox( i18n("Restore loca&tion"), gbSession ); + cbSesFilter = new TQCheckBox( i18n("Restore last f&ilter"), gbSession ); lo->addWidget( gbSession ); - connect( cbSesLocation, SIGNAL( toggled( bool ) ), this, SLOT( slotMyChanged() ) ); - connect( cbSesFilter, SIGNAL( toggled( bool ) ), this, SLOT( slotMyChanged() ) ); + connect( cbSesLocation, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) ); + connect( cbSesFilter, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) ); // make it look nice lo->addStretch( 1 ); // be helpfull /* - QWhatsThis::add( lbAvailableActions, i18n( + TQWhatsThis::add( lbAvailableActions, i18n( "

    Available actions for the toolbar. To add an action, select it here " "and press the add (->) button" ) ); - QWhatsThis::add( lbUsedActions, i18n( + TQWhatsThis::add( lbUsedActions, i18n( "

    Actions used in the toolbar. To remove an action, select it and " "press the remove (<-) button." "

    To change the order of the actions, use the Up and Down buttons to " "move the selected action.") ); */ - QString lhwt( i18n( + TQString lhwt( i18n( "

    Decides how many locations to keep in the history of the location " "combo box.") ); - QWhatsThis::add( lbPathHist, lhwt ); - QWhatsThis::add( sbPathHistLength, lhwt ); - QString fhwt( i18n( + TQWhatsThis::add( lbPathHist, lhwt ); + TQWhatsThis::add( sbPathHistLength, lhwt ); + TQString fhwt( i18n( "

    Decides how many filters to keep in the history of the filter " "combo box.") ); - QWhatsThis::add( lbFilterHist, fhwt ); - QWhatsThis::add( sbFilterHistLength, fhwt ); - QString synwt( i18n( + TQWhatsThis::add( lbFilterHist, fhwt ); + TQWhatsThis::add( sbFilterHistLength, fhwt ); + TQString synwt( i18n( "

    These options allow you to have the File Selector automatically " "change location to the folder of the active document on certain " "events." @@ -606,12 +606,12 @@ KFSConfigPage::KFSConfigPage( QWidget *parent, const char *name, KateFileSelecto "effect until the file selector is visible." "

    None of these are enabled by default, but you can always sync the " "location by pressing the sync button in the toolbar.") ); - QWhatsThis::add( gbSync, synwt ); - QWhatsThis::add( cbSesLocation, i18n( + TQWhatsThis::add( gbSync, synwt ); + TQWhatsThis::add( cbSesLocation, i18n( "

    If this option is enabled (default), the location will be restored " "when you start Kate.

    Note that if the session is " "handled by the KDE session manager, the location is always restored.") ); - QWhatsThis::add( cbSesFilter, i18n( + TQWhatsThis::add( cbSesFilter, i18n( "

    If this option is enabled (default), the current filter will be " "restored when you start Kate.

    Note that if the " "session is handled by the KDE session manager, the filter is always " @@ -633,8 +633,8 @@ void KFSConfigPage::apply() KConfig *config = kapp->config(); config->setGroup( "fileselector" ); // toolbar - QStringList l; - QListBoxItem *item = acSel->selectedListBox()->firstItem(); + TQStringList l; + TQListBoxItem *item = acSel->selectedListBox()->firstItem(); ActionLBItem *aItem; while ( item ) { @@ -675,23 +675,23 @@ void KFSConfigPage::init() KConfig *config = kapp->config(); config->setGroup( "fileselector" ); // toolbar - QStringList l = config->readListEntry( "toolbar actions", ',' ); + TQStringList l = config->readListEntry( "toolbar actions", ',' ); if ( l.isEmpty() ) // default toolbar l << "up" << "back" << "forward" << "home" << "short view" << "detailed view" << "bookmarks" << "sync_dir"; // actions from diroperator + two of our own - QStringList allActions; + TQStringList allActions; allActions << "up" << "back" << "forward" << "home" << "reload" << "mkdir" << "delete" << "short view" << "detailed view" /*<< "view menu" << "show hidden" << "properties"*/ << "bookmarks" << "sync_dir"; - QRegExp re("&(?=[^&])"); + TQRegExp re("&(?=[^&])"); KAction *ac; - QListBox *lb; - for ( QStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) { + TQListBox *lb; + for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) { lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox(); if ( *it == "bookmarks" || *it == "sync_dir" ) ac = fileSelector->actionCollection()->action( (*it).latin1() ); diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h index 0bab4c257..442d3101e 100644 --- a/kate/app/katefileselector.h +++ b/kate/app/katefileselector.h @@ -25,11 +25,11 @@ #include "katedocmanager.h" #include -#include +#include #include #include #include -#include +#include class KateMainWindow; class KateViewManager; @@ -50,7 +50,7 @@ class KateFileSelectorToolBar: public KToolBar { Q_OBJECT public: - KateFileSelectorToolBar(QWidget *parent); + KateFileSelectorToolBar(TQWidget *parent); virtual ~KateFileSelectorToolBar(); virtual void setMovingEnabled( bool b ); @@ -60,13 +60,13 @@ class KateFileSelectorToolBarParent: public QFrame { Q_OBJECT public: - KateFileSelectorToolBarParent(QWidget *parent); + KateFileSelectorToolBarParent(TQWidget *parent); ~KateFileSelectorToolBarParent(); void setToolBar(KateFileSelectorToolBar *tb); private: KateFileSelectorToolBar *m_tb; protected: - virtual void resizeEvent ( QResizeEvent * ); + virtual void resizeEvent ( TQResizeEvent * ); }; class KateFileSelector : public QVBox @@ -80,35 +80,35 @@ class KateFileSelector : public QVBox enum AutoSyncEvent { DocumentChanged=1, GotVisible=2 }; KateFileSelector( KateMainWindow *mainWindow=0, KateViewManager *viewManager=0, - QWidget * parent = 0, const char * name = 0 ); + TQWidget * parent = 0, const char * name = 0 ); ~KateFileSelector(); - void readConfig( KConfig *, const QString & ); - void writeConfig( KConfig *, const QString & ); + void readConfig( KConfig *, const TQString & ); + void writeConfig( KConfig *, const TQString & ); void setupToolbar( KConfig * ); void setView( KFile::FileView ); KDirOperator *dirOperator(){ return dir; } KActionCollection *actionCollection() { return mActionCollection; }; public slots: - void slotFilterChange(const QString&); + void slotFilterChange(const TQString&); void setDir(KURL); - void setDir( const QString& url ) { setDir( KURL( url ) ); }; + void setDir( const TQString& url ) { setDir( KURL( url ) ); }; void kateViewChanged(); void selectorViewChanged( KFileView * ); private slots: void cmbPathActivated( const KURL& u ); - void cmbPathReturnPressed( const QString& u ); + void cmbPathReturnPressed( const TQString& u ); void dirUrlEntered( const KURL& u ); void dirFinishedLoading(); void setActiveDocumentDir(); void btnFilterClick(); protected: - void focusInEvent( QFocusEvent * ); - void showEvent( QShowEvent * ); - bool eventFilter( QObject *, QEvent * ); + void focusInEvent( TQFocusEvent * ); + void showEvent( TQShowEvent * ); + bool eventFilter( TQObject *, TQEvent * ); void initialDirChangeHack(); private: @@ -119,15 +119,15 @@ class KateFileSelector : public QVBox KDirOperator * dir; class KAction *acSyncDir; KHistoryCombo * filter; - class QToolButton *btnFilter; + class TQToolButton *btnFilter; KateMainWindow *mainwin; KateViewManager *viewmanager; - QString lastFilter; + TQString lastFilter; int autoSyncEvents; // enabled autosync events - QString waitingUrl; // maybe display when we gets visible - QString waitingDir; + TQString waitingUrl; // maybe display when we gets visible + TQString waitingDir; }; /* TODO anders @@ -146,7 +146,7 @@ class KateFileSelector : public QVBox class KFSConfigPage : public Kate::ConfigPage { Q_OBJECT public: - KFSConfigPage( QWidget* parent=0, const char *name=0, KateFileSelector *kfs=0); + KFSConfigPage( TQWidget* parent=0, const char *name=0, KateFileSelector *kfs=0); virtual ~KFSConfigPage() {}; virtual void apply(); @@ -160,9 +160,9 @@ class KFSConfigPage : public Kate::ConfigPage { KateFileSelector *fileSelector; KActionSelector *acSel; - class QSpinBox *sbPathHistLength, *sbFilterHistLength; - class QCheckBox *cbSyncActive, *cbSyncShow; - class QCheckBox *cbSesLocation, *cbSesFilter; + class TQSpinBox *sbPathHistLength, *sbFilterHistLength; + class TQCheckBox *cbSyncActive, *cbSyncShow; + class TQCheckBox *cbSesLocation, *cbSesFilter; bool m_changed; }; diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp index 8816862de..409bfd0a1 100644 --- a/kate/app/kategrepdialog.cpp +++ b/kate/app/kategrepdialog.cpp @@ -21,15 +21,15 @@ #include "kategrepdialog.h" #include "katemainwindow.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -65,8 +65,8 @@ const char *strTemplate[] = { }; -GrepTool::GrepTool(QWidget *parent, const char *name) - : QWidget(parent, name/*, false*/), m_fixFocus(true), childproc(0) +GrepTool::GrepTool(TQWidget *parent, const char *name) + : TQWidget(parent, name/*, false*/), m_fixFocus(true), childproc(0) { setCaption(i18n("Find in Files")); config = KGlobal::config(); @@ -85,7 +85,7 @@ GrepTool::GrepTool(QWidget *parent, const char *name) << "*"; } - QGridLayout *layout = new QGridLayout(this, 6, 3, 4, 4); + TQGridLayout *layout = new TQGridLayout(this, 6, 3, 4, 4); layout->setColStretch(0, 10); layout->addColSpacing(1, 10); layout->setColStretch(1, 0); @@ -94,43 +94,43 @@ GrepTool::GrepTool(QWidget *parent, const char *name) layout->setRowStretch(2, 10); layout->setRowStretch(4, 0); - QGridLayout *loInput = new QGridLayout(4, 2, 4); + TQGridLayout *loInput = new TQGridLayout(4, 2, 4); layout->addLayout(loInput, 0, 0); loInput->setColStretch(0, 0); loInput->setColStretch(1, 20); - QLabel *lPattern = new QLabel(i18n("Pattern:"), this); + TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this); lPattern->setFixedSize(lPattern->sizeHint()); loInput->addWidget(lPattern, 0, 0, AlignRight | AlignVCenter); - QBoxLayout *loPattern = new QHBoxLayout( 4 ); + TQBoxLayout *loPattern = new TQHBoxLayout( 4 ); loInput->addLayout( loPattern, 0, 1 ); cmbPattern = new KComboBox(true, this); cmbPattern->setDuplicatesEnabled(false); cmbPattern->insertStringList(lastSearchItems); - cmbPattern->setEditText(QString::null); - cmbPattern->setInsertionPolicy(QComboBox::NoInsertion); + cmbPattern->setEditText(TQString::null); + cmbPattern->setInsertionPolicy(TQComboBox::NoInsertion); lPattern->setBuddy(cmbPattern); cmbPattern->setFocus(); cmbPattern->setMinimumSize(cmbPattern->sizeHint()); loPattern->addWidget( cmbPattern ); - cbCasesensitive = new QCheckBox(i18n("Case sensitive"), this); + cbCasesensitive = new TQCheckBox(i18n("Case sensitive"), this); cbCasesensitive->setMinimumWidth(cbCasesensitive->sizeHint().width()); cbCasesensitive->setChecked(config->readBoolEntry("CaseSensitive", true)); loPattern->addWidget(cbCasesensitive); - cbRegex = new QCheckBox( i18n("Regular expression"), this ); + cbRegex = new TQCheckBox( i18n("Regular expression"), this ); cbRegex->setMinimumWidth( cbRegex->sizeHint().width() ); cbRegex->setChecked( config->readBoolEntry( "Regex", true ) ); loPattern->addWidget( cbRegex ); loPattern->setStretchFactor( cmbPattern, 100 ); - QLabel *lTemplate = new QLabel(i18n("Template:"), this); + TQLabel *lTemplate = new TQLabel(i18n("Template:"), this); lTemplate->setFixedSize(lTemplate->sizeHint()); loInput->addWidget(lTemplate, 1, 0, AlignRight | AlignVCenter); - QBoxLayout *loTemplate = new QHBoxLayout(4); + TQBoxLayout *loTemplate = new TQHBoxLayout(4); loInput->addLayout(loTemplate, 1, 1); leTemplate = new KLineEdit(this); @@ -145,29 +145,29 @@ GrepTool::GrepTool(QWidget *parent, const char *name) cmbTemplate->setFixedSize(cmbTemplate->size()); loTemplate->addWidget(cmbTemplate); - QLabel *lFiles = new QLabel(i18n("Files:"), this); + TQLabel *lFiles = new TQLabel(i18n("Files:"), this); lFiles->setFixedSize(lFiles->sizeHint()); loInput->addWidget(lFiles, 2, 0, AlignRight | AlignVCenter); cmbFiles = new KComboBox(true, this); lFiles->setBuddy(cmbFiles->focusProxy()); cmbFiles->setMinimumSize(cmbFiles->sizeHint()); - cmbFiles->setInsertionPolicy(QComboBox::NoInsertion); + cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion); cmbFiles->setDuplicatesEnabled(false); cmbFiles->insertStringList(lastSearchFiles); loInput->addWidget(cmbFiles, 2, 1); - QLabel *lDir = new QLabel(i18n("Folder:"), this); + TQLabel *lDir = new TQLabel(i18n("Folder:"), this); lDir->setFixedSize(lDir->sizeHint()); loInput->addWidget(lDir, 3, 0, AlignRight | AlignVCenter); - QBoxLayout *loDir = new QHBoxLayout(3); + TQBoxLayout *loDir = new TQHBoxLayout(3); loInput->addLayout(loDir, 3, 1); KComboBox* cmbUrl = new KComboBox(true, this); cmbUrl->setMinimumWidth(80); // make sure that 800x600 res works cmbUrl->setDuplicatesEnabled(false); - cmbUrl->setInsertionPolicy(QComboBox::NoInsertion); + cmbUrl->setInsertionPolicy(TQComboBox::NoInsertion); cmbDir = new KURLRequester( cmbUrl, this, "dir combo" ); cmbDir->completionObject()->setMode(KURLCompletion::DirCompletion); cmbDir->comboBox()->insertStringList(lastSearchPaths); @@ -175,7 +175,7 @@ GrepTool::GrepTool(QWidget *parent, const char *name) loDir->addWidget(cmbDir, 1); lDir->setBuddy(cmbDir); - cbRecursive = new QCheckBox(i18n("Recursive"), this); + cbRecursive = new TQCheckBox(i18n("Recursive"), this); cbRecursive->setMinimumWidth(cbRecursive->sizeHint().width()); cbRecursive->setChecked(config->readBoolEntry("Recursive", true)); loDir->addWidget(cbRecursive); @@ -189,15 +189,15 @@ GrepTool::GrepTool(QWidget *parent, const char *name) actionbox->addStretch(); actionbox->layout(); - lbResult = new QListBox(this); - QFontMetrics rb_fm(lbResult->fontMetrics()); + lbResult = new TQListBox(this); + TQFontMetrics rb_fm(lbResult->fontMetrics()); layout->addMultiCellWidget(lbResult, 2, 2, 0, 2); layout->activate(); KAcceleratorManager::manage( this ); - QWhatsThis::add(lPattern, + TQWhatsThis::add(lPattern, i18n("

    Enter the expression you want to search for here." "

    If 'regular expression' is unchecked, any non-space letters in your " "expression will be escaped with a backslash character." @@ -220,26 +220,26 @@ GrepTool::GrepTool(QWidget *parent, const char *name) "via the notation \\#." "

    See the grep(1) documentation for the full documentation." )); - QWhatsThis::add(lFiles, + TQWhatsThis::add(lFiles, i18n("Enter the file name pattern of the files to search here.\n" "You may give several patterns separated by commas.")); - QWhatsThis::add(lTemplate, + TQWhatsThis::add(lTemplate, i18n("You can choose a template for the pattern from the combo box\n" "and edit it here. The string %s in the template is replaced\n" "by the pattern input field, resulting in the regular expression\n" "to search for.")); - QWhatsThis::add(lDir, + TQWhatsThis::add(lDir, i18n("Enter the folder which contains the files in which you want to search.")); - QWhatsThis::add(cbRecursive, + TQWhatsThis::add(cbRecursive, i18n("Check this box to search in all subfolders.")); - QWhatsThis::add(cbCasesensitive, + TQWhatsThis::add(cbCasesensitive, i18n("If this option is enabled (the default), the search will be case sensitive.")); - QWhatsThis::add( cbRegex, i18n( + TQWhatsThis::add( cbRegex, i18n( "

    If this is enabled, your pattern will be passed unmodified to " "grep(1). Otherwise, all characters that are not letters will be " "escaped using a backslash character to prevent grep from interpreting " "them as part of the expression.") ); - QWhatsThis::add(lbResult, + TQWhatsThis::add(lbResult, i18n("The results of the grep run are listed here. Select a\n" "filename/line number combination and press Enter or doubleclick\n" "on the item to show the respective line in the editor.")); @@ -250,16 +250,16 @@ GrepTool::GrepTool(QWidget *parent, const char *name) cmbFiles->installEventFilter( this ); cmbDir->comboBox()->installEventFilter( this ); - connect( cmbTemplate, SIGNAL(activated(int)), - SLOT(templateActivated(int)) ); - connect( lbResult, SIGNAL(selected(const QString&)), - SLOT(itemSelected(const QString&)) ); - connect( btnSearch, SIGNAL(clicked()), - SLOT(slotSearch()) ); - connect( btnClear, SIGNAL(clicked()), - SLOT(slotClear()) ); - connect( cmbPattern->lineEdit(), SIGNAL(textChanged ( const QString & )), - SLOT( patternTextChanged( const QString & ))); + connect( cmbTemplate, TQT_SIGNAL(activated(int)), + TQT_SLOT(templateActivated(int)) ); + connect( lbResult, TQT_SIGNAL(selected(const TQString&)), + TQT_SLOT(itemSelected(const TQString&)) ); + connect( btnSearch, TQT_SIGNAL(clicked()), + TQT_SLOT(slotSearch()) ); + connect( btnClear, TQT_SIGNAL(clicked()), + TQT_SLOT(slotClear()) ); + connect( cmbPattern->lineEdit(), TQT_SIGNAL(textChanged ( const TQString & )), + TQT_SLOT( patternTextChanged( const TQString & ))); patternTextChanged( cmbPattern->lineEdit()->text()); } @@ -270,7 +270,7 @@ GrepTool::~GrepTool() delete childproc; } -void GrepTool::patternTextChanged( const QString & _text) +void GrepTool::patternTextChanged( const TQString & _text) { btnSearch->setEnabled( !_text.isEmpty() ); } @@ -280,19 +280,19 @@ void GrepTool::templateActivated(int index) leTemplate->setText(strTemplate[index]); } -void GrepTool::itemSelected(const QString& item) +void GrepTool::itemSelected(const TQString& item) { int pos; - QString filename, linenumber; + TQString filename, linenumber; - QString str = item; + TQString str = item; if ( (pos = str.find(':')) != -1) { filename = str.left(pos); str = str.mid(pos+1); if ( (pos = str.find(':')) != -1) { - filename = m_workingDir + QDir::separator() + filename; + filename = m_workingDir + TQDir::separator() + filename; linenumber = str.left(pos); emit itemSelected(filename,linenumber.toInt()-1); } @@ -304,7 +304,7 @@ void GrepTool::processOutput() int pos; while ( (pos = buf.find('\n')) != -1) { - QString item = buf.mid(2,pos-2); + TQString item = buf.mid(2,pos-2); if (!item.isEmpty()) lbResult->insertItem(item); buf = buf.mid(pos+1); @@ -320,7 +320,7 @@ void GrepTool::slotSearch() return; } - if ( cmbDir->url().isEmpty() || ! QDir(cmbDir->url()).exists() ) + if ( cmbDir->url().isEmpty() || ! TQDir(cmbDir->url()).exists() ) { cmbDir->setFocus(); KMessageBox::information( this, i18n( @@ -345,10 +345,10 @@ void GrepTool::slotSearch() m_workingDir = cmbDir->url(); - QString s = cmbPattern->currentText(); + TQString s = cmbPattern->currentText(); if ( ! cbRegex->isChecked() ) - s.replace( QRegExp( "([^\\w'()<>])" ), "\\\\1" ); - QString pattern = leTemplate->text(); + s.replace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" ); + TQString pattern = leTemplate->text(); pattern.replace( "%s", s ); childproc = new KProcess(); @@ -358,10 +358,10 @@ void GrepTool::slotSearch() *childproc << "-maxdepth" << "1"; if (!cmbFiles->currentText().isEmpty() ) { - QStringList files = QStringList::split ( ",", cmbFiles->currentText(), FALSE ); + TQStringList files = TQStringList::split ( ",", cmbFiles->currentText(), FALSE ); *childproc << "("; bool first = true; - for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) + for ( TQStringList::Iterator it = files.begin(); it != files.end(); ++it ) { if (!first) *childproc << "-o"; @@ -377,21 +377,21 @@ void GrepTool::slotSearch() *childproc << "/dev/null"; //trick to have grep always display the filename *childproc << ";"; - connect( childproc, SIGNAL(processExited(KProcess *)), - SLOT(childExited()) ); - connect( childproc, SIGNAL(receivedStdout(KProcess *, char *, int)), - SLOT(receivedOutput(KProcess *, char *, int)) ); - connect( childproc, SIGNAL(receivedStderr(KProcess *, char *, int)), - SLOT(receivedErrOutput(KProcess *, char *, int)) ); + connect( childproc, TQT_SIGNAL(processExited(KProcess *)), + TQT_SLOT(childExited()) ); + connect( childproc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), + TQT_SLOT(receivedOutput(KProcess *, char *, int)) ); + connect( childproc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), + TQT_SLOT(receivedErrOutput(KProcess *, char *, int)) ); // actually it should be checked whether the process was started successfully - lbResult->setCursor( QCursor(Qt::WaitCursor) ); + lbResult->setCursor( TQCursor(Qt::WaitCursor) ); btnClear->setEnabled( false ); btnSearch->setGuiItem( KGuiItem(i18n("Cancel"), "button_cancel")); childproc->start(KProcess::NotifyOnExit, KProcess::AllOutput); } -void GrepTool::slotSearchFor(const QString &pattern) +void GrepTool::slotSearchFor(const TQString &pattern) { slotClear(); cmbPattern->setEditText(pattern); @@ -409,7 +409,7 @@ void GrepTool::finish() config->setGroup("GrepTool"); - QString cmbText = cmbPattern->currentText(); + TQString cmbText = cmbPattern->currentText(); bool itemsRemoved = lastSearchItems.remove(cmbText) > 0; lastSearchItems.prepend(cmbText); if (itemsRemoved) @@ -485,13 +485,13 @@ void GrepTool::childExited() void GrepTool::receivedOutput(KProcess */*proc*/, char *buffer, int buflen) { - buf += QCString(buffer, buflen+1); + buf += TQCString(buffer, buflen+1); processOutput(); } void GrepTool::receivedErrOutput(KProcess */*proc*/, char *buffer, int buflen) { - errbuf += QCString( buffer, buflen + 1 ); + errbuf += TQCString( buffer, buflen + 1 ); } void GrepTool::slotClear() @@ -500,7 +500,7 @@ void GrepTool::slotClear() lbResult->clear(); } -void GrepTool::updateDirName(const QString &dir) +void GrepTool::updateDirName(const TQString &dir) { if (m_lastUpdatedDir != dir) { @@ -509,35 +509,35 @@ void GrepTool::updateDirName(const QString &dir) } } -void GrepTool::setDirName(const QString &dir){ +void GrepTool::setDirName(const TQString &dir){ cmbDir->setURL(dir); } -bool GrepTool::eventFilter( QObject *o, QEvent *e ) +bool GrepTool::eventFilter( TQObject *o, TQEvent *e ) { - if ( e->type() == QEvent::KeyPress && ( - ((QKeyEvent*)e)->key() == Qt::Key_Return || - ((QKeyEvent*)e)->key() == Qt::Key_Enter ) ) + if ( e->type() == TQEvent::KeyPress && ( + ((TQKeyEvent*)e)->key() == Qt::Key_Return || + ((TQKeyEvent*)e)->key() == Qt::Key_Enter ) ) { slotSearch(); return true; } - return QWidget::eventFilter( o, e ); + return TQWidget::eventFilter( o, e ); } -void GrepTool::focusInEvent ( QFocusEvent * ev ) +void GrepTool::focusInEvent ( TQFocusEvent * ev ) { - QWidget::focusInEvent(ev); + TQWidget::focusInEvent(ev); if (m_fixFocus) { m_fixFocus = false; cmbPattern->setFocus(); } } -void GrepTool::showEvent( QShowEvent * ev ) +void GrepTool::showEvent( TQShowEvent * ev ) { - QWidget::showEvent(ev); + TQWidget::showEvent(ev); m_fixFocus = true; } diff --git a/kate/app/kategrepdialog.h b/kate/app/kategrepdialog.h index 5ed3b2b69..23ba00540 100644 --- a/kate/app/kategrepdialog.h +++ b/kate/app/kategrepdialog.h @@ -22,7 +22,7 @@ #define _GREPDIALOG_H_ #include -#include +#include class QLineEdit; class KComboBox; @@ -40,25 +40,25 @@ class GrepTool : public QWidget Q_OBJECT public: - GrepTool(QWidget *parent, const char *name=0); + GrepTool(TQWidget *parent, const char *name=0); ~GrepTool(); // only updates if the dir you give to it differs from the last one given to it ! - void updateDirName(const QString &); + void updateDirName(const TQString &); - void setDirName(const QString &); + void setDirName(const TQString &); signals: - void itemSelected(const QString &abs_filename, int line); + void itemSelected(const TQString &abs_filename, int line); public slots: - void slotSearchFor(const QString &pattern); + void slotSearchFor(const TQString &pattern); protected: - bool eventFilter( QObject *, QEvent * ); - void focusInEvent ( QFocusEvent * ); - void showEvent( QShowEvent * ); + bool eventFilter( TQObject *, TQEvent * ); + void focusInEvent ( TQFocusEvent * ); + void showEvent( TQShowEvent * ); bool m_fixFocus; private slots: @@ -66,31 +66,31 @@ private slots: void childExited(); void receivedOutput(KProcess *proc, char *buffer, int buflen); void receivedErrOutput(KProcess *proc, char *buffer, int buflen); - void itemSelected(const QString&); + void itemSelected(const TQString&); void slotSearch(); void slotCancel(); void slotClear(); - void patternTextChanged( const QString &); + void patternTextChanged( const TQString &); private: void processOutput(); void finish(); - QLineEdit *leTemplate; + TQLineEdit *leTemplate; KComboBox *cmbFiles, *cmbPattern; KURLRequester *cmbDir; - QCheckBox *cbRecursive; - QCheckBox *cbCasesensitive, *cbRegex; - QListBox *lbResult; + TQCheckBox *cbRecursive; + TQCheckBox *cbCasesensitive, *cbRegex; + TQListBox *lbResult; KPushButton *btnSearch, *btnClear; KProcess *childproc; - QString buf; - QString errbuf; + TQString buf; + TQString errbuf; KConfig* config; - QStringList lastSearchItems; - QStringList lastSearchPaths; - QStringList lastSearchFiles; - QString m_lastUpdatedDir; - QString m_workingDir; + TQStringList lastSearchItems; + TQStringList lastSearchPaths; + TQStringList lastSearchFiles; + TQString m_lastUpdatedDir; + TQString m_workingDir; }; diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp index 03bd497df..79a1e19c6 100644 --- a/kate/app/katemailfilesdialog.cpp +++ b/kate/app/katemailfilesdialog.cpp @@ -25,16 +25,16 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include /* a private check list item, that can store a Kate::Document*. */ -class KateDocCheckItem : public QCheckListItem { +class KateDocCheckItem : public TQCheckListItem { public: - KateDocCheckItem( QListView *parent, const QString& text, Kate::Document *d ) - : QCheckListItem( parent, text, QCheckListItem::CheckBox ), mdoc(d) {}; + KateDocCheckItem( TQListView *parent, const TQString& text, Kate::Document *d ) + : TQCheckListItem( parent, text, TQCheckListItem::CheckBox ), mdoc(d) {}; Kate::Document *doc() { return mdoc; }; private: Kate::Document *mdoc; @@ -43,7 +43,7 @@ class KateDocCheckItem : public QCheckListItem { /////////////////////////////////////////////////////////////////////////// // KateMailDialog implementation /////////////////////////////////////////////////////////////////////////// -KateMailDialog::KateMailDialog( QWidget *parent, KateMainWindow *mainwin ) +KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow *mainwin ) : KDialogBase( parent, "kate mail dialog", true, i18n("Email Files"), Ok|Cancel|User1, Ok, false, KGuiItem( i18n("&Show All Documents >>") ) ), @@ -53,7 +53,7 @@ KateMailDialog::KateMailDialog( QWidget *parent, KateMainWindow *mainwin ) mw = makeVBoxMainWidget(); mw->installEventFilter( this ); - lInfo = new QLabel( i18n( + lInfo = new TQLabel( i18n( "

    Press Mail... to email the current document." "

    To select more documents to send, press Show All Documents >>."), mw ); // TODO avoid untill needed - later @@ -63,7 +63,7 @@ KateMailDialog::KateMailDialog( QWidget *parent, KateMainWindow *mainwin ) Kate::Document *currentDoc = mainWindow->viewManager()->activeView()->getDoc(); uint n = KateDocManager::self()->documents(); uint i = 0; - QCheckListItem *item; + TQCheckListItem *item; while ( i < n ) { Kate::Document *doc = KateDocManager::self()->document( i ); if ( doc ) { @@ -77,14 +77,14 @@ KateMailDialog::KateMailDialog( QWidget *parent, KateMainWindow *mainwin ) i++; } list->hide(); - connect( this, SIGNAL(user1Clicked()), this, SLOT(slotShowButton()) ); + connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) ); mw->setMinimumSize( lInfo->sizeHint() ); } -QPtrList KateMailDialog::selectedDocs() +TQPtrList KateMailDialog::selectedDocs() { - QPtrList l; - QListViewItem *item = list->firstChild(); + TQPtrList l; + TQListViewItem *item = list->firstChild(); while ( item ) { if ( ((KateDocCheckItem*)item)->isOn() ) l.append( ((KateDocCheckItem*)item)->doc() ); @@ -105,7 +105,7 @@ void KateMailDialog::slotShowButton() lInfo->setText( i18n("Press Mail... to send selected documents") ); } - mw->setMinimumSize( QSize( lInfo->sizeHint().width(), mw->sizeHint().height()) ); + mw->setMinimumSize( TQSize( lInfo->sizeHint().width(), mw->sizeHint().height()) ); setMinimumSize( calculateSize( mw->minimumSize().width(), mw->sizeHint().height() ) ); resize( width(), minimumHeight() ); } diff --git a/kate/app/katemailfilesdialog.h b/kate/app/katemailfilesdialog.h index 906cd99fa..377b9617c 100644 --- a/kate/app/katemailfilesdialog.h +++ b/kate/app/katemailfilesdialog.h @@ -23,7 +23,7 @@ #include #include -#include +#include class QString; class QStringList; @@ -38,21 +38,21 @@ class KateMainWindow; class KateMailDialog : public KDialogBase { Q_OBJECT public: - KateMailDialog( QWidget *parent=0, + KateMailDialog( TQWidget *parent=0, KateMainWindow *mainwin=0 ); ~KateMailDialog() {}; /** @return a list of the selected docs. */ - QPtrList selectedDocs(); + TQPtrList selectedDocs(); private slots: void slotShowButton(); private: class KListView *list; - class QLabel *lInfo; + class TQLabel *lInfo; KateMainWindow *mainWindow; - class QVBox *mw; + class TQVBox *mw; }; diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp index 892f49271..371161de0 100644 --- a/kate/app/katemain.cpp +++ b/kate/app/katemain.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include @@ -58,7 +58,7 @@ static KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) { // here we go, construct the Kate version - QString kateVersion = KateApp::kateVersion(); + TQString kateVersion = KateApp::kateVersion(); KAboutData aboutData ("kate", I18N_NOOP("Kate"), kateVersion.latin1(), I18N_NOOP( "Kate - Advanced Text Editor" ), KAboutData::License_LGPL_V2, @@ -117,7 +117,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) QCStringList allClients = client.registeredApplications(); // search for a kate app client, use the first found - QCString kateApp; + TQCString kateApp; if ( args->isSet("start") ) { @@ -126,8 +126,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) if (allClients[i] == "kate" || allClients[i].left(5) == "kate-") { DCOPRef ref( allClients[i], "KateApplication" ); - QString s = ref.call( "session" ); - if ( QString(args->getOption("start")) == s ) + TQString s = ref.call( "session" ); + if ( TQString(args->getOption("start")) == s ) { kateApp = allClients[i]; break; @@ -137,7 +137,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) } else if ( (args->isSet("pid")) || (::getenv("KATE_PID") !=0 ) ) { - QCString tryApp; + TQCString tryApp; if ( args->isSet("pid") ) tryApp = args->getOption("pid"); else @@ -168,9 +168,9 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) DCOPRef kRef (kateApp, "KateApplication"); if (args->isSet ("start")) - kRef.call( "activateSession", QString (args->getOption("start")) ); + kRef.call( "activateSession", TQString (args->getOption("start")) ); - QString enc = args->isSet("encoding") ? args->getOption("encoding") : QCString(""); + TQString enc = args->isSet("encoding") ? args->getOption("encoding") : TQCString(""); bool tempfileSet = KCmdLineArgs::isTempFileSet(); @@ -179,16 +179,16 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) if( args->isSet( "stdin" ) ) { - QTextIStream input(stdin); + TQTextIStream input(stdin); // set chosen codec - QTextCodec *codec = args->isSet("encoding") ? QTextCodec::codecForName(args->getOption("encoding")) : 0; + TQTextCodec *codec = args->isSet("encoding") ? TQTextCodec::codecForName(args->getOption("encoding")) : 0; if (codec) input.setCodec (codec); - QString line; - QString text; + TQString line; + TQString text; do { @@ -222,8 +222,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) // wants to see that document. // ### what to do about the infamous focus stealing prevention? uint mwn = kRef.call("activeMainWindowNumber"); - QCString smwn; - DCOPRef wRef( kateApp, QCString( "__KateMainWindow#") + smwn.setNum(mwn) ); + TQCString smwn; + DCOPRef wRef( kateApp, TQCString( "__KateMainWindow#") + smwn.setNum(mwn) ); if ( wRef.call("minimized") ) { if ( wRef.call( "maximized" ) ) diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index 772f63339..dea2b0fae 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -77,8 +77,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -86,8 +86,8 @@ uint KateMainWindow::uniqueID = 1; -KateMainWindow::KateMainWindow (KConfig *sconfig, const QString &sgroup) - : KateMDI::MainWindow (0,(QString("__KateMainWindow#%1").arg(uniqueID)).latin1()) +KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup) + : KateMDI::MainWindow (0,(TQString("__KateMainWindow#%1").arg(uniqueID)).latin1()) { // first the very important id myID = uniqueID; @@ -101,17 +101,17 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const QString &sgroup) // here we go, set some usable default sizes if (!initialGeometrySet()) { - int scnum = QApplication::desktop()->screenNumber(parentWidget()); - QRect desk = QApplication::desktop()->screenGeometry(scnum); + int scnum = TQApplication::desktop()->screenNumber(parentWidget()); + TQRect desk = TQApplication::desktop()->screenGeometry(scnum); - QSize size; + TQSize size; // try to load size if (sconfig) { sconfig->setGroup (sgroup); - size.setWidth (sconfig->readNumEntry( QString::fromLatin1("Width %1").arg(desk.width()), 0 )); - size.setHeight (sconfig->readNumEntry( QString::fromLatin1("Height %1").arg(desk.height()), 0 )); + size.setWidth (sconfig->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 )); + size.setHeight (sconfig->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 )); } // if thats fails, try to reuse size @@ -131,11 +131,11 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const QString &sgroup) { // first try global app config KateApp::self()->config()->setGroup ("MainWindow"); - size.setWidth (KateApp::self()->config()->readNumEntry( QString::fromLatin1("Width %1").arg(desk.width()), 0 )); - size.setHeight (KateApp::self()->config()->readNumEntry( QString::fromLatin1("Height %1").arg(desk.height()), 0 )); + 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 )); if (size.isEmpty()) - size = QSize (kMin (700, desk.width()), kMin(480, desk.height())); + size = TQSize (kMin (700, desk.width()), kMin(480, desk.height())); } resize (size); @@ -166,14 +166,14 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const QString &sgroup) Kate::Document::registerCommand(KateExternalToolsCommand::self()); // connect documents menu aboutToshow - documentMenu = (QPopupMenu*)factory()->container("documents", this); - connect(documentMenu, SIGNAL(aboutToShow()), this, SLOT(documentMenuAboutToShow())); + documentMenu = (TQPopupMenu*)factory()->container("documents", this); + connect(documentMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(documentMenuAboutToShow())); // caption update for (uint i = 0; i < KateDocManager::self()->documents(); i++) slotDocumentCreated (KateDocManager::self()->document(i)); - connect(KateDocManager::self(),SIGNAL(documentCreated(Kate::Document *)),this,SLOT(slotDocumentCreated(Kate::Document *))); + connect(KateDocManager::self(),TQT_SIGNAL(documentCreated(Kate::Document *)),this,TQT_SLOT(slotDocumentCreated(Kate::Document *))); readOptions(); @@ -215,15 +215,15 @@ void KateMainWindow::setupMainWindow () KateMDI::ToolView *t = createToolView("kate_fileselector", KMultiTabBar::Left, SmallIcon("fileopen"), i18n("Filesystem Browser")); fileselector = new KateFileSelector( this, m_viewManager, t, "operator"); - connect(fileselector->dirOperator(),SIGNAL(fileSelected(const KFileItem*)),this,SLOT(fileSelected(const KFileItem*))); + connect(fileselector->dirOperator(),TQT_SIGNAL(fileSelected(const KFileItem*)),this,TQT_SLOT(fileSelected(const KFileItem*))); // ONLY ALLOW SHELL ACCESS IF ALLOWED ;) if (KateApp::self()->authorize("shell_access")) { t = createToolView("kate_greptool", KMultiTabBar::Bottom, SmallIcon("filefind"), i18n("Find in Files") ); greptool = new GrepTool( t, "greptool" ); - connect(greptool, SIGNAL(itemSelected(const QString &,int)), this, SLOT(slotGrepToolItemSelected(const QString &,int))); - connect(t,SIGNAL(visibleChanged(bool)),this, SLOT(updateGrepDir (bool))); + connect(greptool, TQT_SIGNAL(itemSelected(const TQString &,int)), this, TQT_SLOT(slotGrepToolItemSelected(const TQString &,int))); + connect(t,TQT_SIGNAL(visibleChanged(bool)),this, TQT_SLOT(updateGrepDir (bool))); // WARNING HACK - anders: showing the greptool seems to make the menu accels work greptool->show(); @@ -239,25 +239,25 @@ void KateMainWindow::setupActions() { KAction *a; - KStdAction::openNew( m_viewManager, SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document")); - KStdAction::open( m_viewManager, SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing")); + 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")); - fileOpenRecent = KStdAction::openRecent (m_viewManager, SLOT(openURL (const KURL&)), actionCollection()); + fileOpenRecent = KStdAction::openRecent (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(), SLOT( saveAll() ), actionCollection(), "file_save_all" ); + 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, SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document.")); + KStdAction::close( m_viewManager, TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document.")); - a=new KAction( i18n( "Clos&e All" ), 0, this, SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" ); + a=new KAction( i18n( "Clos&e All" ), 0, this, TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" ); a->setWhatsThis(i18n("Close all open documents.")); - KStdAction::mail( this, SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments.")); + KStdAction::mail( this, TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments.")); - KStdAction::quit( this, SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window")); + KStdAction::quit( this, TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window")); - a=new KAction(i18n("&New Window"), "window_new", 0, this, SLOT(newWindow()), actionCollection(), "view_new_view"); + a=new KAction(i18n("&New Window"), "window_new", 0, 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") ) @@ -267,46 +267,46 @@ void KateMainWindow::setupActions() } KToggleAction* showFullScreenAction = KStdAction::fullScreen( 0, 0, actionCollection(),this); - connect( showFullScreenAction,SIGNAL(toggled(bool)), this,SLOT(slotFullScreen(bool))); + connect( showFullScreenAction,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(slotFullScreen(bool))); documentOpenWith = new KActionMenu(i18n("Open W&ith"), actionCollection(), "file_open_with"); documentOpenWith->setWhatsThis(i18n("Open the current document using another application registered for its file type, or an application of your choice.")); - connect(documentOpenWith->popupMenu(), SIGNAL(aboutToShow()), this, SLOT(mSlotFixOpenWithMenu())); - connect(documentOpenWith->popupMenu(), SIGNAL(activated(int)), this, SLOT(slotOpenWithMenuAction(int))); + 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, SLOT(editKeys()), actionCollection()); + a=KStdAction::keyBindings(this, TQT_SLOT(editKeys()), actionCollection()); a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments.")); - a=KStdAction::configureToolbars(this, SLOT(slotEditToolbars()), actionCollection()); + a=KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection()); a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s).")); - KAction* settingsConfigure = KStdAction::preferences(this, SLOT(slotConfigure()), actionCollection(), "settings_configure"); + KAction* settingsConfigure = KStdAction::preferences(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, SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal"); + new KAction(i18n("&Pipe to Console"), "pipe", 0, console, TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal"); // tip of the day :-) - KStdAction::tipOfDay( this, SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); + KStdAction::tipOfDay( 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, SLOT(pluginHelp()), actionCollection(), "help_plugins_contents"); + a=new KAction(i18n("&Plugins Handbook"), 0, this, TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents"); a->setWhatsThis(i18n("This shows help files for various available plugins.")); } - connect(m_viewManager,SIGNAL(viewChanged()),this,SLOT(slotWindowActivated())); - connect(m_viewManager,SIGNAL(viewChanged()),this,SLOT(slotUpdateOpenWith())); + connect(m_viewManager,TQT_SIGNAL(viewChanged()),this,TQT_SLOT(slotWindowActivated())); + connect(m_viewManager,TQT_SIGNAL(viewChanged()),this,TQT_SLOT(slotUpdateOpenWith())); slotWindowActivated (); // session actions - new KAction(i18n("Menu entry Session->New", "&New"), "filenew", 0, KateSessionManager::self(), SLOT(sessionNew()), actionCollection(), "sessions_new"); - new KAction(i18n("&Open..."), "fileopen", 0, KateSessionManager::self(), SLOT(sessionOpen()), actionCollection(), "sessions_open"); - new KAction(i18n("&Save"), "filesave", 0, KateSessionManager::self(), SLOT(sessionSave()), actionCollection(), "sessions_save"); - new KAction(i18n("Save &As..."), "filesaveas", 0, KateSessionManager::self(), SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as"); - new KAction(i18n("&Manage..."), "view_choose", 0, KateSessionManager::self(), SLOT(sessionManage()), actionCollection(), "sessions_manage"); + 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"); // quick open menu ;) new KateSessionsAction (i18n("&Quick Open"), actionCollection(), "sessions_list"); @@ -328,7 +328,7 @@ bool KateMainWindow::queryClose_internal() { if ( ! showModOnDiskPrompt() ) return false; - QPtrList modifiedDocuments=KateDocManager::self()->modifiedDocumentList(); + TQPtrList modifiedDocuments=KateDocManager::self()->modifiedDocumentList(); bool shutdown=(modifiedDocuments.count()==0); if (!shutdown) { @@ -386,7 +386,7 @@ void KateMainWindow::slotEditToolbars() { saveMainWindowSettings( KateApp::self()->config(), "MainWindow" ); KEditToolbar dlg( factory() ); - connect( &dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotNewToolbarConfig()) ); + connect( &dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()) ); dlg.exec(); } @@ -449,8 +449,8 @@ void KateMainWindow::slotWindowActivated () { if (console && syncKonsole) { - static QString path; - QString newPath = m_viewManager->activeView()->getDoc()->url().directory(); + static TQString path; + TQString newPath = m_viewManager->activeView()->getDoc()->url().directory(); if ( newPath != path ) { @@ -480,14 +480,14 @@ void KateMainWindow::documentMenuAboutToShow() while (documentMenu->count() > 3) documentMenu->removeItemAt (3); - QListViewItem * item = filelist->firstChild(); + TQListViewItem * item = filelist->firstChild(); while( item ) { // would it be saner to use the screen width as a limit that some random number?? - QString name = KStringHandler::rsqueeze( ((KateFileListItem *)item)->document()->docName(), 150 ); + TQString name = KStringHandler::rsqueeze( ((KateFileListItem *)item)->document()->docName(), 150 ); Kate::Document* doc = ((KateFileListItem *)item)->document(); documentMenu->insertItem ( doc->isModified() ? i18n("'document name [*]', [*] means modified", "%1 [*]").arg(name) : name, - m_viewManager, SLOT (activateView (int)), 0, + m_viewManager, TQT_SLOT (activateView (int)), 0, ((KateFileListItem *)item)->documentNumber () ); item = item->nextSibling(); @@ -496,7 +496,7 @@ void KateMainWindow::documentMenuAboutToShow() documentMenu->setItemChecked ( m_viewManager->activeView()->getDoc()->documentNumber(), true); } -void KateMainWindow::slotGrepToolItemSelected(const QString &filename,int linenumber) +void KateMainWindow::slotGrepToolItemSelected(const TQString &filename,int linenumber) { KURL fileURL; fileURL.setPath( filename ); @@ -507,17 +507,17 @@ void KateMainWindow::slotGrepToolItemSelected(const QString &filename,int linenu setActiveWindow(); } -void KateMainWindow::dragEnterEvent( QDragEnterEvent *event ) +void KateMainWindow::dragEnterEvent( TQDragEnterEvent *event ) { event->accept(KURLDrag::canDecode(event)); } -void KateMainWindow::dropEvent( QDropEvent *event ) +void KateMainWindow::dropEvent( TQDropEvent *event ) { slotDropEvent(event); } -void KateMainWindow::slotDropEvent( QDropEvent * event ) +void KateMainWindow::slotDropEvent( TQDropEvent * event ) { KURL::List textlist; if (!KURLDrag::decode(event, textlist)) return; @@ -532,20 +532,20 @@ void KateMainWindow::editKeys() { KKeyDialog dlg ( false, this ); - QPtrList clients = guiFactory()->clients(); + TQPtrList clients = guiFactory()->clients(); - for( QPtrListIterator it( clients ); it.current(); ++it ) + for( TQPtrListIterator it( clients ); it.current(); ++it ) dlg.insert ( (*it)->actionCollection(), (*it)->instance()->aboutData()->programName() ); dlg.insert( externalTools->actionCollection(), i18n("External Tools") ); dlg.configure(); - QPtrList l=KateDocManager::self()->documentList(); + TQPtrList l=KateDocManager::self()->documentList(); for (uint i=0;ireloadXML(); - QPtrList l1=l.at(i)->views ();//KTextEditor::Document + TQPtrList l1=l.at(i)->views ();//KTextEditor::Document for (uint i1=0;i1reloadXML(); // kdDebug(13001)<<"reloading Keysettings for view "<actionCollection()->writeShortcutSettings( "Shortcuts", new KConfig("externaltools", false, false, "appdata") ); } -void KateMainWindow::openURL (const QString &name) +void KateMainWindow::openURL (const TQString &name) { m_viewManager->openURL (KURL(name)); } @@ -615,7 +615,7 @@ void KateMainWindow::slotOpenWithMenuAction(int idx) { KURL::List list; list.append( m_viewManager->activeView()->getDoc()->url() ); - QString appname = documentOpenWith->popupMenu()->text(idx); + TQString appname = documentOpenWith->popupMenu()->text(idx); appname = appname.remove('&'); //Remove a possible accelerator ... otherwise the application might not get found. if ( appname.compare(i18n("Other...")) == 0 ) { @@ -626,7 +626,7 @@ void KateMainWindow::slotOpenWithMenuAction(int idx) return; } - QString qry = QString("((Type == 'Application') and (Name == '%1'))").arg( appname.latin1() ); + TQString qry = TQString("((Type == 'Application') and (Name == '%1'))").arg( appname.latin1() ); KMimeType::Ptr mime = KMimeType::findByURL( m_viewManager->activeView()->getDoc()->url() ); KTrader::OfferList offers = KTrader::self()->query(mime->name(), qry); @@ -640,7 +640,7 @@ void KateMainWindow::slotOpenWithMenuAction(int idx) void KateMainWindow::pluginHelp() { - KateApp::self()->invokeHelp (QString::null, "kate-plugins"); + KateApp::self()->invokeHelp (TQString::null, "kate-plugins"); } void KateMainWindow::slotMail() @@ -651,12 +651,12 @@ void KateMainWindow::slotMail() delete d; return; } - QPtrList attDocs = d->selectedDocs(); + TQPtrList attDocs = d->selectedDocs(); delete d; // Check that all selected files are saved (or shouldn't be) - QStringList urls; // to atthatch + TQStringList urls; // to atthatch Kate::Document *doc; - QPtrListIterator it(attDocs); + TQPtrListIterator it(attDocs); for ( ; it.current(); ++it ) { doc = it.current(); if (!doc) continue; @@ -709,18 +709,18 @@ void KateMainWindow::slotMail() } // check selected docs done if ( ! urls.count() ) return; - KateApp::self()->invokeMailer( QString::null, // to - QString::null, // cc - QString::null, // bcc - QString::null, // subject - QString::null, // body - QString::null, // msgfile + KateApp::self()->invokeMailer( TQString::null, // to + TQString::null, // cc + TQString::null, // bcc + TQString::null, // subject + TQString::null, // body + TQString::null, // msgfile urls // urls to atthatch ); } void KateMainWindow::tipOfTheDay() { - KTipDialog::showTip( /*0*/this, QString::null, true ); + KTipDialog::showTip( /*0*/this, TQString::null, true ); } void KateMainWindow::slotFullScreen(bool t) @@ -746,10 +746,10 @@ void KateMainWindow::updateGrepDir (bool visible) } } -bool KateMainWindow::event( QEvent *e ) +bool KateMainWindow::event( TQEvent *e ) { uint type = e->type(); - if ( type == QEvent::WindowActivate && modNotification ) + if ( type == TQEvent::WindowActivate && modNotification ) { showModOnDiskPrompt(); } @@ -786,9 +786,9 @@ bool KateMainWindow::showModOnDiskPrompt() void KateMainWindow::slotDocumentCreated (Kate::Document *doc) { - connect(doc,SIGNAL(modStateChanged(Kate::Document *)),this,SLOT(updateCaption(Kate::Document *))); - connect(doc,SIGNAL(nameChanged(Kate::Document *)),this,SLOT(updateCaption(Kate::Document *))); - connect(doc,SIGNAL(nameChanged(Kate::Document *)),this,SLOT(slotUpdateOpenWith())); + connect(doc,TQT_SIGNAL(modStateChanged(Kate::Document *)),this,TQT_SLOT(updateCaption(Kate::Document *))); + connect(doc,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(updateCaption(Kate::Document *))); + connect(doc,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(slotUpdateOpenWith())); updateCaption (doc); } @@ -804,7 +804,7 @@ void KateMainWindow::updateCaption (Kate::Document *doc) if (!(m_viewManager->activeView()->getDoc() == doc)) return; - QString c; + TQString c; if (m_viewManager->activeView()->getDoc()->url().isEmpty() || (!m_viewManager->getShowFullPath())) { c = m_viewManager->activeView()->getDoc()->docName(); @@ -814,9 +814,9 @@ void KateMainWindow::updateCaption (Kate::Document *doc) c = m_viewManager->activeView()->getDoc()->url().prettyURL(); } - QString sessName = KateApp::self()->sessionManager()->activeSession()->sessionName(); + TQString sessName = KateApp::self()->sessionManager()->activeSession()->sessionName(); if ( !sessName.isEmpty() ) - sessName = QString("%1: ").arg( sessName ); + sessName = TQString("%1: ").arg( sessName ); setCaption( sessName + KStringHandler::lsqueeze(c,64), m_viewManager->activeView()->getDoc()->isModified()); @@ -824,7 +824,7 @@ void KateMainWindow::updateCaption (Kate::Document *doc) void KateMainWindow::saveProperties(KConfig *config) { - QString grp=config->group(); + TQString grp=config->group(); saveSession(config, grp); m_viewManager->saveViewConfiguration (config, grp); @@ -834,7 +834,7 @@ void KateMainWindow::saveProperties(KConfig *config) void KateMainWindow::readProperties(KConfig *config) { - QString grp=config->group(); + TQString grp=config->group(); startRestore(config, grp); finishRestore (); diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h index d5a67f65b..77db9999c 100644 --- a/kate/app/katemainwindow.h +++ b/kate/app/katemainwindow.h @@ -58,7 +58,7 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa * @param sconfig session config for this window, 0 if none * @param sgroup session config group to use */ - KateMainWindow (KConfig *sconfig, const QString &sgroup); + KateMainWindow (KConfig *sconfig, const TQString &sgroup); /** * Destruct the nice window @@ -124,8 +124,8 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa */ void saveOptions(); - void dragEnterEvent( QDragEnterEvent * ); - void dropEvent( QDropEvent * ); + void dragEnterEvent( TQDragEnterEvent * ); + void dropEvent( TQDropEvent * ); /** * slots used for actions in the menus/toolbars @@ -138,7 +138,7 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa void slotOpenWithMenuAction(int idx); - void slotGrepToolItemSelected ( const QString &filename, int linenumber ); + void slotGrepToolItemSelected ( const TQString &filename, int linenumber ); void slotMail(); void slotFileQuit(); @@ -147,7 +147,7 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa void slotWindowActivated (); void slotUpdateOpenWith(); void documentMenuAboutToShow(); - void slotDropEvent(QDropEvent *); + void slotDropEvent(TQDropEvent *); void editKeys(); void mSlotFixOpenWithMenu(); @@ -163,13 +163,13 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa void slotFullScreen(bool); public: - void openURL (const QString &name=0L); + void openURL (const TQString &name=0L); private slots: void updateGrepDir (bool visible); protected: - bool event( QEvent * ); + bool event( TQEvent * ); private slots: void slotDocumentCloseAll(); @@ -199,7 +199,7 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa KActionMenu* documentOpenWith; - QPopupMenu *documentMenu; + TQPopupMenu *documentMenu; KToggleAction* settingsShowFilelist; KToggleAction* settingsShowFileselector; diff --git a/kate/app/katemainwindowiface.cpp b/kate/app/katemainwindowiface.cpp index 9a748ffc9..c966cb71e 100644 --- a/kate/app/katemainwindowiface.cpp +++ b/kate/app/katemainwindowiface.cpp @@ -22,6 +22,6 @@ #include -KateMainWindowDCOPIface::KateMainWindowDCOPIface (KateMainWindow *w) : DCOPObject ((QString("KateMainWindow#%1").arg(w->mainWindowNumber())).latin1()), m_w (w) +KateMainWindowDCOPIface::KateMainWindowDCOPIface (KateMainWindow *w) : DCOPObject ((TQString("KateMainWindow#%1").arg(w->mainWindowNumber())).latin1()), m_w (w) { } diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index fbe9be1e1..9d73e762c 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -34,16 +34,16 @@ #include #include -#include -#include -#include +#include +#include +#include namespace KateMDI { //BEGIN SPLITTER -Splitter::Splitter(Orientation o, QWidget* parent, const char* name) - : QSplitter(o, parent, name) +Splitter::Splitter(Orientation o, TQWidget* parent, const char* name) + : TQSplitter(o, parent, name) { } @@ -51,14 +51,14 @@ Splitter::~Splitter() { } -bool Splitter::isLastChild(QWidget* w) const +bool Splitter::isLastChild(TQWidget* w) const { return ( idAfter( w ) == 0 ); } -int Splitter::idAfter ( QWidget * w ) const +int Splitter::idAfter ( TQWidget * w ) const { - return QSplitter::idAfter (w); + return TQSplitter::idAfter (w); } //END SPLITTER @@ -66,13 +66,13 @@ int Splitter::idAfter ( QWidget * w ) const //BEGIN TOGGLETOOLVIEWACTION -ToggleToolViewAction::ToggleToolViewAction ( const QString& text, const KShortcut& cut, ToolView *tv, - QObject* parent, const char* name ) +ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const KShortcut& cut, ToolView *tv, + TQObject* parent, const char* name ) : KToggleAction(text,cut,parent,name) , m_tv(tv) { - connect(this,SIGNAL(toggled(bool)),this,SLOT(slotToggled(bool))); - connect(m_tv,SIGNAL(visibleChanged(bool)),this,SLOT(visibleChanged(bool))); + connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool))); + connect(m_tv,TQT_SIGNAL(visibleChanged(bool)),this,TQT_SLOT(visibleChanged(bool))); setChecked(m_tv->visible()); } @@ -119,16 +119,16 @@ static const char *guiDescription = "" ""; GUIClient::GUIClient ( MainWindow *mw ) - : QObject ( mw ) + : TQObject ( mw ) , KXMLGUIClient ( mw ) , m_mw (mw) { - connect( m_mw->guiFactory(), SIGNAL( clientAdded( KXMLGUIClient * ) ), - this, SLOT( clientAdded( KXMLGUIClient * ) ) ); + connect( m_mw->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ), + this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) ); if ( domDocument().documentElement().isNull() ) { - QString completeDescription = QString::fromLatin1( guiDescription ) + TQString completeDescription = TQString::fromLatin1( guiDescription ) .arg( actionListName ); setXML( completeDescription, false /*merge*/ ); @@ -142,8 +142,8 @@ GUIClient::GUIClient ( MainWindow *mw ) CTRL|ALT|SHIFT|Key_F, actionCollection(), "kate_mdi_sidebar_visibility" ); m_showSidebarsAction->setCheckedState(i18n("Hide Side&bars")); m_showSidebarsAction->setChecked( m_mw->sidebarsVisible() ); - connect( m_showSidebarsAction, SIGNAL( toggled( bool ) ), - m_mw, SLOT( setSidebarsVisible( bool ) ) ); + connect( m_showSidebarsAction, TQT_SIGNAL( toggled( bool ) ), + m_mw, TQT_SLOT( setSidebarsVisible( bool ) ) ); m_toolMenu->insert( m_showSidebarsAction ); m_toolMenu->insert( new KActionSeparator( m_toolMenu ) ); @@ -163,12 +163,12 @@ void GUIClient::updateSidebarsVisibleAction() void GUIClient::registerToolView (ToolView *tv) { - QString aname = QString("kate_mdi_toolview_") + tv->id; + TQString aname = TQString("kate_mdi_toolview_") + tv->id; // try to read the action shortcut KShortcut sc; KConfig *cfg = kapp->config(); - QString _grp = cfg->group(); + TQString _grp = cfg->group(); cfg->setGroup("Shortcuts"); sc = KShortcut( cfg->readEntry( aname, "" ) ); cfg->setGroup( _grp ); @@ -214,7 +214,7 @@ void GUIClient::updateActions() unplugActionList( actionListName ); - QPtrList addList; + TQPtrList addList; addList.append(m_toolMenu); plugActionList( actionListName, addList ); @@ -225,8 +225,8 @@ void GUIClient::updateActions() //BEGIN TOOLVIEW -ToolView::ToolView (MainWindow *mainwin, Sidebar *sidebar, QWidget *parent) - : QVBox (parent) +ToolView::ToolView (MainWindow *mainwin, Sidebar *sidebar, TQWidget *parent) + : TQVBox (parent) , m_mainWin (mainwin) , m_sidebar (sidebar) , m_visible (false) @@ -253,13 +253,13 @@ bool ToolView::visible () const return m_visible; } -void ToolView::childEvent ( QChildEvent *ev ) +void ToolView::childEvent ( TQChildEvent *ev ) { // set the widget to be focus proxy if possible - if (ev->inserted() && ev->child() && ev->child()->qt_cast("QWidget")) - setFocusProxy ((QWidget *)(ev->child()->qt_cast("QWidget"))); + if (ev->inserted() && ev->child() && ev->child()->qt_cast("TQWidget")) + setFocusProxy ((TQWidget *)(ev->child()->qt_cast("TQWidget"))); - QVBox::childEvent (ev); + TQVBox::childEvent (ev); } //END TOOLVIEW @@ -267,7 +267,7 @@ void ToolView::childEvent ( QChildEvent *ev ) //BEGIN SIDEBAR -Sidebar::Sidebar (KMultiTabBar::KMultiTabBarPosition pos, MainWindow *mainwin, QWidget *parent) +Sidebar::Sidebar (KMultiTabBar::KMultiTabBarPosition pos, MainWindow *mainwin, TQWidget *parent) : KMultiTabBar ((pos == KMultiTabBar::Top || pos == KMultiTabBar::Bottom) ? KMultiTabBar::Horizontal : KMultiTabBar::Vertical, parent) , m_mainWin (mainwin) , m_splitter (0) @@ -288,11 +288,11 @@ void Sidebar::setSplitter (Splitter *sp) m_ownSplit = new Splitter ((position() == KMultiTabBar::Top || position() == KMultiTabBar::Bottom) ? Qt::Horizontal : Qt::Vertical, m_splitter); m_ownSplit->setOpaqueResize( KGlobalSettings::opaqueResize() ); m_ownSplit->setChildrenCollapsible( false ); - m_splitter->setResizeMode( m_ownSplit, QSplitter::KeepSize ); + m_splitter->setResizeMode( m_ownSplit, TQSplitter::KeepSize ); m_ownSplit->hide (); } -ToolView *Sidebar::addWidget (const QPixmap &icon, const QString &text, ToolView *widget) +ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolView *widget) { static int id = 0; @@ -318,7 +318,7 @@ ToolView *Sidebar::addWidget (const QPixmap &icon, const QString &text, ToolView else { widget->hide (); - widget->reparent (m_ownSplit, 0, QPoint()); + widget->reparent (m_ownSplit, 0, TQPoint()); widget->m_sidebar = this; } @@ -331,7 +331,7 @@ ToolView *Sidebar::addWidget (const QPixmap &icon, const QString &text, ToolView show (); - connect(tab(newId),SIGNAL(clicked(int)),this,SLOT(tabClicked(int))); + connect(tab(newId),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int))); tab(newId)->installEventFilter(this); return widget; @@ -349,7 +349,7 @@ bool Sidebar::removeWidget (ToolView *widget) m_toolviews.remove (widget); bool anyVis = false; - QIntDictIterator it( m_idToWidget ); + TQIntDictIterator it( m_idToWidget ); for ( ; it.current(); ++it ) { if (!anyVis) @@ -373,7 +373,7 @@ bool Sidebar::showWidget (ToolView *widget) return false; // hide other non-persistent views - QIntDictIterator it( m_idToWidget ); + TQIntDictIterator it( m_idToWidget ); for ( ; it.current(); ++it ) if ((it.current() != widget) && !it.current()->persistent) { @@ -401,7 +401,7 @@ bool Sidebar::hideWidget (ToolView *widget) updateLastSize (); - for ( QIntDictIterator it( m_idToWidget ); it.current(); ++it ) + for ( TQIntDictIterator it( m_idToWidget ); it.current(); ++it ) { if (it.current() == widget) { @@ -443,11 +443,11 @@ void Sidebar::tabClicked(int i) } } -bool Sidebar::eventFilter(QObject *obj, QEvent *ev) +bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev) { - if (ev->type()==QEvent::ContextMenu) + if (ev->type()==TQEvent::ContextMenu) { - QContextMenuEvent *e = (QContextMenuEvent *) ev; + TQContextMenuEvent *e = (TQContextMenuEvent *) ev; KMultiTabBarTab *bt = dynamic_cast(obj); if (bt) { @@ -479,8 +479,8 @@ bool Sidebar::eventFilter(QObject *obj, QEvent *ev) if (position() != 3) p->insertItem(SmallIconSet("down"), i18n("Bottom Sidebar"),3); - connect(p, SIGNAL(activated(int)), - this, SLOT(buttonPopupActivate(int))); + connect(p, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(buttonPopupActivate(int))); p->exec(e->globalPos()); delete p; @@ -523,7 +523,7 @@ void Sidebar::buttonPopupActivate (int id) void Sidebar::updateLastSize () { - QValueList s = m_splitter->sizes (); + TQValueList s = m_splitter->sizes (); int i = 0; if ((position() == KMultiTabBar::Right || position() == KMultiTabBar::Bottom)) @@ -549,7 +549,7 @@ void Sidebar::restoreSession (KConfig *config) { ToolView *tv = m_toolviews[firstWrong]; - unsigned int pos = config->readUnsignedNumEntry (QString ("Kate-MDI-ToolView-%1-Sidebar-Position").arg(tv->id), firstWrong); + unsigned int pos = config->readUnsignedNumEntry (TQString ("Kate-MDI-ToolView-%1-Sidebar-Position").arg(tv->id), firstWrong); if (pos != firstWrong) break; @@ -559,12 +559,12 @@ void Sidebar::restoreSession (KConfig *config) if (firstWrong < m_toolviews.size()) { // first: collect the items to reshuffle - QValueList toSort; + TQValueList toSort; for (unsigned int i=firstWrong; i < m_toolviews.size(); ++i) { TmpToolViewSorter s; s.tv = m_toolviews[i]; - s.pos = config->readUnsignedNumEntry (QString ("Kate-MDI-ToolView-%1-Sidebar-Position").arg(m_toolviews[i]->id), i); + s.pos = config->readUnsignedNumEntry (TQString ("Kate-MDI-ToolView-%1-Sidebar-Position").arg(m_toolviews[i]->id), i); toSort.push_back (s); } @@ -595,7 +595,7 @@ void Sidebar::restoreSession (KConfig *config) // readd the button int newId = m_widgetToId[tv]; appendTab (tv->icon, newId, tv->text); - connect(tab(newId),SIGNAL(clicked(int)),this,SLOT(tabClicked(int))); + connect(tab(newId),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int))); tab(newId)->installEventFilter(this); // reshuffle in splitter @@ -607,7 +607,7 @@ void Sidebar::restoreSession (KConfig *config) updateLastSize (); // restore the own splitter sizes - QValueList s = config->readIntListEntry (QString ("Kate-MDI-Sidebar-%1-Splitter").arg(position())); + TQValueList s = config->readIntListEntry (TQString ("Kate-MDI-Sidebar-%1-Splitter").arg(position())); m_ownSplit->setSizes (s); // show only correct toolviews, remember persistent values ;) @@ -616,8 +616,8 @@ void Sidebar::restoreSession (KConfig *config) { ToolView *tv = m_toolviews[i]; - tv->persistent = config->readBoolEntry (QString ("Kate-MDI-ToolView-%1-Persistent").arg(tv->id), false); - tv->setVisible (config->readBoolEntry (QString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), false)); + tv->persistent = config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Persistent").arg(tv->id), false); + tv->setVisible (config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), false)); if (!anyVis) anyVis = tv->visible(); @@ -639,18 +639,18 @@ void Sidebar::restoreSession (KConfig *config) void Sidebar::saveSession (KConfig *config) { // store the own splitter sizes - QValueList s = m_ownSplit->sizes(); - config->writeEntry (QString ("Kate-MDI-Sidebar-%1-Splitter").arg(position()), s); + TQValueList s = m_ownSplit->sizes(); + config->writeEntry (TQString ("Kate-MDI-Sidebar-%1-Splitter").arg(position()), s); // store the data about all toolviews in this sidebar ;) for ( unsigned int i=0; i < m_toolviews.size(); ++i ) { ToolView *tv = m_toolviews[i]; - config->writeEntry (QString ("Kate-MDI-ToolView-%1-Position").arg(tv->id), tv->sidebar()->position()); - config->writeEntry (QString ("Kate-MDI-ToolView-%1-Sidebar-Position").arg(tv->id), i); - config->writeEntry (QString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), tv->visible()); - config->writeEntry (QString ("Kate-MDI-ToolView-%1-Persistent").arg(tv->id), tv->persistent); + config->writeEntry (TQString ("Kate-MDI-ToolView-%1-Position").arg(tv->id), tv->sidebar()->position()); + config->writeEntry (TQString ("Kate-MDI-ToolView-%1-Sidebar-Position").arg(tv->id), i); + config->writeEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), tv->visible()); + config->writeEntry (TQString ("Kate-MDI-ToolView-%1-Persistent").arg(tv->id), tv->persistent); } } @@ -659,14 +659,14 @@ void Sidebar::saveSession (KConfig *config) //BEGIN MAIN WINDOW -MainWindow::MainWindow (QWidget* parentWidget, const char* name) +MainWindow::MainWindow (TQWidget* parentWidget, const char* name) : KParts::MainWindow( parentWidget, name) , m_sidebarsVisible(true) , m_restoreConfig (0) , m_guiClient (new GUIClient (this)) { // init the internal widgets - QHBox *hb = new QHBox (this); + TQHBox *hb = new TQHBox (this); setCentralWidget(hb); m_sidebars[KMultiTabBar::Left] = new Sidebar (KMultiTabBar::Left, this, hb); @@ -676,7 +676,7 @@ MainWindow::MainWindow (QWidget* parentWidget, const char* name) m_sidebars[KMultiTabBar::Left]->setSplitter (m_hSplitter); - QVBox *vb = new QVBox (m_hSplitter); + TQVBox *vb = new TQVBox (m_hSplitter); m_hSplitter->setCollapsible(vb, false); m_sidebars[KMultiTabBar::Top] = new Sidebar (KMultiTabBar::Top, this, vb); @@ -686,7 +686,7 @@ MainWindow::MainWindow (QWidget* parentWidget, const char* name) m_sidebars[KMultiTabBar::Top]->setSplitter (m_vSplitter); - m_centralWidget = new QVBox (m_vSplitter); + m_centralWidget = new TQVBox (m_vSplitter); m_vSplitter->setCollapsible(m_centralWidget, false); m_sidebars[KMultiTabBar::Bottom] = new Sidebar (KMultiTabBar::Bottom, this, vb); @@ -709,12 +709,12 @@ MainWindow::~MainWindow () delete m_sidebars[i]; } -QWidget *MainWindow::centralWidget () const +TQWidget *MainWindow::centralWidget () const { return m_centralWidget; } -ToolView *MainWindow::createToolView (const QString &identifier, KMultiTabBar::KMultiTabBarPosition pos, const QPixmap &icon, const QString &text) +ToolView *MainWindow::createToolView (const TQString &identifier, KMultiTabBar::KMultiTabBarPosition pos, const TQPixmap &icon, const TQString &text) { if (m_idToWidget[identifier]) return 0; @@ -723,7 +723,7 @@ ToolView *MainWindow::createToolView (const QString &identifier, KMultiTabBar::K if (m_restoreConfig && m_restoreConfig->hasGroup (m_restoreGroup)) { m_restoreConfig->setGroup (m_restoreGroup); - pos = (KMultiTabBar::KMultiTabBarPosition) m_restoreConfig->readNumEntry (QString ("Kate-MDI-ToolView-%1-Position").arg(identifier), pos); + pos = (KMultiTabBar::KMultiTabBarPosition) m_restoreConfig->readNumEntry (TQString ("Kate-MDI-ToolView-%1-Position").arg(identifier), pos); } ToolView *v = m_sidebars[pos]->addWidget (icon, text, 0); @@ -738,7 +738,7 @@ ToolView *MainWindow::createToolView (const QString &identifier, KMultiTabBar::K return v; } -ToolView *MainWindow::toolView (const QString &identifier) const +ToolView *MainWindow::toolView (const TQString &identifier) const { return m_idToWidget[identifier]; } @@ -782,7 +782,7 @@ void MainWindow::setSidebarsVisible( bool visible ) "invoke Window > Tool Views > Show Sidebars " "in the menu. It is still possible to show/hide " "the tool views with the assigned shortcuts."), - QString::null, "Kate hide sidebars notification message" ); + TQString::null, "Kate hide sidebars notification message" ); } } @@ -814,7 +814,7 @@ bool MainWindow::moveToolView (ToolView *widget, KMultiTabBar::KMultiTabBarPosit if (m_restoreConfig && m_restoreConfig->hasGroup (m_restoreGroup)) { m_restoreConfig->setGroup (m_restoreGroup); - pos = (KMultiTabBar::KMultiTabBarPosition) m_restoreConfig->readNumEntry (QString ("Kate-MDI-ToolView-%1-Position").arg(widget->id), pos); + pos = (KMultiTabBar::KMultiTabBarPosition) m_restoreConfig->readNumEntry (TQString ("Kate-MDI-ToolView-%1-Position").arg(widget->id), pos); } m_sidebars[pos]->addWidget (widget->icon, widget->text, widget); @@ -846,7 +846,7 @@ bool MainWindow::hideToolView (ToolView *widget) return widget->sidebar()->hideWidget (widget); } -void MainWindow::startRestore (KConfig *config, const QString &group) +void MainWindow::startRestore (KConfig *config, const TQString &group) { // first save this stuff m_restoreConfig = config; @@ -855,9 +855,9 @@ void MainWindow::startRestore (KConfig *config, const QString &group) if (!m_restoreConfig || !m_restoreConfig->hasGroup (m_restoreGroup)) { // set sane default sizes - QValueList hs; + TQValueList hs; hs << 200 << 100 << 200; - QValueList vs; + TQValueList vs; vs << 150 << 100 << 200; m_sidebars[0]->setLastSize (hs[0]); @@ -877,8 +877,8 @@ void MainWindow::startRestore (KConfig *config, const QString &group) m_restoreConfig->setGroup (m_restoreGroup); // get main splitter sizes ;) - QValueList hs = m_restoreConfig->readIntListEntry ("Kate-MDI-H-Splitter"); - QValueList vs = m_restoreConfig->readIntListEntry ("Kate-MDI-V-Splitter"); + TQValueList hs = m_restoreConfig->readIntListEntry ("Kate-MDI-H-Splitter"); + TQValueList vs = m_restoreConfig->readIntListEntry ("Kate-MDI-V-Splitter"); m_sidebars[0]->setLastSize (hs[0]); m_sidebars[1]->setLastSize (hs[2]); @@ -909,7 +909,7 @@ void MainWindow::finishRestore () m_restoreConfig->setGroup (m_restoreGroup); for ( unsigned int i=0; i < m_toolviews.size(); ++i ) { - KMultiTabBar::KMultiTabBarPosition newPos = (KMultiTabBar::KMultiTabBarPosition) m_restoreConfig->readNumEntry (QString ("Kate-MDI-ToolView-%1-Position").arg(m_toolviews[i]->id), m_toolviews[i]->sidebar()->position()); + KMultiTabBar::KMultiTabBarPosition newPos = (KMultiTabBar::KMultiTabBarPosition) m_restoreConfig->readNumEntry (TQString ("Kate-MDI-ToolView-%1-Position").arg(m_toolviews[i]->id), m_toolviews[i]->sidebar()->position()); if (m_toolviews[i]->sidebar()->position() != newPos) { @@ -928,7 +928,7 @@ void MainWindow::finishRestore () m_restoreGroup = ""; } -void MainWindow::saveSession (KConfig *config, const QString &group) +void MainWindow::saveSession (KConfig *config, const TQString &group) { if (!config) return; @@ -938,8 +938,8 @@ void MainWindow::saveSession (KConfig *config, const QString &group) config->setGroup (group); // save main splitter sizes ;) - QValueList hs = m_hSplitter->sizes(); - QValueList vs = m_vSplitter->sizes(); + TQValueList hs = m_hSplitter->sizes(); + TQValueList vs = m_vSplitter->sizes(); if (hs[0] <= 2 && !m_sidebars[0]->splitterVisible ()) hs[0] = m_sidebars[0]->lastSize(); diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h index 2aa6429bd..1b13c30a8 100644 --- a/kate/app/katemdi.h +++ b/kate/app/katemdi.h @@ -27,34 +27,34 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace KateMDI { -/** This class is needed because QSplitter cant return an index for a widget. */ +/** This class is needed because TQSplitter cant return an index for a widget. */ class Splitter : public QSplitter { Q_OBJECT public: - Splitter(Orientation o, QWidget* parent=0, const char* name=0); + Splitter(Orientation o, TQWidget* parent=0, const char* name=0); ~Splitter(); /** Since there is supposed to be only 2 childs of a katesplitter, * any child other than the last is the first. - * This method uses QSplitter::idAfter(widget) which + * This method uses TQSplitter::idAfter(widget) which * returns 0 if there is no widget after this one. * This results in an error if widget is not a child * in this splitter */ - bool isLastChild(QWidget* w) const; + bool isLastChild(TQWidget* w) const; - int idAfter ( QWidget * w ) const; + int idAfter ( TQWidget * w ) const; }; class ToggleToolViewAction : public KToggleAction @@ -62,8 +62,8 @@ class ToggleToolViewAction : public KToggleAction Q_OBJECT public: - ToggleToolViewAction ( const QString& text, const KShortcut& cut, - class ToolView *tv, QObject* parent = 0, const char* name = 0 ); + ToggleToolViewAction ( const TQString& text, const KShortcut& cut, + class ToolView *tv, TQObject* parent = 0, const char* name = 0 ); virtual ~ToggleToolViewAction(); @@ -75,7 +75,7 @@ class ToggleToolViewAction : public KToggleAction ToolView *m_tv; }; -class GUIClient : public QObject, public KXMLGUIClient +class GUIClient : public TQObject, public KXMLGUIClient { Q_OBJECT @@ -94,8 +94,8 @@ class GUIClient : public QObject, public KXMLGUIClient private: MainWindow *m_mw; KToggleAction *m_showSidebarsAction; - QPtrList m_toolViewActions; - QMap m_toolToAction; + TQPtrList m_toolViewActions; + TQMap m_toolToAction; KActionMenu *m_toolMenu; }; @@ -118,7 +118,7 @@ class ToolView : public QVBox * @param sidebar sidebar of this toolview * @param parent parent widget, e.g. the splitter of one of the sidebars */ - ToolView (class MainWindow *mainwin, class Sidebar *sidebar, QWidget *parent); + ToolView (class MainWindow *mainwin, class Sidebar *sidebar, TQWidget *parent); public: /** @@ -148,7 +148,7 @@ class ToolView : public QVBox bool visible () const; protected: - void childEvent ( QChildEvent *ev ); + void childEvent ( TQChildEvent *ev ); private: MainWindow *m_mainWin; @@ -157,7 +157,7 @@ class ToolView : public QVBox /** * unique id */ - QString id; + TQString id; /** * is visible in sidebar @@ -169,8 +169,8 @@ class ToolView : public QVBox */ bool persistent; - QPixmap icon; - QString text; + TQPixmap icon; + TQString text; }; class Sidebar : public KMultiTabBar @@ -178,13 +178,13 @@ class Sidebar : public KMultiTabBar Q_OBJECT public: - Sidebar (KMultiTabBar::KMultiTabBarPosition pos, class MainWindow *mainwin, QWidget *parent); + Sidebar (KMultiTabBar::KMultiTabBarPosition pos, class MainWindow *mainwin, TQWidget *parent); virtual ~Sidebar (); void setSplitter (Splitter *sp); public: - ToolView *addWidget (const QPixmap &icon, const QString &text, ToolView *widget); + ToolView *addWidget (const TQPixmap &icon, const TQString &text, ToolView *widget); bool removeWidget (ToolView *widget); bool showWidget (ToolView *widget); @@ -219,7 +219,7 @@ class Sidebar : public KMultiTabBar void tabClicked(int); protected: - bool eventFilter(QObject *obj, QEvent *ev); + bool eventFilter(TQObject *obj, TQEvent *ev); private slots: void buttonPopupActivate (int id); @@ -232,13 +232,13 @@ class Sidebar : public KMultiTabBar KMultiTabBar *m_tabBar; Splitter *m_ownSplit; - QIntDict m_idToWidget; - QMap m_widgetToId; + TQIntDict m_idToWidget; + TQMap m_widgetToId; /** * list of all toolviews around in this sidebar */ - QValueList m_toolviews; + TQValueList m_toolviews; int m_lastSize; @@ -258,7 +258,7 @@ class MainWindow : public KParts::MainWindow /** * Constructor */ - MainWindow (QWidget* parentWidget = 0, const char* name = 0); + MainWindow (TQWidget* parentWidget = 0, const char* name = 0); /** * Destructor @@ -275,7 +275,7 @@ class MainWindow : public KParts::MainWindow * this widget will get focus if a toolview is hidden * @return central widget */ - QWidget *centralWidget () const; + TQWidget *centralWidget () const; /** * add a given widget to the given sidebar if possible, name is very important @@ -285,14 +285,14 @@ class MainWindow : public KParts::MainWindow * @param text text to use in addition to icon * @return created toolview on success or 0 */ - ToolView *createToolView (const QString &identifier, KMultiTabBar::KMultiTabBarPosition pos, const QPixmap &icon, const QString &text); + ToolView *createToolView (const TQString &identifier, KMultiTabBar::KMultiTabBarPosition pos, const TQPixmap &icon, const TQString &text); /** * give you handle to toolview for the given name, 0 if no toolview around * @param identifier toolview name * @return toolview if existing, else 0 */ - ToolView *toolView (const QString &identifier) const; + ToolView *toolView (const TQString &identifier) const; /** * set the toolview's tabbar style. @@ -364,7 +364,7 @@ class MainWindow : public KParts::MainWindow * @param config config object to use * @param group config group to use */ - void startRestore (KConfig *config, const QString &group); + void startRestore (KConfig *config, const TQString &group); /** * finish the restore @@ -376,7 +376,7 @@ class MainWindow : public KParts::MainWindow * @param config config object to use * @param group config group to use */ - void saveSession (KConfig *config, const QString &group); + void saveSession (KConfig *config, const TQString &group); /** * internal data ;) @@ -385,18 +385,18 @@ class MainWindow : public KParts::MainWindow /** * map identifiers to widgets */ - QDict m_idToWidget; + TQDict m_idToWidget; /** * list of all toolviews around */ - QValueList m_toolviews; + TQValueList m_toolviews; /** * widget, which is the central part of the * main window ;) */ - QWidget *m_centralWidget; + TQWidget *m_centralWidget; /** * horizontal splitter @@ -427,7 +427,7 @@ class MainWindow : public KParts::MainWindow /** * restore group */ - QString m_restoreGroup; + TQString m_restoreGroup; /** * out guiclient diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp index efbee3cb5..5199a6925 100644 --- a/kate/app/katemwmodonhddialog.cpp +++ b/kate/app/katemwmodonhddialog.cpp @@ -33,18 +33,18 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include class KateDocItem : public QCheckListItem { public: - KateDocItem( Kate::Document *doc, const QString &status, KListView *lv ) - : QCheckListItem( lv, doc->url().prettyURL(), CheckBox ), + KateDocItem( Kate::Document *doc, const TQString &status, KListView *lv ) + : TQCheckListItem( lv, doc->url().prettyURL(), CheckBox ), document( doc ) { setText( 1, status ); @@ -57,7 +57,7 @@ class KateDocItem : public QCheckListItem }; -KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, QWidget *parent, const char *name ) +KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n("Documents Modified on Disk"), User1|User2|User3, User3, false, KGuiItem (i18n("&Ignore"), "fileclose"), @@ -74,16 +74,16 @@ KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, QWidget *parent, const "Reloads the selected documents from disk and closes the dialog if there " "are no more unhandled documents.") ); - QVBox *w = makeVBoxMainWidget(); + TQVBox *w = makeVBoxMainWidget(); w->setSpacing( KDialog::spacingHint() ); - QHBox *lo1 = new QHBox( w ); + TQHBox *lo1 = new TQHBox( w ); // dialog text - QLabel *icon = new QLabel( lo1 ); + TQLabel *icon = new TQLabel( lo1 ); icon->setPixmap( DesktopIcon("messagebox_warning") ); - QLabel *t = new QLabel( i18n( + TQLabel *t = new TQLabel( i18n( "The documents listed below has changed on disk.

    Select one " "or more at the time and press an action button until the list is empty."), lo1 ); lo1->setStretchFactor( t, 1000 ); @@ -92,26 +92,26 @@ KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, QWidget *parent, const lvDocuments = new KListView( w ); lvDocuments->addColumn( i18n("Filename") ); lvDocuments->addColumn( i18n("Status on Disk") ); - lvDocuments->setSelectionMode( QListView::Single ); + lvDocuments->setSelectionMode( TQListView::Single ); - QStringList l; + TQStringList l; l << "" << i18n("Modified") << i18n("Created") << i18n("Deleted"); for ( uint i=0; i < docs.size(); i++ ) new KateDocItem( docs[i], l[ (uint)KateDocManager::self()->documentInfo( docs[i] )->modifiedOnDiscReason ], lvDocuments ); - connect( lvDocuments, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged()) ); + connect( lvDocuments, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); // diff button - QHBox *lo2 = new QHBox ( w ); - QWidget *d = new QWidget (lo2); + TQHBox *lo2 = new TQHBox ( w ); + TQWidget *d = new TQWidget (lo2); lo2->setStretchFactor (d, 2); btnDiff = new KPushButton( KGuiItem (i18n("&View Difference"), "edit"), lo2 ); - QWhatsThis::add( btnDiff, i18n( + TQWhatsThis::add( btnDiff, i18n( "Calculates the difference between the the editor contents and the disk " "file for the selected document, and shows the difference with the " "default application. Requires diff(1).") ); - connect( btnDiff, SIGNAL(clicked()), this, SLOT(slotDiff()) ); + connect( btnDiff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDiff()) ); slotSelectionChanged(); m_tmpfile = 0; @@ -139,8 +139,8 @@ void KateMwModOnHdDialog::slotUser3() void KateMwModOnHdDialog::handleSelected( int action ) { // collect all items we can remove - QValueList itemsToDelete; - for ( QListViewItemIterator it ( lvDocuments ); it.current(); ++it ) + TQValueList itemsToDelete; + for ( TQListViewItemIterator it ( lvDocuments ); it.current(); ++it ) { KateDocItem *item = static_cast(it.current()); @@ -216,8 +216,8 @@ void KateMwModOnHdDialog::slotDiff() KProcIO *p = new KProcIO(); p->setComm( KProcess::All ); *p << "diff" << "-u" << "-" << doc->url().path(); - connect( p, SIGNAL(processExited(KProcess*)), this, SLOT(slotPDone(KProcess*)) ); - connect( p, SIGNAL(readReady(KProcIO*)), this, SLOT(slotPRead(KProcIO*)) ); + connect( p, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPDone(KProcess*)) ); + connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) ); setCursor( WaitCursor ); @@ -236,7 +236,7 @@ void KateMwModOnHdDialog::slotPRead( KProcIO *p) if ( ! m_tmpfile ) m_tmpfile = new KTempFile(); // put all the data we have in it - QString stmp; + TQString stmp; bool dataRead = false; while ( p->readln( stmp, false ) > -1 ) { *m_tmpfile->textStream() << stmp << endl; diff --git a/kate/app/katemwmodonhddialog.h b/kate/app/katemwmodonhddialog.h index 86ecd252a..7a5d8f7ca 100644 --- a/kate/app/katemwmodonhddialog.h +++ b/kate/app/katemwmodonhddialog.h @@ -21,10 +21,10 @@ #define _KATE_MW_MODONHD_DIALOG_H_ #include -#include +#include #include -typedef QPtrVector DocVector; +typedef TQPtrVector DocVector; class KProcIO; class KProcess; /** @@ -35,7 +35,7 @@ class KateMwModOnHdDialog : public KDialogBase { Q_OBJECT public: - KateMwModOnHdDialog( DocVector docs, QWidget *parent=0, const char *name=0 ); + KateMwModOnHdDialog( DocVector docs, TQWidget *parent=0, const char *name=0 ); ~KateMwModOnHdDialog(); protected slots: @@ -53,7 +53,7 @@ class KateMwModOnHdDialog : public KDialogBase enum Action { Ignore, Overwrite, Reload }; void handleSelected( int action ); class KListView *lvDocuments; - class QPushButton *btnDiff; + class TQPushButton *btnDiff; class KTempFile *m_tmpfile; }; diff --git a/kate/app/katepluginmanager.cpp b/kate/app/katepluginmanager.cpp index e3390e6a2..044cb73aa 100644 --- a/kate/app/katepluginmanager.cpp +++ b/kate/app/katepluginmanager.cpp @@ -27,12 +27,12 @@ #include "../interfaces/application.h" #include -#include +#include #include #include -#include +#include -KatePluginManager::KatePluginManager(QObject *parent) : QObject (parent) +KatePluginManager::KatePluginManager(TQObject *parent) : TQObject (parent) { m_pluginManager = new Kate::PluginManager (this); setupPluginList (); @@ -57,13 +57,13 @@ KatePluginManager *KatePluginManager::self() void KatePluginManager::setupPluginList () { - QValueList traderList= KTrader::self()->query("Kate/Plugin", "(not ('Kate/ProjectPlugin' in ServiceTypes)) and (not ('Kate/InitPlugin' in ServiceTypes))"); + TQValueList traderList= KTrader::self()->query("Kate/Plugin", "(not ('Kate/ProjectPlugin' in ServiceTypes)) and (not ('Kate/InitPlugin' in ServiceTypes))"); for(KTrader::OfferList::Iterator it(traderList.begin()); it != traderList.end(); ++it) { KService::Ptr ptr = (*it); - QString pVersion = ptr->property("X-Kate-Version").toString(); + TQString pVersion = ptr->property("X-Kate-Version").toString(); // if ((pVersion >= "2.5") && (pVersion <= KateApp::kateVersion(false))) if (pVersion == "2.5") @@ -94,7 +94,7 @@ void KatePluginManager::writeConfig () for (unsigned int i=0; i < m_pluginList.size(); ++i) { - QString saveName=m_pluginList[i].service->property("X-Kate-PluginName").toString(); + TQString saveName=m_pluginList[i].service->property("X-Kate-PluginName").toString(); if (saveName.isEmpty()) saveName = m_pluginList[i].service->library(); @@ -143,12 +143,12 @@ void KatePluginManager::disableAllPluginsGUI (KateMainWindow *win) void KatePluginManager::loadPlugin (KatePluginInfo *item) { - QString pluginName=item->service->property("X-Kate-PluginName").toString(); + TQString pluginName=item->service->property("X-Kate-PluginName").toString(); if (pluginName.isEmpty()) pluginName=item->service->library(); - item->load = (item->plugin = Kate::createPlugin (QFile::encodeName(item->service->library()), Kate::application(), 0, pluginName)); + item->load = (item->plugin = Kate::createPlugin (TQFile::encodeName(item->service->library()), Kate::application(), 0, pluginName)); } void KatePluginManager::unloadPlugin (KatePluginInfo *item) @@ -197,12 +197,12 @@ void KatePluginManager::disablePluginGUI (KatePluginInfo *item) } } -Kate::Plugin *KatePluginManager::plugin(const QString &name) +Kate::Plugin *KatePluginManager::plugin(const TQString &name) { for (unsigned int i=0; i < m_pluginList.size(); ++i) { KatePluginInfo *info = &m_pluginList[i]; - QString pluginName=info->service->property("X-Kate-PluginName").toString(); + TQString pluginName=info->service->property("X-Kate-PluginName").toString(); if (pluginName.isEmpty()) pluginName=info->service->library(); if (pluginName==name) @@ -216,6 +216,6 @@ Kate::Plugin *KatePluginManager::plugin(const QString &name) return 0; } -bool KatePluginManager::pluginAvailable(const QString &){return false;} -class Kate::Plugin *KatePluginManager::loadPlugin(const QString &,bool ){return 0;} -void KatePluginManager::unloadPlugin(const QString &,bool){;} +bool KatePluginManager::pluginAvailable(const TQString &){return false;} +class Kate::Plugin *KatePluginManager::loadPlugin(const TQString &,bool ){return 0;} +void KatePluginManager::unloadPlugin(const TQString &,bool){;} diff --git a/kate/app/katepluginmanager.h b/kate/app/katepluginmanager.h index 76f9578b2..568b3bbd1 100644 --- a/kate/app/katepluginmanager.h +++ b/kate/app/katepluginmanager.h @@ -28,8 +28,8 @@ #include -#include -#include +#include +#include class KatePluginInfo { @@ -39,14 +39,14 @@ class KatePluginInfo Kate::Plugin *plugin; }; -typedef QValueList KatePluginList; +typedef TQValueList KatePluginList; class KatePluginManager : public QObject { Q_OBJECT public: - KatePluginManager(QObject *parent); + KatePluginManager(TQObject *parent); ~KatePluginManager(); static KatePluginManager *self(); @@ -73,11 +73,11 @@ class KatePluginManager : public QObject inline KatePluginList & pluginList () { return m_pluginList; }; - Kate::Plugin *plugin (const QString &name); - bool pluginAvailable (const QString &name); + Kate::Plugin *plugin (const TQString &name); + bool pluginAvailable (const TQString &name); - Kate::Plugin *loadPlugin (const QString &name, bool permanent=true); - void unloadPlugin (const QString &name, bool permanent=true); + Kate::Plugin *loadPlugin (const TQString &name, bool permanent=true); + void unloadPlugin (const TQString &name, bool permanent=true); private: Kate::PluginManager *m_pluginManager; diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp index 51dc1ea61..09257300c 100644 --- a/kate/app/katesavemodifieddialog.cpp +++ b/kate/app/katesavemodifieddialog.cpp @@ -20,30 +20,30 @@ #include "katesavemodifieddialog.moc" #include -#include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -class AbstractKateSaveModifiedDialogCheckListItem:public QCheckListItem { +class AbstractKateSaveModifiedDialogCheckListItem:public TQCheckListItem { public: - AbstractKateSaveModifiedDialogCheckListItem(QListViewItem *parent,const QString& title, const QString& url):QCheckListItem(parent,title,QCheckListItem::CheckBox) { + AbstractKateSaveModifiedDialogCheckListItem(TQListViewItem *parent,const TQString& title, const TQString& url):TQCheckListItem(parent,title,TQCheckListItem::CheckBox) { setText(1,url); setOn(true); setState(InitialState); } virtual ~AbstractKateSaveModifiedDialogCheckListItem() { } - virtual bool synchronousSave(QWidget *dialogParent)=0; + virtual bool synchronousSave(TQWidget *dialogParent)=0; enum STATE{InitialState,SaveOKState,SaveFailedState}; STATE state() const { return m_state;} void setState(enum STATE state) { @@ -51,7 +51,7 @@ public: KIconLoader *loader = KGlobal::instance()->iconLoader(); switch (state) { case InitialState: - setPixmap(0,QPixmap()); + setPixmap(0,TQPixmap()); break; case SaveOKState: setPixmap(0,loader->loadIcon("ok",KIcon::NoGroup,height())); @@ -67,15 +67,15 @@ private: class KateSaveModifiedDocumentCheckListItem:public AbstractKateSaveModifiedDialogCheckListItem { public: - KateSaveModifiedDocumentCheckListItem(QListViewItem *parent,Kate::Document *document):AbstractKateSaveModifiedDialogCheckListItem(parent,document->docName(),document->url().prettyURL()){ + KateSaveModifiedDocumentCheckListItem(TQListViewItem *parent,Kate::Document *document):AbstractKateSaveModifiedDialogCheckListItem(parent,document->docName(),document->url().prettyURL()){ m_document=document; } virtual ~KateSaveModifiedDocumentCheckListItem() { } - virtual bool synchronousSave(QWidget *dialogParent) { + virtual bool synchronousSave(TQWidget *dialogParent) { if (m_document->url().isEmpty() ) { KEncodingFileDialog::Result r=KEncodingFileDialog::getSaveURLAndEncoding( - KTextEditor::encodingInterface(m_document)->encoding(),QString::null,QString::null,dialogParent,i18n("Save As (%1)").arg(m_document->docName())); + KTextEditor::encodingInterface(m_document)->encoding(),TQString::null,TQString::null,dialogParent,i18n("Save As (%1)").arg(m_document->docName())); m_document->setEncoding( r.encoding ); if (!r.URLs.isEmpty()) { @@ -125,7 +125,7 @@ private: Kate::Document *m_document; }; -KateSaveModifiedDialog::KateSaveModifiedDialog(QWidget *parent, QPtrList documents): +KateSaveModifiedDialog::KateSaveModifiedDialog(TQWidget *parent, TQPtrList documents): KDialogBase( parent, "KateSaveModifiedDialog", true, i18n("Save Documents"), Yes | No | Cancel) { KGuiItem saveItem=KStdGuiItem::save(); @@ -138,18 +138,18 @@ KateSaveModifiedDialog::KateSaveModifiedDialog(QWidget *parent, QPtrListThe following documents have been modified. Do you want to save them before closing?"),box); m_list=new KListView(box); m_list->addColumn(i18n("Title")); m_list->addColumn(i18n("Location")); m_list->setRootIsDecorated(true); - m_list->setResizeMode(QListView::LastColumn); + m_list->setResizeMode(TQListView::LastColumn); if (0) { - m_projectRoot=new QListViewItem(m_list,i18n("Projects")); + m_projectRoot=new TQListViewItem(m_list,i18n("Projects")); } else m_projectRoot=0; if (documents.count()>0) { - m_documentRoot=new QListViewItem(m_list,i18n("Documents")); + m_documentRoot=new TQListViewItem(m_list,i18n("Documents")); const uint docCnt=documents.count(); for (uint i=0;isetOpen(true); } else m_documentRoot=0; //FIXME - Is this the best way? - connect(m_list, SIGNAL(clicked(QListViewItem *)), SLOT(slotItemSelected())); - connect(m_list, SIGNAL(doubleClicked(QListViewItem *)), SLOT(slotItemSelected())); - connect(m_list, SIGNAL(spacePressed(QListViewItem *)), SLOT(slotItemSelected())); + connect(m_list, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotItemSelected())); + connect(m_list, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotItemSelected())); + connect(m_list, TQT_SIGNAL(spacePressed(TQListViewItem *)), TQT_SLOT(slotItemSelected())); if(documents.count()>3) { //For 3 or less, it would be quicker just to tick or untick them yourself, so don't clutter the gui. - connect(new QPushButton(i18n("Se&lect All"),box),SIGNAL(clicked()),this,SLOT(slotSelectAll())); + connect(new TQPushButton(i18n("Se&lect All"),box),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotSelectAll())); } } @@ -171,8 +171,8 @@ KateSaveModifiedDialog::~KateSaveModifiedDialog() { void KateSaveModifiedDialog::slotItemSelected() { kdDebug(13001) << "slotItemSelected()" << endl; - for(QListViewItem *it=m_documentRoot->firstChild();it;it=it->nextSibling()) { - if(((QCheckListItem*)it)->isOn()) { + for(TQListViewItem *it=m_documentRoot->firstChild();it;it=it->nextSibling()) { + if(((TQCheckListItem*)it)->isOn()) { enableButton(KDialogBase::Yes, true); return; } @@ -180,10 +180,10 @@ void KateSaveModifiedDialog::slotItemSelected() { enableButton(KDialogBase::Yes, false); } -static void selectItems(QListViewItem *root) { +static void selectItems(TQListViewItem *root) { if (!root) return; - for (QListViewItem *it=root->firstChild();it;it=it->nextSibling()) { - ((QCheckListItem*)it)->setOn(true); + for (TQListViewItem *it=root->firstChild();it;it=it->nextSibling()) { + ((TQCheckListItem*)it)->setOn(true); } } @@ -195,16 +195,16 @@ void KateSaveModifiedDialog::slotSelectAll() { void KateSaveModifiedDialog::slotUser2() { kdDebug(13001)<<"KateSaveModifiedDialog::slotYes()"<firstChild();it;it=it->nextSibling()) { + for (TQListViewItem *it=root->firstChild();it;it=it->nextSibling()) { AbstractKateSaveModifiedDialogCheckListItem *cit= (AbstractKateSaveModifiedDialogCheckListItem*)it; if (cit->isOn() && (cit->state()!=AbstractKateSaveModifiedDialogCheckListItem::SaveOKState)) { if (!cit->synchronousSave(this /*perhaps that should be the kate mainwindow*/)) { @@ -220,7 +220,7 @@ bool KateSaveModifiedDialog::doSave(QListViewItem *root) { return true; } -bool KateSaveModifiedDialog::queryClose(QWidget *parent,QPtrList documents) { +bool KateSaveModifiedDialog::queryClose(TQWidget *parent,TQPtrList documents) { KateSaveModifiedDialog d(parent,documents); - return (d.exec()!=QDialog::Rejected); + return (d.exec()!=TQDialog::Rejected); } diff --git a/kate/app/katesavemodifieddialog.h b/kate/app/katesavemodifieddialog.h index 65817356b..97d39b3f0 100644 --- a/kate/app/katesavemodifieddialog.h +++ b/kate/app/katesavemodifieddialog.h @@ -28,20 +28,20 @@ class KListView; class KateSaveModifiedDialog: public KDialogBase { Q_OBJECT public: - KateSaveModifiedDialog(QWidget *parent, QPtrList documents); + KateSaveModifiedDialog(TQWidget *parent, TQPtrList documents); virtual ~KateSaveModifiedDialog(); - static bool queryClose(QWidget *parent,QPtrList documents); + static bool queryClose(TQWidget *parent,TQPtrList documents); protected: virtual void slotUser2(); virtual void slotUser1(); - bool doSave(QListViewItem *root); + bool doSave(TQListViewItem *root); protected slots: void slotSelectAll(); void slotItemSelected(); private: - QListViewItem *m_projectRoot; - QListViewItem *m_documentRoot; + TQListViewItem *m_projectRoot; + TQListViewItem *m_documentRoot; KListView *m_list; }; diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp index 0d208c566..fd0e059f9 100644 --- a/kate/app/katesession.cpp +++ b/kate/app/katesession.cpp @@ -36,14 +36,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -53,7 +53,7 @@ bool operator<( const KateSession::Ptr& a, const KateSession::Ptr& b ) return a->sessionName().lower() < b->sessionName().lower(); } -KateSession::KateSession (KateSessionManager *manager, const QString &fileName, const QString &name) +KateSession::KateSession (KateSessionManager *manager, const TQString &fileName, const TQString &name) : m_sessionFileRel (fileName) , m_sessionName (name) , m_documents (0) @@ -101,7 +101,7 @@ void KateSession::init () if (m_sessionFileRel == "default.katesession") m_sessionName = i18n("Default Session"); else - m_sessionName = i18n("Session (%1)").arg(QTime::currentTime().toString(Qt::LocalDate)); + m_sessionName = i18n("Session (%1)").arg(TQTime::currentTime().toString(Qt::LocalDate)); } // create the file, write name to it! @@ -119,12 +119,12 @@ KateSession::~KateSession () delete m_writeConfig; } -QString KateSession::sessionFile () const +TQString KateSession::sessionFile () const { return m_manager->sessionsDir() + "/" + m_sessionFileRel; } -bool KateSession::create (const QString &name, bool force) +bool KateSession::create (const TQString &name, bool force) { if (!force && (name.isEmpty() || !m_sessionFileRel.isEmpty())) return false; @@ -139,12 +139,12 @@ bool KateSession::create (const QString &name, bool force) // get a usable filename int s = time(0); - QCString tname; + TQCString tname; while (true) { tname.setNum (s++); KMD5 md5 (tname); - m_sessionFileRel = QString ("%1.katesession").arg (md5.hexDigest().data()); + m_sessionFileRel = TQString ("%1.katesession").arg (md5.hexDigest().data()); if (!KGlobal::dirs()->exists(sessionFile ())) break; @@ -162,7 +162,7 @@ bool KateSession::create (const QString &name, bool force) return true; } -bool KateSession::rename (const QString &name) +bool KateSession::rename (const TQString &name) { if (name.isEmpty () || m_sessionFileRel.isEmpty() || m_sessionFileRel == "default.katesession") return false; @@ -203,8 +203,8 @@ KConfig *KateSession::configWrite () return m_writeConfig; } -KateSessionManager::KateSessionManager (QObject *parent) - : QObject (parent) +KateSessionManager::KateSessionManager (TQObject *parent) + : TQObject (parent) , m_sessionsDir (locateLocal( "data", "kate/sessions")) , m_activeSession (new KateSession (this, "", "")) { @@ -223,7 +223,7 @@ KateSessionManager *KateSessionManager::self() return KateApp::self()->sessionManager (); } -void KateSessionManager::dirty (const QString &) +void KateSessionManager::dirty (const TQString &) { updateSessionList (); } @@ -233,7 +233,7 @@ void KateSessionManager::updateSessionList () m_sessionList.clear (); // Let's get a list of all session we have atm - QDir dir (m_sessionsDir, "*.katesession"); + TQDir dir (m_sessionsDir, "*.katesession"); bool foundDefault = false; for (unsigned int i=0; i < dir.count(); ++i) @@ -317,11 +317,11 @@ void KateSessionManager::activateSession (KateSession::Ptr session, bool closeLa { if (i >= KateApp::self()->mainWindows()) { - KateApp::self()->newMainWindow(sc, QString ("MainWindow%1").arg(i)); + KateApp::self()->newMainWindow(sc, TQString ("MainWindow%1").arg(i)); } else { - sc->setGroup(QString ("MainWindow%1").arg(i)); + sc->setGroup(TQString ("MainWindow%1").arg(i)); KateApp::self()->mainWindow(i)->readProperties (sc); } } @@ -342,7 +342,7 @@ void KateSessionManager::activateSession (KateSession::Ptr session, bool closeLa } } -KateSession::Ptr KateSessionManager::createSession (const QString &name) +KateSession::Ptr KateSessionManager::createSession (const TQString &name) { KateSession::Ptr s = new KateSession (this, "", ""); s->create (name); @@ -350,7 +350,7 @@ KateSession::Ptr KateSessionManager::createSession (const QString &name) return s; } -KateSession::Ptr KateSessionManager::giveSession (const QString &name) +KateSession::Ptr KateSessionManager::giveSession (const TQString &name) { if (name.isEmpty()) return new KateSession (this, "", ""); @@ -374,7 +374,7 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast) KConfig *c = KateApp::self()->config(); c->setGroup("General"); - QString sesExit (c->readEntry ("Session Exit", "save")); + TQString sesExit (c->readEntry ("Session Exit", "save")); if (sesExit == "discard") return true; @@ -387,8 +387,8 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast) ); bool dontAgain = false; - int res = KMessageBox::createKMessageBox(dlg, QMessageBox::Question, - i18n("Save current session?"), QStringList(), + int res = KMessageBox::createKMessageBox(dlg, TQMessageBox::Question, + i18n("Save current session?"), TQStringList(), i18n("Do not ask again"), &dontAgain, KMessageBox::Notify); // remember to not ask again with right setting @@ -420,7 +420,7 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast) // save config for all windows around ;) for (unsigned int i=0; i < KateApp::self()->mainWindows (); ++i ) { - sc->setGroup(QString ("MainWindow%1").arg(i)); + sc->setGroup(TQString ("MainWindow%1").arg(i)); KateApp::self()->mainWindow(i)->saveProperties (sc); } @@ -446,8 +446,8 @@ bool KateSessionManager::chooseSession () c->setGroup("General"); // get last used session, default to default session - QString lastSession (c->readEntry ("Last Session", "default.katesession")); - QString sesStart (c->readEntry ("Startup Session", "manual")); + TQString lastSession (c->readEntry ("Last Session", "default.katesession")); + TQString sesStart (c->readEntry ("Startup Session", "manual")); // uhh, just open last used session, show no chooser if (sesStart == "last") @@ -551,7 +551,7 @@ void KateSessionManager::sessionSave () return; bool ok = false; - QString name = KInputDialog::getText (i18n("Specify Name for Current Session"), i18n("Session name:"), "", &ok); + TQString name = KInputDialog::getText (i18n("Specify Name for Current Session"), i18n("Session name:"), "", &ok); if (!ok) return; @@ -569,7 +569,7 @@ void KateSessionManager::sessionSave () void KateSessionManager::sessionSaveAs () { bool ok = false; - QString name = KInputDialog::getText (i18n("Specify New Name for Current Session"), i18n("Session name:"), "", &ok); + TQString name = KInputDialog::getText (i18n("Specify New Name for Current Session"), i18n("Session name:"), "", &ok); if (!ok) return; @@ -600,10 +600,10 @@ class KateSessionChooserItem : public QListViewItem { public: KateSessionChooserItem (KListView *lv, KateSession::Ptr s) - : QListViewItem (lv, s->sessionName()) + : TQListViewItem (lv, s->sessionName()) , session (s) { - QString docs; + TQString docs; docs.setNum (s->documents()); setText (1, docs); } @@ -611,7 +611,7 @@ class KateSessionChooserItem : public QListViewItem KateSession::Ptr session; }; -KateSessionChooser::KateSessionChooser (QWidget *parent, const QString &lastSession) +KateSessionChooser::KateSessionChooser (TQWidget *parent, const TQString &lastSession) : KDialogBase ( parent , "" , true @@ -624,29 +624,29 @@ KateSessionChooser::KateSessionChooser (QWidget *parent, const QString &lastSess , KGuiItem (i18n ("New Session"), "filenew") ) { - QHBox *page = new QHBox (this); + TQHBox *page = new TQHBox (this); page->setMinimumSize (400, 200); setMainWidget(page); - QHBox *hb = new QHBox (page); + TQHBox *hb = new TQHBox (page); hb->setSpacing (KDialog::spacingHint()); - QLabel *label = new QLabel (hb); + TQLabel *label = new TQLabel (hb); label->setPixmap (UserIcon("sessionchooser")); - label->setFrameStyle (QFrame::Panel | QFrame::Sunken); + label->setFrameStyle (TQFrame::Panel | TQFrame::Sunken); - QVBox *vb = new QVBox (hb); + TQVBox *vb = new TQVBox (hb); vb->setSpacing (KDialog::spacingHint()); m_sessions = new KListView (vb); m_sessions->addColumn (i18n("Session Name")); m_sessions->addColumn (i18n("Open Documents")); - m_sessions->setResizeMode (QListView::AllColumns); - m_sessions->setSelectionMode (QListView::Single); + m_sessions->setResizeMode (TQListView::AllColumns); + m_sessions->setSelectionMode (TQListView::Single); m_sessions->setAllColumnsShowFocus (true); - connect (m_sessions, SIGNAL(selectionChanged()), this, SLOT(selectionChanged())); - connect (m_sessions, SIGNAL(doubleClicked(QListViewItem *, const QPoint &, int)), this, SLOT(slotUser2())); + connect (m_sessions, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); + connect (m_sessions, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(slotUser2())); KateSessionList &slist (KateSessionManager::self()->sessionList()); for (unsigned int i=0; i < slist.count(); ++i) @@ -657,7 +657,7 @@ KateSessionChooser::KateSessionChooser (QWidget *parent, const QString &lastSess m_sessions->setSelected (item, true); } - m_useLast = new QCheckBox (i18n ("&Always use this choice"), vb); + m_useLast = new TQCheckBox (i18n ("&Always use this choice"), vb); setResult (resultNone); @@ -708,7 +708,7 @@ void KateSessionChooser::selectionChanged () //BEGIN OPEN DIALOG -KateSessionOpenDialog::KateSessionOpenDialog (QWidget *parent) +KateSessionOpenDialog::KateSessionOpenDialog (TQWidget *parent) : KDialogBase ( parent , "" , true @@ -720,22 +720,22 @@ KateSessionOpenDialog::KateSessionOpenDialog (QWidget *parent) , KGuiItem( i18n("&Open"), "fileopen") ) { - QHBox *page = new QHBox (this); + TQHBox *page = new TQHBox (this); page->setMinimumSize (400, 200); setMainWidget(page); - QHBox *hb = new QHBox (page); + TQHBox *hb = new TQHBox (page); - QVBox *vb = new QVBox (hb); + TQVBox *vb = new TQVBox (hb); m_sessions = new KListView (vb); m_sessions->addColumn (i18n("Session Name")); m_sessions->addColumn (i18n("Open Documents")); - m_sessions->setResizeMode (QListView::AllColumns); - m_sessions->setSelectionMode (QListView::Single); + m_sessions->setResizeMode (TQListView::AllColumns); + m_sessions->setSelectionMode (TQListView::Single); m_sessions->setAllColumnsShowFocus (true); - connect (m_sessions, SIGNAL(doubleClicked(QListViewItem *, const QPoint &, int)), this, SLOT(slotUser2())); + connect (m_sessions, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(slotUser2())); KateSessionList &slist (KateSessionManager::self()->sessionList()); for (unsigned int i=0; i < slist.count(); ++i) @@ -774,7 +774,7 @@ void KateSessionOpenDialog::slotUser2 () //BEGIN MANAGE DIALOG -KateSessionManageDialog::KateSessionManageDialog (QWidget *parent) +KateSessionManageDialog::KateSessionManageDialog (TQWidget *parent) : KDialogBase ( parent , "" , true @@ -785,34 +785,34 @@ KateSessionManageDialog::KateSessionManageDialog (QWidget *parent) , KStdGuiItem::close () ) { - QHBox *page = new QHBox (this); + TQHBox *page = new TQHBox (this); page->setMinimumSize (400, 200); setMainWidget(page); - QHBox *hb = new QHBox (page); + TQHBox *hb = new TQHBox (page); hb->setSpacing (KDialog::spacingHint()); m_sessions = new KListView (hb); m_sessions->addColumn (i18n("Session Name")); m_sessions->addColumn (i18n("Open Documents")); - m_sessions->setResizeMode (QListView::AllColumns); - m_sessions->setSelectionMode (QListView::Single); + m_sessions->setResizeMode (TQListView::AllColumns); + m_sessions->setSelectionMode (TQListView::Single); m_sessions->setAllColumnsShowFocus (true); - connect (m_sessions, SIGNAL(selectionChanged()), this, SLOT(selectionChanged())); + connect (m_sessions, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); updateSessionList (); - QWidget *vb = new QWidget (hb); - QVBoxLayout *vbl = new QVBoxLayout (vb); + TQWidget *vb = new TQWidget (hb); + TQVBoxLayout *vbl = new TQVBoxLayout (vb); vbl->setSpacing (KDialog::spacingHint()); m_rename = new KPushButton (i18n("&Rename..."), vb); - connect (m_rename, SIGNAL(clicked()), this, SLOT(rename())); + connect (m_rename, TQT_SIGNAL(clicked()), this, TQT_SLOT(rename())); vbl->addWidget (m_rename); m_del = new KPushButton (KStdGuiItem::del (), vb); - connect (m_del, SIGNAL(clicked()), this, SLOT(del())); + connect (m_del, TQT_SIGNAL(clicked()), this, TQT_SLOT(del())); vbl->addWidget (m_del); vbl->addStretch (); @@ -847,7 +847,7 @@ void KateSessionManageDialog::rename () return; bool ok = false; - QString name = KInputDialog::getText (i18n("Specify New Name for Session"), i18n("Session name:"), item->session->sessionName(), &ok); + TQString name = KInputDialog::getText (i18n("Specify New Name for Session"), i18n("Session name:"), item->session->sessionName(), &ok); if (!ok) return; @@ -869,7 +869,7 @@ void KateSessionManageDialog::del () if (!item || item->session->sessionFileRelative() == "default.katesession") return; - QFile::remove (item->session->sessionFile()); + TQFile::remove (item->session->sessionFile()); KateSessionManager::self()->updateSessionList (); updateSessionList (); } @@ -888,10 +888,10 @@ void KateSessionManageDialog::updateSessionList () //END MANAGE DIALOG -KateSessionsAction::KateSessionsAction(const QString& text, QObject* parent, const char* name ) +KateSessionsAction::KateSessionsAction(const TQString& text, TQObject* parent, const char* name ) : KActionMenu(text, parent, name) { - connect(popupMenu(),SIGNAL(aboutToShow()),this,SLOT(slotAboutToShow())); + connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); } void KateSessionsAction::slotAboutToShow() @@ -903,7 +903,7 @@ void KateSessionsAction::slotAboutToShow() { popupMenu()->insertItem ( slist[i]->sessionName(), - this, SLOT (openSession (int)), 0, + this, TQT_SLOT (openSession (int)), 0, i ); } } diff --git a/kate/app/katesession.h b/kate/app/katesession.h index 899daff53..2b0dc39c4 100644 --- a/kate/app/katesession.h +++ b/kate/app/katesession.h @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include class KateSessionManager; @@ -52,7 +52,7 @@ class KateSession : public KShared * @param name session name * @param manager pointer to the manager */ - KateSession (KateSessionManager *manager, const QString &fileName, const QString &name); + KateSession (KateSessionManager *manager, const TQString &fileName, const TQString &name); /** * init the session object, after construction or create @@ -68,19 +68,19 @@ class KateSession : public KShared * session filename, absolute, calculated out of relative filename + session dir * @return absolute path to session file */ - QString sessionFile () const; + TQString sessionFile () const; /** * relative session filename * @return relative filename for this session */ - const QString &sessionFileRelative () const { return m_sessionFileRel; } + const TQString &sessionFileRelative () const { return m_sessionFileRel; } /** * session name * @return name for this session */ - const QString &sessionName () const { return m_sessionName; } + const TQString &sessionName () const { return m_sessionName; } /** * is this a valid session? if not, don't use any session if this is @@ -94,14 +94,14 @@ class KateSession : public KShared * @param force force to create new file * @return true if created, false if no creation needed */ - bool create (const QString &name, bool force = false); + bool create (const TQString &name, bool force = false); /** * rename this session * @param name new name * @return success */ - bool rename (const QString &name); + bool rename (const TQString &name); /** * config to read @@ -130,12 +130,12 @@ class KateSession : public KShared * session filename, in local location we can write to * relative filename to the session dirs :) */ - QString m_sessionFileRel; + TQString m_sessionFileRel; /** * session name, extracted from the file, to display to the user */ - QString m_sessionName; + TQString m_sessionName; /** * number of document of this session @@ -158,14 +158,14 @@ class KateSession : public KShared KSimpleConfig *m_writeConfig; }; -typedef QValueList KateSessionList; +typedef TQValueList KateSessionList; class KateSessionManager : public QObject { Q_OBJECT public: - KateSessionManager(QObject *parent); + KateSessionManager(TQObject *parent); ~KateSessionManager(); /** @@ -195,14 +195,14 @@ class KateSessionManager : public QObject * create a new session * @param name session name */ - KateSession::Ptr createSession (const QString &name); + KateSession::Ptr createSession (const TQString &name); /** * return session with given name * if no existing session matches, create new one with this name * @param name session name */ - KateSession::Ptr giveSession (const QString &name); + KateSession::Ptr giveSession (const TQString &name); /** * save current session @@ -224,7 +224,7 @@ class KateSessionManager : public QObject * session dir * @return global session dir */ - inline const QString &sessionsDir () const { return m_sessionsDir; } + inline const TQString &sessionsDir () const { return m_sessionsDir; } /** * initial session chooser, on app start @@ -260,7 +260,7 @@ class KateSessionManager : public QObject void sessionManage (); private slots: - void dirty (const QString &path); + void dirty (const TQString &path); public: /** @@ -272,7 +272,7 @@ class KateSessionManager : public QObject /** * absolute path to dir in home dir where to store the sessions */ - QString m_sessionsDir; + TQString m_sessionsDir; /** * list of current available sessions @@ -290,7 +290,7 @@ class KateSessionChooser : public KDialogBase Q_OBJECT public: - KateSessionChooser (QWidget *parent, const QString &lastSession); + KateSessionChooser (TQWidget *parent, const TQString &lastSession); ~KateSessionChooser (); KateSession::Ptr selectedSession (); @@ -298,7 +298,7 @@ class KateSessionChooser : public KDialogBase bool reopenLastSession (); enum { - resultQuit = QDialog::Rejected, + resultQuit = TQDialog::Rejected, resultOpen, resultNew, resultNone @@ -327,7 +327,7 @@ class KateSessionChooser : public KDialogBase private: KListView *m_sessions; - QCheckBox *m_useLast; + TQCheckBox *m_useLast; }; class KateSessionOpenDialog : public KDialogBase @@ -335,7 +335,7 @@ class KateSessionOpenDialog : public KDialogBase Q_OBJECT public: - KateSessionOpenDialog (QWidget *parent); + KateSessionOpenDialog (TQWidget *parent); ~KateSessionOpenDialog (); KateSession::Ptr selectedSession (); @@ -365,7 +365,7 @@ class KateSessionManageDialog : public KDialogBase Q_OBJECT public: - KateSessionManageDialog (QWidget *parent); + KateSessionManageDialog (TQWidget *parent); ~KateSessionManageDialog (); protected slots: @@ -406,7 +406,7 @@ class KateSessionsAction : public KActionMenu Q_OBJECT public: - KateSessionsAction(const QString& text, QObject* parent = 0, const char* name = 0); + KateSessionsAction(const TQString& text, TQObject* parent = 0, const char* name = 0); ~KateSessionsAction (){;}; public slots: diff --git a/kate/app/katetabwidget.cpp b/kate/app/katetabwidget.cpp index c24357be5..4b278e327 100644 --- a/kate/app/katetabwidget.cpp +++ b/kate/app/katetabwidget.cpp @@ -20,11 +20,11 @@ #include "katetabwidget.h" #include "katetabwidget.moc" -#include +#include //BEGIN KateTabWidget -KateTabWidget::KateTabWidget(QWidget* parent, const char* name) +KateTabWidget::KateTabWidget(TQWidget* parent, const char* name) : KTabWidget(parent,name) , m_visibility (ShowWhenMoreThanOneTab) { @@ -32,40 +32,40 @@ KateTabWidget::KateTabWidget(QWidget* parent, const char* name) setHoverCloseButton(true); - connect(this, SIGNAL(closeRequest(QWidget*)), this, SLOT(closeTab(QWidget*))); + connect(this, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*))); } KateTabWidget::~KateTabWidget() { } -void KateTabWidget::closeTab(QWidget* w) +void KateTabWidget::closeTab(TQWidget* w) { w->close(); } -void KateTabWidget::addTab ( QWidget * child, const QString & label ) +void KateTabWidget::addTab ( TQWidget * child, const TQString & label ) { KTabWidget::addTab(child,label); showPage(child); maybeShow(); } -void KateTabWidget::addTab ( QWidget * child, const QIconSet & iconset, const QString & label ) +void KateTabWidget::addTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label ) { KTabWidget::addTab(child,iconset,label); showPage(child); maybeShow(); } -void KateTabWidget::addTab ( QWidget * child, QTab * tab ) +void KateTabWidget::addTab ( TQWidget * child, TQTab * tab ) { KTabWidget::addTab(child,tab); showPage(child); maybeShow(); } -void KateTabWidget::insertTab ( QWidget * child, const QString & label, int index) +void KateTabWidget::insertTab ( TQWidget * child, const TQString & label, int index) { KTabWidget::insertTab(child,label,index); showPage(child); @@ -73,7 +73,7 @@ void KateTabWidget::insertTab ( QWidget * child, const QString & label, int inde tabBar()->repaint(); } -void KateTabWidget::insertTab ( QWidget * child, const QIconSet & iconset, const QString & label, int index ) +void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index ) { KTabWidget::insertTab(child,iconset,label,index); showPage(child); @@ -81,7 +81,7 @@ void KateTabWidget::insertTab ( QWidget * child, const QIconSet & iconset, const tabBar()->repaint(); } -void KateTabWidget::insertTab ( QWidget * child, QTab * tab, int index) +void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) { KTabWidget::insertTab(child,tab,index); showPage(child); @@ -89,7 +89,7 @@ void KateTabWidget::insertTab ( QWidget * child, QTab * tab, int index) tabBar()->repaint(); } -void KateTabWidget::removePage ( QWidget * w ) +void KateTabWidget::removePage ( TQWidget * w ) { KTabWidget::removePage(w); maybeShow(); diff --git a/kate/app/katetabwidget.h b/kate/app/katetabwidget.h index 765f83fdb..7e4327595 100644 --- a/kate/app/katetabwidget.h +++ b/kate/app/katetabwidget.h @@ -34,29 +34,29 @@ class KateTabWidget : public KTabWidget }; public: - KateTabWidget(QWidget* parent, const char* name=0); + KateTabWidget(TQWidget* parent, const char* name=0); virtual ~KateTabWidget(); - virtual void addTab ( QWidget * child, const QString & label ); + virtual void addTab ( TQWidget * child, const TQString & label ); - virtual void addTab ( QWidget * child, const QIconSet & iconset, const QString & label ); + virtual void addTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label ); - virtual void addTab ( QWidget * child, QTab * tab ); + virtual void addTab ( TQWidget * child, TQTab * tab ); - virtual void insertTab ( QWidget * child, const QString & label, int index = -1 ); + virtual void insertTab ( TQWidget * child, const TQString & label, int index = -1 ); - virtual void insertTab ( QWidget * child, const QIconSet & iconset, const QString & label, int index = -1 ); + virtual void insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index = -1 ); - virtual void insertTab ( QWidget * child, QTab * tab, int index = -1 ); + virtual void insertTab ( TQWidget * child, TQTab * tab, int index = -1 ); - virtual void removePage ( QWidget * w ); + virtual void removePage ( TQWidget * w ); TabWidgetVisibility tabWidgetVisibility() const; void setTabWidgetVisibility( TabWidgetVisibility ); private slots: - void closeTab(QWidget* w); + void closeTab(TQWidget* w); private: void maybeShow(); diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp index 39b6020ee..c62e6e082 100644 --- a/kate/app/kateviewmanager.cpp +++ b/kate/app/kateviewmanager.cpp @@ -47,15 +47,15 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include //END Includes KateViewManager::KateViewManager (KateMainWindow *parent) - : QObject (parent), + : TQObject (parent), showFullPath(false), m_mainWindow(parent) { // while init @@ -71,7 +71,7 @@ KateViewManager::KateViewManager (KateMainWindow *parent) m_viewManager = new Kate::ViewManager (this); m_currentContainer=0; - connect(m_mainWindow->tabWidget(),SIGNAL(currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); + connect(m_mainWindow->tabWidget(),TQT_SIGNAL(currentChanged(TQWidget*)),this,TQT_SLOT(tabChanged(TQWidget*))); slotNewTab(); tabChanged(m_mainWindow->tabWidget()->currentPage()); @@ -94,67 +94,67 @@ void KateViewManager::setupActions () /** * tabbing */ - a=new KAction ( i18n("New Tab"),"tab_new", 0, this, SLOT(slotNewTab()), + a=new KAction ( i18n("New Tab"),"tab_new", 0, this, TQT_SLOT(slotNewTab()), m_mainWindow->actionCollection(), "view_new_tab" ); - m_closeTab = new KAction ( i18n("Close Current Tab"),"tab_remove",0,this,SLOT(slotCloseTab()), + m_closeTab = new KAction ( i18n("Close Current Tab"),"tab_remove",0,this,TQT_SLOT(slotCloseTab()), m_mainWindow->actionCollection(),"view_close_tab"); m_activateNextTab = new KAction( i18n( "Activate Next Tab" ), - QApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(), - this, SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" ); + TQApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(), + this, TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" ); m_activatePrevTab = new KAction( i18n( "Activate Previous Tab" ), - QApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(), - this, SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" ); + TQApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(), + 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, SLOT( + a=new KAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, 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, SLOT( + a=new KAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, 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, - SLOT( slotCloseCurrentViewSpace() ), m_mainWindow->actionCollection(), + 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, - SLOT(activateNextView()),m_mainWindow->actionCollection(),"go_next"); + 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, SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev"); + goPrev=new KAction(i18n("Previous View"),SHIFT+Key_F8, this, TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev"); goPrev->setWhatsThis(i18n("Make the previous split view the active one.")); /** * buttons for tabbing */ - QToolButton *b = new QToolButton( m_mainWindow->tabWidget() ); - connect( b, SIGNAL( clicked() ), - this, SLOT( slotNewTab() ) ); + TQToolButton *b = new TQToolButton( m_mainWindow->tabWidget() ); + connect( b, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotNewTab() ) ); b->setIconSet( SmallIcon( "tab_new" ) ); b->adjustSize(); - QToolTip::add(b, i18n("Open a new tab")); + TQToolTip::add(b, i18n("Open a new tab")); m_mainWindow->tabWidget()->setCornerWidget( b, TopLeft ); - b = m_closeTabButton = new QToolButton( m_mainWindow->tabWidget() ); - connect( b, SIGNAL( clicked() ), - this, SLOT( slotCloseTab() ) ); + b = m_closeTabButton = new TQToolButton( m_mainWindow->tabWidget() ); + connect( b, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotCloseTab() ) ); b->setIconSet( SmallIcon( "tab_remove" ) ); b->adjustSize(); - QToolTip::add(b, i18n("Close the current tab")); + TQToolTip::add(b, i18n("Close the current tab")); m_mainWindow->tabWidget()->setCornerWidget( b, TopRight ); } @@ -167,7 +167,7 @@ void KateViewManager::updateViewSpaceActions () goPrev->setEnabled (m_currentContainer->viewSpaceCount() > 1); } -void KateViewManager::tabChanged(QWidget* widget) { +void KateViewManager::tabChanged(TQWidget* widget) { KateViewSpaceContainer *container=static_cast(widget->qt_cast("KateViewSpaceContainer")); Q_ASSERT(container); m_currentContainer=container; @@ -199,8 +199,8 @@ void KateViewManager::slotNewTab() m_viewSpaceContainerList.append(container); m_mainWindow->tabWidget()->addTab (container, ""); - connect(container,SIGNAL(viewChanged()),this,SIGNAL(viewChanged())); - connect(container,SIGNAL(viewChanged()),m_viewManager,SIGNAL(viewChanged())); + connect(container,TQT_SIGNAL(viewChanged()),this,TQT_SIGNAL(viewChanged())); + connect(container,TQT_SIGNAL(viewChanged()),m_viewManager,TQT_SIGNAL(viewChanged())); if (!m_init) { @@ -371,8 +371,8 @@ void KateViewManager::slotDocumentOpen () if (cv) { KEncodingFileDialog::Result r=KEncodingFileDialog::getOpenURLsAndEncoding( (cv ? KTextEditor::encodingInterface(cv->document())->encoding() : Kate::Document::defaultEncoding()), - (cv ? cv->document()->url().url() : QString::null), - QString::null,m_mainWindow,i18n("Open File")); + (cv ? cv->document()->url().url() : TQString::null), + TQString::null,m_mainWindow,i18n("Open File")); uint lastID = 0; for (KURL::List::Iterator i=r.URLs.begin(); i != r.URLs.end(); ++i) @@ -403,7 +403,7 @@ void KateViewManager::slotDocumentClose () KateDocManager::self()->closeDocument (activeView()->getDoc()); } -uint KateViewManager::openURL (const KURL &url, const QString& encoding, bool activate, bool isTempFile ) +uint KateViewManager::openURL (const KURL &url, const TQString& encoding, bool activate, bool isTempFile ) { uint id = 0; Kate::Document *doc = KateDocManager::self()->openURL (url, encoding, &id, isTempFile ); @@ -419,7 +419,7 @@ uint KateViewManager::openURL (const KURL &url, const QString& encoding, bool ac void KateViewManager::openURL (const KURL &url) { - openURL (url, QString::null); + openURL (url, TQString::null); } void KateViewManager::removeViewSpace (KateViewSpace *viewspace) @@ -463,42 +463,42 @@ void KateViewManager::setShowFullPath( bool enable ) * session config functions */ // FIXME 3.0 - make those config goups more streamlined: "objN:objN..." -void KateViewManager::saveViewConfiguration(KConfig *config,const QString& grp) +void KateViewManager::saveViewConfiguration(KConfig *config,const TQString& grp) { // Use the same group name for view configuration as usual for sessions. // (When called by session manager grp is a 1-based index for the main window) - QString group = grp; + TQString group = grp; bool ok = false; int n = group.toInt( &ok ); if ( ok ) - group = QString( "MainWindow%1" ).arg( n-1 ); + group = TQString( "MainWindow%1" ).arg( n-1 ); config->setGroup(group); config->writeEntry("ViewSpaceContainers",m_viewSpaceContainerList.count()); config->writeEntry("Active ViewSpaceContainer", m_mainWindow->tabWidget()->currentPageIndex()); for (uint i=0;isaveViewConfiguration(config,group+QString(":ViewSpaceContainer-%1:").arg(i)); + m_viewSpaceContainerList.at(i)->saveViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i)); } } -void KateViewManager::restoreViewConfiguration (KConfig *config, const QString& grp) +void KateViewManager::restoreViewConfiguration (KConfig *config, const TQString& grp) { // Use the same group name for view configuration as usual for sessions. // (When called by session manager grp is a 1-based index for the main window) - QString group = grp; + TQString group = grp; bool ok = false; int n = group.toInt( &ok ); if ( ok ) - group = QString( "MainWindow%1" ).arg( n-1 ); + group = TQString( "MainWindow%1" ).arg( n-1 ); config->setGroup(group); uint tabCount=config->readNumEntry("ViewSpaceContainers",0); int activeOne=config->readNumEntry("Active ViewSpaceContainer",0); if (tabCount==0) return; - m_viewSpaceContainerList.at(0)->restoreViewConfiguration(config,group+QString(":ViewSpaceContainer-0:")); + m_viewSpaceContainerList.at(0)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-0:")); for (uint i=1;irestoreViewConfiguration(config,group+QString(":ViewSpaceContainer-%1:").arg(i)); + m_viewSpaceContainerList.at(i)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i)); } if (activeOne != m_mainWindow->tabWidget()->currentPageIndex()) diff --git a/kate/app/kateviewmanager.h b/kate/app/kateviewmanager.h index 6eb33e9f5..cfd7fba9a 100644 --- a/kate/app/kateviewmanager.h +++ b/kate/app/kateviewmanager.h @@ -26,7 +26,7 @@ #include #include -#include +#include class KateMainWindow; class KateViewSpaceContainer; @@ -48,7 +48,7 @@ class KateViewManager : public QObject KateViewSpaceContainer *activeContainer () { return m_currentContainer; } - QPtrList *containers() { return &m_viewSpaceContainerList; } + TQPtrList *containers() { return &m_viewSpaceContainerList; } void updateViewSpaceActions (); @@ -60,12 +60,12 @@ class KateViewManager : public QObject public: /* This will save the splitter configuration */ - void saveViewConfiguration(KConfig *config,const QString& group); + void saveViewConfiguration(KConfig *config,const TQString& group); /* restore it */ - void restoreViewConfiguration (KConfig *config,const QString& group); + void restoreViewConfiguration (KConfig *config,const TQString& group); - uint openURL (const KURL &url, const QString& encoding, bool activate = true, bool isTempFile=false); + uint openURL (const KURL &url, const TQString& encoding, bool activate = true, bool isTempFile=false); public slots: void openURL (const KURL &url); @@ -92,7 +92,7 @@ class KateViewManager : public QObject void activateView ( Kate::View *view ); void activateSpace ( Kate::View* v ); - void tabChanged(QWidget*); + void tabChanged(TQWidget*); public slots: bool getShowFullPath() const { return showFullPath; } @@ -127,22 +127,22 @@ class KateViewManager : public QObject protected: friend class KateViewSpaceContainer; - QGuardedPtr guiMergedView; + TQGuardedPtr guiMergedView; signals: - void statusChanged (Kate::View *, int, int, int, bool, int, const QString &); + void statusChanged (Kate::View *, int, int, int, bool, int, const TQString &); void statChanged (); void viewChanged (); private: Kate::ViewManager *m_viewManager; - QPtrList m_viewSpaceContainerList; + TQPtrList m_viewSpaceContainerList; KateViewSpaceContainer *m_currentContainer; KateMainWindow *m_mainWindow; bool m_init; - QToolButton *m_closeTabButton; + TQToolButton *m_closeTabButton; KAction *m_closeView; KAction *m_closeTab; KAction *m_activateNextTab; diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp index 9efb155e4..43a73a2b6 100644 --- a/kate/app/kateviewspace.cpp +++ b/kate/app/kateviewspace.cpp @@ -33,40 +33,40 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include //BEGIN KVSSBSep /* "KateViewSpaceStatusBarSeparator" A 2 px line to separate the statusbar from the view. It is here to compensate for the lack of a frame in the view, - I think Kate looks very nice this way, as QScrollView with frame + I think Kate looks very nice this way, as TQScrollView with frame looks slightly clumsy... - Slight 3D effect. I looked for suitable QStyle props or methods, - but found none, though maybe it should use QStyle::PM_DefaultFrameWidth + Slight 3D effect. I looked for suitable TQStyle props or methods, + but found none, though maybe it should use TQStyle::PM_DefaultFrameWidth for height (TRY!). It does look a bit funny with flat styles (Light, .Net) as is, but there are on methods to paint panel lines separately. And, those styles tends to look funny on their own, as a light line in a 3D frame next to a light contents widget is not functional. - Also, QStatusBar is up to now completely ignorant to style. + Also, TQStatusBar is up to now completely ignorant to style. -anders */ -class KVSSBSep : public QWidget { +class KVSSBSep : public TQWidget { public: - KVSSBSep( KateViewSpace *parent=0) : QWidget(parent) + KVSSBSep( KateViewSpace *parent=0) : TQWidget(parent) { setFixedHeight( 2 ); } protected: - void paintEvent( QPaintEvent *e ) + void paintEvent( TQPaintEvent *e ) { - QPainter p( this ); + TQPainter p( this ); p.setPen( colorGroup().shadow() ); p.drawLine( e->rect().left(), 0, e->rect().right(), 0 ); p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? colorGroup().light() : colorGroup().midlight() ); @@ -77,13 +77,13 @@ protected: //BEGIN KateViewSpace KateViewSpace::KateViewSpace( KateViewSpaceContainer *viewManager, - QWidget* parent, const char* name ) - : QVBox(parent, name), + TQWidget* parent, const char* name ) + : TQVBox(parent, name), m_viewManager( viewManager ) { mViewList.setAutoDelete(false); - stack = new QWidgetStack( this ); + stack = new TQWidgetStack( this ); setStretchFactor(stack, 1); stack->setFocus(); //sep = new KVSSBSep( this ); @@ -92,7 +92,7 @@ KateViewSpace::KateViewSpace( KateViewSpaceContainer *viewManager, mViewCount = 0; setMinimumWidth (mStatusBar->minimumWidth()); - m_group = QString::null; + m_group = TQString::null; } KateViewSpace::~KateViewSpace() @@ -109,10 +109,10 @@ void KateViewSpace::addView(Kate::View* v, bool show) // restore the config of this view if possible if ( !m_group.isEmpty() ) { - QString fn = v->getDoc()->url().prettyURL(); + TQString fn = v->getDoc()->url().prettyURL(); if ( ! fn.isEmpty() ) { - QString vgroup = QString("%1 %2").arg(m_group).arg(fn); + TQString vgroup = TQString("%1 %2").arg(m_group).arg(fn); KateSession::Ptr as = KateSessionManager::self()->activeSession (); if ( as->configRead() && as->configRead()->hasGroup( vgroup ) ) @@ -138,8 +138,8 @@ void KateViewSpace::addView(Kate::View* v, bool show) void KateViewSpace::removeView(Kate::View* v) { - disconnect( v->getDoc(), SIGNAL(modifiedChanged()), - mStatusBar, SLOT(modifiedChanged()) ); + disconnect( v->getDoc(), TQT_SIGNAL(modifiedChanged()), + mStatusBar, TQT_SLOT(modifiedChanged()) ); bool active = ( v == currentView() ); @@ -162,17 +162,17 @@ bool KateViewSpace::showView(Kate::View* v) bool KateViewSpace::showView(uint documentNumber) { - QPtrListIterator it (mViewList); + TQPtrListIterator it (mViewList); it.toLast(); for( ; it.current(); --it ) { if (((Kate::Document*)it.current()->getDoc())->documentNumber() == documentNumber) { if ( currentView() ) - disconnect( currentView()->getDoc(), SIGNAL(modifiedChanged()), - mStatusBar, SLOT(modifiedChanged()) ); + disconnect( currentView()->getDoc(), TQT_SIGNAL(modifiedChanged()), + mStatusBar, TQT_SLOT(modifiedChanged()) ); Kate::View* kv = it.current(); - connect( kv->getDoc(), SIGNAL(modifiedChanged()), - mStatusBar, SLOT(modifiedChanged()) ); + connect( kv->getDoc(), TQT_SIGNAL(modifiedChanged()), + mStatusBar, TQT_SLOT(modifiedChanged()) ); mViewList.removeRef( kv ); mViewList.append( kv ); @@ -204,11 +204,11 @@ void KateViewSpace::setActive( bool active, bool ) mIsActiveSpace = active; // change the statusbar palette and make sure it gets updated - QPalette pal( palette() ); + TQPalette pal( palette() ); if ( ! active ) { - pal.setColor( QColorGroup::Background, pal.active().mid() ); - pal.setColor( QColorGroup::Light, pal.active().midlight() ); + pal.setColor( TQColorGroup::Background, pal.active().mid() ); + pal.setColor( TQColorGroup::Light, pal.active().midlight() ); } mStatusBar->setPalette( pal ); @@ -216,27 +216,27 @@ void KateViewSpace::setActive( bool active, bool ) //sep->update(); } -bool KateViewSpace::event( QEvent *e ) +bool KateViewSpace::event( TQEvent *e ) { - if ( e->type() == QEvent::PaletteChange ) + if ( e->type() == TQEvent::PaletteChange ) { setActive( mIsActiveSpace ); return true; } - return QVBox::event( e ); + return TQVBox::event( e ); } -void KateViewSpace::slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const QString &msg) +void KateViewSpace::slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg) { - if ((QWidgetStack *)view->parentWidget() != stack) + if ((TQWidgetStack *)view->parentWidget() != stack) return; mStatusBar->setStatus( r, c, ovr, block, mod, msg ); } -void KateViewSpace::saveConfig ( KConfig* config, int myIndex ,const QString& viewConfGrp) +void KateViewSpace::saveConfig ( KConfig* config, int myIndex ,const TQString& viewConfGrp) { // kdDebug()<<"KateViewSpace::saveConfig("<setGroup (group); config->writeEntry ("Count", mViewList.count()); @@ -245,7 +245,7 @@ void KateViewSpace::saveConfig ( KConfig* config, int myIndex ,const QString& vi config->writeEntry( "Active View", currentView()->getDoc()->url().prettyURL() ); // Save file list, includeing cursor position in this instance. - QPtrListIterator it(mViewList); + TQPtrListIterator it(mViewList); int idx = 0; for (; it.current(); ++it) @@ -253,10 +253,10 @@ void KateViewSpace::saveConfig ( KConfig* config, int myIndex ,const QString& vi if ( !it.current()->getDoc()->url().isEmpty() ) { config->setGroup( group ); - config->writeEntry( QString("View %1").arg( idx ), it.current()->getDoc()->url().prettyURL() ); + config->writeEntry( TQString("View %1").arg( idx ), it.current()->getDoc()->url().prettyURL() ); // view config, group: "ViewSpace url" - QString vgroup = QString("%1 %2").arg(group).arg(it.current()->getDoc()->url().prettyURL()); + TQString vgroup = TQString("%1 %2").arg(group).arg(it.current()->getDoc()->url().prettyURL()); config->setGroup( vgroup ); it.current()->writeSessionConfig( config ); } @@ -271,10 +271,10 @@ void KateViewSpace::modifiedOnDisc(Kate::Document *, bool, unsigned char) mStatusBar->updateMod( currentView()->getDoc()->isModified() ); } -void KateViewSpace::restoreConfig ( KateViewSpaceContainer *viewMan, KConfig* config, const QString &group ) +void KateViewSpace::restoreConfig ( KateViewSpaceContainer *viewMan, KConfig* config, const TQString &group ) { config->setGroup (group); - QString fn = config->readEntry( "Active View" ); + TQString fn = config->readEntry( "Active View" ); if ( !fn.isEmpty() ) { @@ -283,7 +283,7 @@ void KateViewSpace::restoreConfig ( KateViewSpaceContainer *viewMan, KConfig* co if (doc) { // view config, group: "ViewSpace url" - QString vgroup = QString("%1 %2").arg(group).arg(fn); + TQString vgroup = TQString("%1 %2").arg(group).arg(fn); config->setGroup( vgroup ); viewMan->createView (doc); @@ -307,22 +307,22 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name ) : KStatusBar( parent, name ), m_viewSpace( parent ) { - m_lineColLabel = new QLabel( this ); + m_lineColLabel = new TQLabel( this ); addWidget( m_lineColLabel, 0, false ); m_lineColLabel->setAlignment( Qt::AlignCenter ); m_lineColLabel->installEventFilter( this ); - m_modifiedLabel = new QLabel( QString(" "), this ); + m_modifiedLabel = new TQLabel( TQString(" "), this ); addWidget( m_modifiedLabel, 0, false ); m_modifiedLabel->setAlignment( Qt::AlignCenter ); m_modifiedLabel->installEventFilter( this ); - m_insertModeLabel = new QLabel( i18n(" INS "), this ); + m_insertModeLabel = new TQLabel( i18n(" INS "), this ); addWidget( m_insertModeLabel, 0, false ); m_insertModeLabel->setAlignment( Qt::AlignCenter ); m_insertModeLabel->installEventFilter( this ); - m_selectModeLabel = new QLabel( i18n(" NORM "), this ); + m_selectModeLabel = new TQLabel( i18n(" NORM "), this ); addWidget( m_selectModeLabel, 0, false ); m_selectModeLabel->setAlignment( Qt::AlignCenter ); m_selectModeLabel->installEventFilter( this ); @@ -330,7 +330,7 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name ) m_fileNameLabel=new KSqueezedTextLabel( this ); addWidget( m_fileNameLabel, 1, true ); m_fileNameLabel->setMinimumSize( 0, 0 ); - m_fileNameLabel->setSizePolicy(QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Fixed )); + m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft ); m_fileNameLabel->installEventFilter( this ); @@ -345,7 +345,7 @@ KateVSStatusBar::~KateVSStatusBar () { } -void KateVSStatusBar::setStatus( int r, int c, int ovr, bool block, int, const QString &msg ) +void KateVSStatusBar::setStatus( int r, int c, int ovr, bool block, int, const TQString &msg ) { m_lineColLabel->setText( i18n(" Line: %1 Col: %2 ").arg(KGlobal::locale()->formatNumber(r+1, 0)) @@ -397,20 +397,20 @@ void KateVSStatusBar::modifiedChanged() void KateVSStatusBar::showMenu() { KMainWindow* mainWindow = static_cast( topLevelWidget() ); - QPopupMenu* menu = static_cast( mainWindow->factory()->container("viewspace_popup", mainWindow ) ); + TQPopupMenu* menu = static_cast( mainWindow->factory()->container("viewspace_popup", mainWindow ) ); if (menu) - menu->exec(QCursor::pos()); + menu->exec(TQCursor::pos()); } -bool KateVSStatusBar::eventFilter(QObject*,QEvent *e) +bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e) { - if (e->type()==QEvent::MouseButtonPress) + if (e->type()==TQEvent::MouseButtonPress) { if ( m_viewSpace->currentView() ) m_viewSpace->currentView()->setFocus(); - if ( ((QMouseEvent*)e)->button()==RightButton) + if ( ((TQMouseEvent*)e)->button()==RightButton) showMenu(); return true; diff --git a/kate/app/kateviewspace.h b/kate/app/kateviewspace.h index a07b5f6da..b6a5a185e 100644 --- a/kate/app/kateviewspace.h +++ b/kate/app/kateviewspace.h @@ -26,9 +26,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include class KVSSBSep; @@ -46,7 +46,7 @@ class KateVSStatusBar : public KStatusBar virtual ~KateVSStatusBar (); public slots: - void setStatus( int r, int c, int ovr, bool block, int mod, const QString &msg ); + void setStatus( int r, int c, int ovr, bool block, int mod, const TQString &msg ); void updateMod( bool ); /** * changed the modified icon according to document state. @@ -55,16 +55,16 @@ class KateVSStatusBar : public KStatusBar void modifiedChanged(); protected: - virtual bool eventFilter (QObject*,QEvent *); + virtual bool eventFilter (TQObject*,TQEvent *); virtual void showMenu (); private: - QLabel* m_lineColLabel; - QLabel* m_modifiedLabel; - QLabel* m_insertModeLabel; - QLabel* m_selectModeLabel; + TQLabel* m_lineColLabel; + TQLabel* m_modifiedLabel; + TQLabel* m_insertModeLabel; + TQLabel* m_selectModeLabel; KSqueezedTextLabel* m_fileNameLabel; - QPixmap m_modPm, m_modDiscPm, m_modmodPm, m_noPm; + TQPixmap m_modPm, m_modDiscPm, m_modmodPm, m_noPm; class KateViewSpace *m_viewSpace; }; @@ -76,11 +76,11 @@ class KateViewSpace : public QVBox Q_OBJECT public: - KateViewSpace(KateViewSpaceContainer *, QWidget* parent=0, const char* name=0); + KateViewSpace(KateViewSpaceContainer *, TQWidget* parent=0, const char* name=0); ~KateViewSpace(); bool isActiveSpace(); void setActive(bool b, bool showled=false); - QWidgetStack* stack; + TQWidgetStack* stack; void addView(Kate::View* v, bool show=true); void removeView(Kate::View* v); bool showView(Kate::View* v); @@ -88,29 +88,29 @@ class KateViewSpace : public QVBox Kate::View* currentView(); int viewCount() const { return mViewList.count(); } - void saveConfig (KConfig* config, int myIndex,const QString& viewConfGrp); - void restoreConfig ( class KateViewSpaceContainer *viewMan, KConfig* config, const QString &group ); + void saveConfig (KConfig* config, int myIndex,const TQString& viewConfGrp); + void restoreConfig ( class KateViewSpaceContainer *viewMan, KConfig* config, const TQString &group ); protected: - /** reimplemented to catch QEvent::PaletteChange, + /** reimplemented to catch TQEvent::PaletteChange, since we use a modified palette for the statusbar */ - bool event( QEvent * ); + bool event( TQEvent * ); private: bool mIsActiveSpace; KateVSStatusBar* mStatusBar; - QLabel* l; - QPixmap i_active; - QPixmap i_empty; - QPtrList mViewList; + TQLabel* l; + TQPixmap i_active; + TQPixmap i_empty; + TQPtrList mViewList; int mViewCount; KVSSBSep *sep; KateViewSpaceContainer *m_viewManager; - QString m_group; + TQString m_group; private slots: - void slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const QString &msg); + void slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg); public slots: void polish(); diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp index 08a3bf6f6..1e05e8b5a 100644 --- a/kate/app/kateviewspacecontainer.cpp +++ b/kate/app/kateviewspacecontainer.cpp @@ -48,17 +48,17 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include //END Includes -KateViewSpaceContainer::KateViewSpaceContainer (QWidget *parent, KateViewManager *viewManager) - : QVBox (parent) +KateViewSpaceContainer::KateViewSpaceContainer (TQWidget *parent, KateViewManager *viewManager) + : TQVBox (parent) , m_viewManager(viewManager) , m_blockViewCreationAndActivation (false) , m_activeViewRunning (false) @@ -69,14 +69,14 @@ KateViewSpaceContainer::KateViewSpaceContainer (QWidget *parent, KateViewManager m_viewSpaceList.setAutoDelete(true); KateViewSpace* vs = new KateViewSpace( this, this ); - connect(this, SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const QString&)), vs, SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const QString&))); + connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString&)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString&))); vs->setActive( true ); m_viewSpaceList.append(vs); - connect( this, SIGNAL(viewChanged()), this, SLOT(slotViewChanged()) ); - connect(KateDocManager::self(), SIGNAL(initialDocumentReplaced()), this, SIGNAL(viewChanged())); + connect( this, TQT_SIGNAL(viewChanged()), this, TQT_SLOT(slotViewChanged()) ); + connect(KateDocManager::self(), TQT_SIGNAL(initialDocumentReplaced()), this, TQT_SIGNAL(viewChanged())); - connect(KateDocManager::self(),SIGNAL(documentCreated(Kate::Document *)),this,SLOT(documentCreated(Kate::Document *))); - connect(KateDocManager::self(),SIGNAL(documentDeleted(uint)),this,SLOT(documentDeleted(uint))); + connect(KateDocManager::self(),TQT_SIGNAL(documentCreated(Kate::Document *)),this,TQT_SLOT(documentCreated(Kate::Document *))); + connect(KateDocManager::self(),TQT_SIGNAL(documentDeleted(uint)),this,TQT_SLOT(documentDeleted(uint))); } KateViewSpaceContainer::~KateViewSpaceContainer () @@ -120,19 +120,19 @@ bool KateViewSpaceContainer::createView ( Kate::Document *doc ) view->actionCollection()->remove (view->actionCollection()->action( "set_confdlg" )); // popup menu - view->installPopup ((QPopupMenu*)(mainWindow()->factory()->container("ktexteditor_popup", mainWindow())) ); + view->installPopup ((TQPopupMenu*)(mainWindow()->factory()->container("ktexteditor_popup", mainWindow())) ); - connect(view->getDoc(),SIGNAL(nameChanged(Kate::Document *)),this,SLOT(statusMsg())); - connect(view,SIGNAL(cursorPositionChanged()),this,SLOT(statusMsg())); - connect(view,SIGNAL(newStatus()),this,SLOT(statusMsg())); - connect(view->getDoc(), SIGNAL(undoChanged()), this, SLOT(statusMsg())); - connect(view,SIGNAL(dropEventPass(QDropEvent *)), mainWindow(),SLOT(slotDropEvent(QDropEvent *))); - connect(view,SIGNAL(gotFocus(Kate::View *)),this,SLOT(activateSpace(Kate::View *))); + connect(view->getDoc(),TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(statusMsg())); + connect(view,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(statusMsg())); + connect(view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(statusMsg())); + connect(view->getDoc(), TQT_SIGNAL(undoChanged()), this, TQT_SLOT(statusMsg())); + connect(view,TQT_SIGNAL(dropEventPass(TQDropEvent *)), mainWindow(),TQT_SLOT(slotDropEvent(TQDropEvent *))); + connect(view,TQT_SIGNAL(gotFocus(Kate::View *)),this,TQT_SLOT(activateSpace(Kate::View *))); activeViewSpace()->addView( view ); activateView( view ); - connect( doc, SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)), - activeViewSpace(), SLOT(modifiedOnDisc(Kate::Document *, bool, unsigned char)) ); + connect( doc, TQT_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)), + activeViewSpace(), TQT_SLOT(modifiedOnDisc(Kate::Document *, bool, unsigned char)) ); return true; } @@ -159,7 +159,7 @@ bool KateViewSpaceContainer::deleteView (Kate::View *view, bool delViewSpace) KateViewSpace* KateViewSpaceContainer::activeViewSpace () { - QPtrListIterator it(m_viewSpaceList); + TQPtrListIterator it(m_viewSpaceList); for (; it.current(); ++it) { @@ -183,7 +183,7 @@ Kate::View* KateViewSpaceContainer::activeView () m_activeViewRunning = true; - for (QPtrListIterator it(m_viewList); it.current(); ++it) + for (TQPtrListIterator it(m_viewList); it.current(); ++it) { if ( it.current()->isActive() ) { @@ -256,7 +256,7 @@ void KateViewSpaceContainer::reactivateActiveView() { activateView(view); } else if (m_pendingViewCreation) { m_pendingViewCreation=false; - disconnect(m_pendingDocument,SIGNAL(nameChanged(Kate::Document *)),this,SLOT(slotPendingDocumentNameChanged())); + disconnect(m_pendingDocument,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(slotPendingDocumentNameChanged())); createView(m_pendingDocument); } } @@ -304,7 +304,7 @@ void KateViewSpaceContainer::activateView( uint documentNumber ) } else { - QPtrListIterator it(m_viewList); + TQPtrListIterator it(m_viewList); for ( ;it.current(); ++it) { if ( it.current()->getDoc()->documentNumber() == documentNumber ) @@ -359,7 +359,7 @@ void KateViewSpaceContainer::activatePrevView() void KateViewSpaceContainer::closeViews(uint documentNumber) { - QPtrList closeList; + TQPtrList closeList; for (uint z=0 ; z < m_viewList.count(); z++) { @@ -378,12 +378,12 @@ void KateViewSpaceContainer::closeViews(uint documentNumber) } if (m_blockViewCreationAndActivation) return; - QTimer::singleShot(0,this,SIGNAL(viewChanged())); + TQTimer::singleShot(0,this,TQT_SIGNAL(viewChanged())); //emit m_viewManager->viewChanged (); } void KateViewSpaceContainer::slotPendingDocumentNameChanged() { - QString c; + TQString c; if (m_pendingDocument->url().isEmpty() || (!showFullPath)) { c = m_pendingDocument->docName(); @@ -422,7 +422,7 @@ void KateViewSpaceContainer::statusMsg () int mod = (int)v->getDoc()->isModified(); bool block=v->getDoc()->blockSelectionMode(); - QString c; + TQString c; if (v->getDoc()->url().isEmpty() || (!showFullPath)) { c = v->getDoc()->docName(); @@ -448,9 +448,9 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs, bool isFirstTime = vs->parentWidget() == this; - QValueList psizes; + TQValueList psizes; if ( ! isFirstTime ) - if ( QSplitter *ps = static_cast(vs->parentWidget()->qt_cast("QSplitter")) ) + if ( TQSplitter *ps = static_cast(vs->parentWidget()->qt_cast("TQSplitter")) ) psizes = ps->sizes(); Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal; @@ -464,24 +464,24 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs, if ( !((KateMDI::Splitter*)vs->parentWidget())->isLastChild( vs ) ) ((KateMDI::Splitter*)s->parentWidget())->moveToFirst( s ); } - vs->reparent( s, 0, QPoint(), true ); + vs->reparent( s, 0, TQPoint(), true ); KateViewSpace* vsNew = new KateViewSpace( this, s ); if (atTop) s->moveToFirst( vsNew ); if (!isFirstTime) - if (QSplitter *ps = static_cast(s->parentWidget()->qt_cast("QSplitter")) ) + if (TQSplitter *ps = static_cast(s->parentWidget()->qt_cast("TQSplitter")) ) ps->setSizes( psizes ); s->show(); - QValueList sizes; + TQValueList sizes; int space = 50;//isHoriz ? s->parentWidget()->height()/2 : s->parentWidget()->width()/2; sizes << space << space; s->setSizes( sizes ); - connect(this, SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const QString &)), vsNew, SLOT(slotStatusChanged(Kate::View *, int, int,int, bool, int, const QString &))); + connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vsNew, TQT_SLOT(slotStatusChanged(Kate::View *, int, int,int, bool, int, const TQString &))); m_viewSpaceList.append( vsNew ); activeViewSpace()->setActive( false ); vsNew->setActive( true, true ); @@ -511,7 +511,7 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace) // save some size information KateMDI::Splitter* pp=0L; - QValueList ppsizes; + TQValueList ppsizes; if (m_viewSpaceList.count() > 2 && p->parentWidget() != this) { pp = (KateMDI::Splitter*)p->parentWidget(); @@ -552,9 +552,9 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace) // reparent the other sibling of the parent. while (p->children ()) { - QWidget* other = ((QWidget *)(( QPtrList*)p->children())->first()); + TQWidget* other = ((TQWidget *)(( TQPtrList*)p->children())->first()); - other->reparent( p->parentWidget(), 0, QPoint(), true ); + other->reparent( p->parentWidget(), 0, TQPoint(), true ); // We also need to find the right viewspace to become active if (pIsFirst) ((KateMDI::Splitter*)p->parentWidget())->moveToFirst( other ); @@ -562,7 +562,7 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace) setActiveSpace( (KateViewSpace*)other ); } else { - QObjectList* l = other->queryList( "KateViewSpace" ); + TQObjectList* l = other->queryList( "KateViewSpace" ); if ( l->first() != 0 ) { // I REALLY hope so! setActiveSpace( (KateViewSpace*)l->first() ); } @@ -602,7 +602,7 @@ void KateViewSpaceContainer::setShowFullPath( bool enable ) * session config functions */ -void KateViewSpaceContainer::saveViewConfiguration(KConfig *config,const QString& group) +void KateViewSpaceContainer::saveViewConfiguration(KConfig *config,const TQString& group) { bool weHaveSplittersAlive (viewSpaceCount() > 1); @@ -620,8 +620,8 @@ void KateViewSpaceContainer::saveViewConfiguration(KConfig *config,const QString // I need the first splitter, the one which has this as parent. KateMDI::Splitter* s; - QObjectList *l = queryList("KateMDI::Splitter", 0, false, false); - QObjectListIt it( *l ); + TQObjectList *l = queryList("KateMDI::Splitter", 0, false, false); + TQObjectListIt it( *l ); if ( (s = (KateMDI::Splitter*)it.current()) != 0 ) saveSplitterConfig( s, 0, config , group); @@ -629,7 +629,7 @@ void KateViewSpaceContainer::saveViewConfiguration(KConfig *config,const QString delete l; } -void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const QString& group) +void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQString& group) { config->setGroup(group); //config->setGroup ("View Configuration"); @@ -638,7 +638,7 @@ void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const QS if (!config->readBoolEntry ("Splitters")) { // only add the new views needed, let the old stay, won't hurt if one around - m_viewSpaceList.first ()->restoreConfig (this, config, QString(group+"-ViewSpace 0")); + m_viewSpaceList.first ()->restoreConfig (this, config, TQString(group+"-ViewSpace 0")); } else { @@ -652,7 +652,7 @@ void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const QS m_viewSpaceList.clear(); // call restoreSplitter for Splitter 0 - restoreSplitter( config, QString(group+"-Splitter 0"), this,group ); + restoreSplitter( config, TQString(group+"-Splitter 0"), this,group ); } // finally, make the correct view active. @@ -665,26 +665,26 @@ void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const QS } -void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx, KConfig* config, const QString& viewConfGrp ) +void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx, KConfig* config, const TQString& viewConfGrp ) { - QString grp = QString(viewConfGrp+"-Splitter %1").arg(idx); + TQString grp = TQString(viewConfGrp+"-Splitter %1").arg(idx); config->setGroup(grp); // Save sizes, orient, children for this splitter config->writeEntry( "Sizes", s->sizes() ); config->writeEntry( "Orientation", s->orientation() ); - QStringList childList; + TQStringList childList; // a katesplitter has two children, of which one may be a KateSplitter. - const QObjectList* l = s->children(); - QObjectListIt it( *l ); - QObject* obj; + const TQObjectList* l = s->children(); + TQObjectListIt it( *l ); + TQObject* obj; for (; it.current(); ++it) { obj = it.current(); - QString n; // name for child list, see below + TQString n; // name for child list, see below // For KateViewSpaces, ask them to save the file list. if ( obj->isA("KateViewSpace") ) { - n = QString(viewConfGrp+"-ViewSpace %1").arg( m_viewSpaceList.find((KateViewSpace*)obj) ); + n = TQString(viewConfGrp+"-ViewSpace %1").arg( m_viewSpaceList.find((KateViewSpace*)obj) ); ((KateViewSpace*)obj)->saveConfig ( config, m_viewSpaceList.find((KateViewSpace*)obj), viewConfGrp); // save active viewspace if ( ((KateViewSpace*)obj)->isActiveSpace() ) { @@ -696,11 +696,11 @@ void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx, else if ( obj->isA("KateMDI::Splitter") ) { idx++; saveSplitterConfig( (KateMDI::Splitter*)obj, idx, config,viewConfGrp); - n = QString(viewConfGrp+"-Splitter %1").arg( idx ); + n = TQString(viewConfGrp+"-Splitter %1").arg( idx ); } // make sure list goes in right place! if (!n.isEmpty()) { - if ( childList.count() > 0 && ! s->isLastChild( (QWidget*)obj ) ) + if ( childList.count() > 0 && ! s->isLastChild( (TQWidget*)obj ) ) childList.prepend( n ); else childList.append( n ); @@ -712,21 +712,21 @@ void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx, config->writeEntry("Children", childList); } -void KateViewSpaceContainer::restoreSplitter( KConfig* config, const QString &group, QWidget* parent, const QString& viewConfGrp) +void KateViewSpaceContainer::restoreSplitter( KConfig* config, const TQString &group, TQWidget* parent, const TQString& viewConfGrp) { config->setGroup( group ); KateMDI::Splitter* s = new KateMDI::Splitter((Qt::Orientation)config->readNumEntry("Orientation"), parent); - QStringList children = config->readListEntry( "Children" ); - for (QStringList::Iterator it=children.begin(); it!=children.end(); ++it) + TQStringList children = config->readListEntry( "Children" ); + for (TQStringList::Iterator it=children.begin(); it!=children.end(); ++it) { // for a viewspace, create it and open all documents therein. if ( (*it).startsWith(viewConfGrp+"-ViewSpace") ) { KateViewSpace* vs = new KateViewSpace( this, s ); - connect(this, SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const QString &)), vs, SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const QString &))); + connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString &))); if (m_viewSpaceList.isEmpty()) vs->setActive (true); @@ -741,7 +741,7 @@ void KateViewSpaceContainer::restoreSplitter( KConfig* config, const QString &gr else { // for a splitter, recurse. - restoreSplitter( config, QString(*it), s, viewConfGrp ); + restoreSplitter( config, TQString(*it), s, viewConfGrp ); } } diff --git a/kate/app/kateviewspacecontainer.h b/kate/app/kateviewspacecontainer.h index e8c64bd4e..402b368d1 100644 --- a/kate/app/kateviewspacecontainer.h +++ b/kate/app/kateviewspacecontainer.h @@ -40,18 +40,18 @@ class KateViewSpaceContainer: public QVBox friend class KateVSStatusBar; public: - KateViewSpaceContainer (QWidget *parent, KateViewManager *viewManager); + KateViewSpaceContainer (TQWidget *parent, KateViewManager *viewManager); ~KateViewSpaceContainer (); - inline QPtrList &viewList () { return m_viewList; }; + inline TQPtrList &viewList () { return m_viewList; }; public: /* This will save the splitter configuration */ - void saveViewConfiguration(KConfig *config,const QString& group); + void saveViewConfiguration(KConfig *config,const TQString& group); /* restore it */ - void restoreViewConfiguration (KConfig *config,const QString& group); + void restoreViewConfiguration (KConfig *config,const TQString& group); private: /** @@ -69,12 +69,12 @@ class KateViewSpaceContainer: public QVBox * If child splitters are found, it calls it self with those as the argument. * If a viewspace child is found, it is asked to save its filelist. */ - void saveSplitterConfig(KateMDI::Splitter* s, int idx=0, KConfig* config=0L, const QString& viewConfGrp=""); + void saveSplitterConfig(KateMDI::Splitter* s, int idx=0, KConfig* config=0L, const TQString& viewConfGrp=""); /** Restore a single splitter. * This is all the work is done for @see saveSplitterConfig() */ - void restoreSplitter ( KConfig* config, const QString &group, QWidget* parent , const QString& viewConfGrp); + void restoreSplitter ( KConfig* config, const TQString &group, TQWidget* parent , const TQString& viewConfGrp); void removeViewSpace (KateViewSpace *viewspace); @@ -141,21 +141,21 @@ class KateViewSpaceContainer: public QVBox void activatePrevView(); signals: - void statusChanged (Kate::View *, int, int, int, bool, int, const QString &); + void statusChanged (Kate::View *, int, int, int, bool, int, const TQString &); void statChanged (); void viewChanged (); private: KateViewManager *m_viewManager; - QPtrList m_viewSpaceList; - QPtrList m_viewList; + TQPtrList m_viewSpaceList; + TQPtrList m_viewList; bool m_blockViewCreationAndActivation; bool m_activeViewRunning; bool m_pendingViewCreation; - QGuardedPtr m_pendingDocument; + TQGuardedPtr m_pendingDocument; }; #endif diff --git a/kate/app/kbookmarkhandler.cpp b/kate/app/kbookmarkhandler.cpp index ada4d7a21..8ef055e36 100644 --- a/kate/app/kbookmarkhandler.cpp +++ b/kate/app/kbookmarkhandler.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include @@ -36,7 +36,7 @@ KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, KPopupMenu* kpopupmenu ) - : QObject( parent, "KBookmarkHandler" ), + : TQObject( parent, "KBookmarkHandler" ), KBookmarkOwner(), mParent( parent ), m_menu( kpopupmenu ), @@ -45,7 +45,7 @@ KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, KPopupMenu* kpopup if (!m_menu) m_menu = new KPopupMenu( parent, "bookmark menu" ); - QString file = locate( "data", "kate/fsbookmarks.xml" ); + TQString file = locate( "data", "kate/fsbookmarks.xml" ); if ( file.isEmpty() ) file = locateLocal( "data", "kate/fsbookmarks.xml" ); @@ -61,23 +61,23 @@ KBookmarkHandler::~KBookmarkHandler() // delete m_bookmarkMenu; ### } -QString KBookmarkHandler::currentURL() const +TQString KBookmarkHandler::currentURL() const { return mParent->dirOperator()->url().url(); } -void KBookmarkHandler::slotNewBookmark( const QString& /*text*/, - const QCString& url, - const QString& additionalInfo ) +void KBookmarkHandler::slotNewBookmark( const TQString& /*text*/, + const TQCString& url, + const TQString& additionalInfo ) { *m_importStream << "\n"; - *m_importStream << "" << (additionalInfo.isEmpty() ? QString::fromUtf8(url) : additionalInfo) << "\n\n"; + *m_importStream << "\" href=\"" << TQString::fromUtf8(url) << "\">\n"; + *m_importStream << "" << (additionalInfo.isEmpty() ? TQString::fromUtf8(url) : additionalInfo) << "\n\n"; } -void KBookmarkHandler::slotNewFolder( const QString& text, bool /*open*/, - const QString& /*additionalInfo*/ ) +void KBookmarkHandler::slotNewFolder( const TQString& text, bool /*open*/, + const TQString& /*additionalInfo*/ ) { *m_importStream << "\n\n"; diff --git a/kate/app/kbookmarkhandler.h b/kate/app/kbookmarkhandler.h index 15697e283..c673ccb73 100644 --- a/kate/app/kbookmarkhandler.h +++ b/kate/app/kbookmarkhandler.h @@ -30,7 +30,7 @@ class KActionMenu; class QTextStream; class KPopupMenu; -class KBookmarkHandler : public QObject, public KBookmarkOwner +class KBookmarkHandler : public TQObject, public KBookmarkOwner { Q_OBJECT @@ -39,19 +39,19 @@ public: ~KBookmarkHandler(); // KBookmarkOwner interface: - virtual void openBookmarkURL( const QString& url ) { emit openURL( url ); } - virtual QString currentURL() const; + virtual void openBookmarkURL( const TQString& url ) { emit openURL( url ); } + virtual TQString currentURL() const; KPopupMenu *menu() const { return m_menu; } signals: - void openURL( const QString& url ); + void openURL( const TQString& url ); private slots: - void slotNewBookmark( const QString& text, const QCString& url, - const QString& additionalInfo ); - void slotNewFolder( const QString& text, bool open, - const QString& additionalInfo ); + void slotNewBookmark( const TQString& text, const TQCString& url, + const TQString& additionalInfo ); + void slotNewFolder( const TQString& text, bool open, + const TQString& additionalInfo ); void newSeparator(); void endFolder(); @@ -63,7 +63,7 @@ private: KPopupMenu *m_menu; KBookmarkMenu *m_bookmarkMenu; - QTextStream *m_importStream; + TQTextStream *m_importStream; //class KBookmarkHandlerPrivate *d; }; diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 5dab9340d..efb71b767 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -57,17 +57,17 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // StatusBar field IDs #define KWRITE_ID_GEN 1 -QPtrList KWrite::docList; -QPtrList KWrite::winList; +TQPtrList KWrite::docList; +TQPtrList KWrite::winList; KWrite::KWrite (KTextEditor::Document *doc) : m_view(0), @@ -96,11 +96,11 @@ KWrite::KWrite (KTextEditor::Document *doc) setAcceptDrops(true); - connect(m_view,SIGNAL(newStatus()),this,SLOT(newCaption())); - connect(m_view,SIGNAL(viewStatusMsg(const QString &)),this,SLOT(newStatus(const QString &))); - connect(m_view->document(),SIGNAL(fileNameChanged()),this,SLOT(newCaption())); - connect(m_view->document(),SIGNAL(fileNameChanged()),this,SLOT(slotFileNameChanged())); - connect(m_view,SIGNAL(dropEventPass(QDropEvent *)),this,SLOT(slotDropEvent(QDropEvent *))); + connect(m_view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(newCaption())); + connect(m_view,TQT_SIGNAL(viewStatusMsg(const TQString &)),this,TQT_SLOT(newStatus(const TQString &))); + connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(newCaption())); + connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(slotFileNameChanged())); + connect(m_view,TQT_SIGNAL(dropEventPass(TQDropEvent *)),this,TQT_SLOT(slotDropEvent(TQDropEvent *))); setXMLFile( "kwriteui.rc" ); createShellGUI( true ); @@ -108,11 +108,11 @@ KWrite::KWrite (KTextEditor::Document *doc) // 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 ((QPopupMenu*)(factory()->container("ktexteditor_popup", this)) ); + static_cast(m_view->qt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) ); // init with more usefull size, stolen from konq :) if (!initialGeometrySet()) - resize( QSize(700, 480).expandedTo(minimumSizeHint())); + resize( TQSize(700, 480).expandedTo(minimumSizeHint())); // 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, SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document")); + KStdAction::close( this, TQT_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document")); // setup File menu - KStdAction::print(this, SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document")); - KStdAction::openNew( this, SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document")); - KStdAction::open( this, SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing")); + 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")); - m_recentFiles = KStdAction::openRecent(this, SLOT(slotOpen(const KURL&)), + m_recentFiles = KStdAction::openRecent(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, SLOT(newView()), + KAction *a=new KAction(i18n("&New Window"), "window_new", 0, 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,SLOT(changeEditor()), + a=new KAction(i18n("Choose Editor..."),0,this,TQT_SLOT(changeEditor()), actionCollection(),"settings_choose_editor"); a->setWhatsThis(i18n("Override the system wide setting for the default editing component")); - KStdAction::quit(this, SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view")); + KStdAction::quit(this, TQT_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view")); // setup Settings menu setStandardToolBarMenuEnabled(true); - m_paShowStatusBar = KStdAction::showStatusbar(this, SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar"); + m_paShowStatusBar = KStdAction::showStatusbar(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, SLOT(newCaption()), + m_paShowPath = new KToggleAction(i18n("Sho&w Path"), 0, 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, SLOT(editKeys()), actionCollection()); + a=KStdAction::keyBindings(this, TQT_SLOT(editKeys()), actionCollection()); a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments.")); - a=KStdAction::configureToolbars(this, SLOT(editToolbars()), actionCollection()); + a=KStdAction::configureToolbars(this, TQT_SLOT(editToolbars()), actionCollection()); a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s).")); } @@ -226,7 +226,7 @@ void KWrite::slotOpen() { KEncodingFileDialog::Result r=KEncodingFileDialog::getOpenURLsAndEncoding( KTextEditor::encodingInterface(m_view->document())->encoding(), - m_view->document()->url().url(),QString::null,this,i18n("Open File")); + m_view->document()->url().url(),TQString::null,this,i18n("Open File")); for (KURL::List::Iterator i=r.URLs.begin(); i != r.URLs.end(); ++i) { @@ -236,7 +236,7 @@ void KWrite::slotOpen() } else { - KURL::List l=KFileDialog::getOpenURLs(m_view->document()->url().url(),QString::null,this,QString::null); + KURL::List l=KFileDialog::getOpenURLs(m_view->document()->url().url(),TQString::null,this,TQString::null); for (KURL::List::Iterator i=l.begin(); i != l.end(); ++i) { slotOpen ( *i ); @@ -299,7 +299,7 @@ void KWrite::editToolbars() { saveMainWindowSettings( kapp->config(), "MainWindow" ); KEditToolbar *dlg = new KEditToolbar(guiFactory()); - connect( dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotNewToolbarConfig()) ); + connect( dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()) ); dlg->exec(); delete dlg; } @@ -320,7 +320,7 @@ void KWrite::printDlg() KTextEditor::printInterface(m_view->document())->printDialog (); } -void KWrite::newStatus(const QString &msg) +void KWrite::newStatus(const TQString &msg) { newCaption(); @@ -334,7 +334,7 @@ void KWrite::newCaption() } else { - QString c; + TQString c; if (!m_paShowPath->isChecked()) { c = m_view->document()->url().fileName(); @@ -356,17 +356,17 @@ void KWrite::newCaption() } } -void KWrite::dragEnterEvent( QDragEnterEvent *event ) +void KWrite::dragEnterEvent( TQDragEnterEvent *event ) { event->accept(KURLDrag::canDecode(event)); } -void KWrite::dropEvent( QDropEvent *event ) +void KWrite::dropEvent( TQDropEvent *event ) { slotDropEvent(event); } -void KWrite::slotDropEvent( QDropEvent *event ) +void KWrite::slotDropEvent( TQDropEvent *event ) { KURL::List textlist; @@ -379,9 +379,9 @@ void KWrite::slotDropEvent( QDropEvent *event ) void KWrite::slotEnableActions( bool enable ) { - QValueList actions = actionCollection()->actions(); - QValueList::ConstIterator it = actions.begin(); - QValueList::ConstIterator end = actions.end(); + TQValueList actions = actionCollection()->actions(); + TQValueList::ConstIterator it = actions.begin(); + TQValueList::ConstIterator end = actions.end(); for (; it != end; ++it ) (*it)->setEnabled( enable ); @@ -471,7 +471,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents for (uint z = 1; z <= docList.count(); z++) { - QString buf = QString("Document %1").arg(z); + TQString buf = TQString("Document %1").arg(z); config->setGroup(buf); KTextEditor::Document *doc = docList.at(z - 1); @@ -482,7 +482,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents for (uint z = 1; z <= winList.count(); z++) { - QString buf = QString("Window %1").arg(z); + TQString buf = TQString("Window %1").arg(z); config->setGroup(buf); config->writeEntry("DocumentNumber",docList.find(winList.at(z-1)->view()->document()) + 1); @@ -498,7 +498,7 @@ void KWrite::restore() return; int docs, windows; - QString buf; + TQString buf; KTextEditor::Document *doc; KWrite *t; @@ -508,7 +508,7 @@ void KWrite::restore() for (int z = 1; z <= docs; z++) { - buf = QString("Document %1").arg(z); + buf = TQString("Document %1").arg(z); config->setGroup(buf); doc=KTextEditor::EditorChooser::createDocument(0,"KTextEditor::Document"); @@ -519,7 +519,7 @@ void KWrite::restore() for (int z = 1; z <= windows; z++) { - buf = QString("Window %1").arg(z); + buf = TQString("Window %1").arg(z); config->setGroup(buf); t = new KWrite(docList.at(config->readNumEntry("DocumentNumber") - 1)); t->restore(config,z); @@ -543,7 +543,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) KLocale::setMainCatalogue("kate"); //lukas: set this to have the kwritepart translated using kate message catalog // here we go, construct the KWrite version - QString kWriteVersion = QString ("%1.%2.%3").arg(KDE::versionMajor() + 1).arg(KDE::versionMinor()).arg(KDE::versionRelease()); + TQString kWriteVersion = TQString ("%1.%2.%3").arg(KDE::versionMajor() + 1).arg(KDE::versionMinor()).arg(KDE::versionRelease()); KAboutData aboutData ( "kwrite", I18N_NOOP("KWrite"), @@ -609,7 +609,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) bool nav = false; int line = 0, column = 0; - QTextCodec *codec = args->isSet("encoding") ? QTextCodec::codecForName(args->getOption("encoding")) : 0; + TQTextCodec *codec = args->isSet("encoding") ? TQTextCodec::codecForName(args->getOption("encoding")) : 0; if (args->isSet ("line")) { @@ -629,14 +629,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) if( args->isSet( "stdin" ) ) { - QTextIStream input(stdin); + TQTextIStream input(stdin); // set chosen codec if (codec) input.setCodec (codec); - QString line; - QString text; + TQString line; + TQString text; do { @@ -660,7 +660,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) KWrite *t = new KWrite(); // this file is no local dir, open it, else warn - bool noDir = !args->url(z).isLocalFile() || !QDir (args->url(z).path()).exists(); + bool noDir = !args->url(z).isLocalFile() || !TQDir (args->url(z).path()).exists(); if (noDir) { @@ -692,10 +692,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) return a.exec (); } -KWriteEditorChooser::KWriteEditorChooser(QWidget *): +KWriteEditorChooser::KWriteEditorChooser(TQWidget *): KDialogBase(KDialogBase::Plain,i18n("Choose Editor Component"),KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Cancel) { - (new QVBoxLayout(plainPage()))->setAutoAdd(true); + (new TQVBoxLayout(plainPage()))->setAutoAdd(true); m_chooser=new KTextEditor::EditorChooser(plainPage(),"Editor Chooser"); setMainWidget(m_chooser); m_chooser->readAppSetting(); diff --git a/kate/app/kwritemain.h b/kate/app/kwritemain.h index 7af2c67ad..6a3565a6c 100644 --- a/kate/app/kwritemain.h +++ b/kate/app/kwritemain.h @@ -55,8 +55,8 @@ class KWrite : public KParts::MainWindow bool queryClose(); - void dragEnterEvent( QDragEnterEvent * ); - void dropEvent( QDropEvent * ); + void dragEnterEvent( TQDragEnterEvent * ); + void dropEvent( TQDropEvent * ); public slots: void slotNew(); @@ -76,10 +76,10 @@ class KWrite : public KParts::MainWindow void printNow(); void printDlg(); - void newStatus(const QString &msg); + void newStatus(const TQString &msg); void newCaption(); - void slotDropEvent(QDropEvent *); + void slotDropEvent(TQDropEvent *); void slotEnableActions( bool enable ); @@ -113,10 +113,10 @@ class KWrite : public KParts::MainWindow KToggleAction * m_paShowPath; KToggleAction * m_paShowStatusBar; - QString encoding; + TQString encoding; - static QPtrList docList; - static QPtrList winList; + static TQPtrList docList; + static TQPtrList winList; }; class KWriteEditorChooser: public KDialogBase @@ -124,7 +124,7 @@ class KWriteEditorChooser: public KDialogBase Q_OBJECT public: - KWriteEditorChooser(QWidget *parent); + KWriteEditorChooser(TQWidget *parent); virtual ~KWriteEditorChooser(); private: diff --git a/kate/interfaces/application.cpp b/kate/interfaces/application.cpp index 160c460c8..5aded5505 100644 --- a/kate/interfaces/application.cpp +++ b/kate/interfaces/application.cpp @@ -46,7 +46,7 @@ class PrivateApplication KateApp *app; }; -Application::Application (void *application) : QObject ((KateApp *) application) +Application::Application (void *application) : TQObject ((KateApp *) application) { d = new PrivateApplication; d->app = (KateApp *) application; diff --git a/kate/interfaces/application.h b/kate/interfaces/application.h index 6f576a311..be9cd23c6 100644 --- a/kate/interfaces/application.h +++ b/kate/interfaces/application.h @@ -19,7 +19,7 @@ #ifndef _KATE_APPLICATION_INCLUDE_ #define _KATE_APPLICATION_INCLUDE_ -#include +#include #include namespace Kate diff --git a/kate/interfaces/documentmanager.cpp b/kate/interfaces/documentmanager.cpp index 1b8292290..750839781 100644 --- a/kate/interfaces/documentmanager.cpp +++ b/kate/interfaces/documentmanager.cpp @@ -45,7 +45,7 @@ class PrivateDocumentManager KateDocManager *docMan; }; -DocumentManager::DocumentManager (void *documentManager) : QObject ((KateDocManager*) documentManager) +DocumentManager::DocumentManager (void *documentManager) : TQObject ((KateDocManager*) documentManager) { d = new PrivateDocumentManager (); d->docMan = (KateDocManager*) documentManager; @@ -86,7 +86,7 @@ uint DocumentManager::documents () return d->docMan->documents (); } -Document *DocumentManager::openURL(const KURL&url,const QString &encoding,uint *id) +Document *DocumentManager::openURL(const KURL&url,const TQString &encoding,uint *id) { return d->docMan->openURL (url, encoding, id); } diff --git a/kate/interfaces/documentmanager.h b/kate/interfaces/documentmanager.h index 82a714aa6..a0c5e2387 100644 --- a/kate/interfaces/documentmanager.h +++ b/kate/interfaces/documentmanager.h @@ -19,7 +19,7 @@ #ifndef _KATE_DOCMANAGER_INCLUDE_ #define _KATE_DOCMANAGER_INCLUDE_ -#include +#include #include namespace Kate @@ -61,7 +61,7 @@ class KDE_EXPORT DocumentManager : public QObject /** open a document and return a pointer to the document, if you specify a pointer != 0 to the id parameter * you will get the document id returned too */ - class Document *openURL(const KURL&url,const QString &encoding=QString::null,uint *id =0); + class Document *openURL(const KURL&url,const TQString &encoding=TQString::null,uint *id =0); /** close a document by pointer */ bool closeDocument(class Document *document); diff --git a/kate/interfaces/mainwindow.cpp b/kate/interfaces/mainwindow.cpp index ad563d6ab..4596cacb5 100644 --- a/kate/interfaces/mainwindow.cpp +++ b/kate/interfaces/mainwindow.cpp @@ -46,7 +46,7 @@ class PrivateMainWindow KateMainWindow *win; }; -MainWindow::MainWindow (void *mainWindow) : QObject ((KateMainWindow*) mainWindow) +MainWindow::MainWindow (void *mainWindow) : TQObject ((KateMainWindow*) mainWindow) { d = new PrivateMainWindow; d->win = (KateMainWindow*) mainWindow; @@ -67,7 +67,7 @@ ViewManager *MainWindow::viewManager () const return d->win->viewManager ()->viewManager (); } -class QWidget *MainWindow::centralWidget() const +class TQWidget *MainWindow::centralWidget() const { return d->win->centralWidget(); } diff --git a/kate/interfaces/mainwindow.h b/kate/interfaces/mainwindow.h index 19d5170cb..5c8449b62 100644 --- a/kate/interfaces/mainwindow.h +++ b/kate/interfaces/mainwindow.h @@ -19,7 +19,7 @@ #ifndef _KATE_MAINWINDOW_INCLUDE_ #define _KATE_MAINWINDOW_INCLUDE_ -#include +#include #include #include @@ -48,10 +48,10 @@ class KDE_EXPORT MainWindow : public QObject public : /** * Access the widget (in the middle of the 4 sidebars) in which the editor - * component and the KateTabBar are embedded. This widget is a QVBox, so + * component and the KateTabBar are embedded. This widget is a TQVBox, so * other child widgets can be embedded unter the editor widget. */ - class QWidget *centralWidget() const; + class TQWidget *centralWidget() const; class ToolViewManager *toolViewManager() const; private: diff --git a/kate/interfaces/plugin.cpp b/kate/interfaces/plugin.cpp index 3a540440f..849b12a1e 100644 --- a/kate/interfaces/plugin.cpp +++ b/kate/interfaces/plugin.cpp @@ -54,7 +54,7 @@ namespace Kate unsigned int Plugin::globalPluginNumber = 0; unsigned int PluginViewInterface::globalPluginViewInterfaceNumber = 0; -Plugin::Plugin( Application *application, const char *name ) : QObject (application, name ) +Plugin::Plugin( Application *application, const char *name ) : TQObject (application, name ) { globalPluginNumber++; myPluginNumber = globalPluginNumber; @@ -89,7 +89,7 @@ unsigned int PluginViewInterface::pluginViewInterfaceNumber () const return myPluginViewInterfaceNumber; } -Plugin *createPlugin ( const char* libname, Application *application, const char *name, const QStringList &args ) +Plugin *createPlugin ( const char* libname, Application *application, const char *name, const TQStringList &args ) { return KParts::ComponentFactory::createInstanceFromLibrary( libname, application, name, args); } diff --git a/kate/interfaces/plugin.h b/kate/interfaces/plugin.h index 57bddae71..53ee16bd6 100644 --- a/kate/interfaces/plugin.h +++ b/kate/interfaces/plugin.h @@ -20,8 +20,8 @@ #ifndef _KATE_PLUGIN_INCLUDE_ #define _KATE_PLUGIN_INCLUDE_ -#include -#include +#include +#include #include #include @@ -52,7 +52,7 @@ class KDE_EXPORT Plugin : public QObject unsigned int myPluginNumber; }; -KDE_EXPORT Plugin *createPlugin ( const char* libname, Application *application = 0, const char *name = 0,const QStringList &args = QStringList() ); +KDE_EXPORT Plugin *createPlugin ( const char* libname, Application *application = 0, const char *name = 0,const TQStringList &args = TQStringList() ); /* * view plugin class diff --git a/kate/interfaces/pluginconfiginterfaceextension.cpp b/kate/interfaces/pluginconfiginterfaceextension.cpp index 99cb824bd..53c22122b 100644 --- a/kate/interfaces/pluginconfiginterfaceextension.cpp +++ b/kate/interfaces/pluginconfiginterfaceextension.cpp @@ -35,7 +35,7 @@ class PrivatePluginConfigInterfaceExtension using namespace Kate; -PluginConfigPage::PluginConfigPage ( QWidget *parent, const char *name ) : QWidget (parent, name) { } +PluginConfigPage::PluginConfigPage ( TQWidget *parent, const char *name ) : TQWidget (parent, name) { } PluginConfigPage::~PluginConfigPage () { } diff --git a/kate/interfaces/pluginconfiginterfaceextension.h b/kate/interfaces/pluginconfiginterfaceextension.h index 4c4169179..17a74ce7d 100644 --- a/kate/interfaces/pluginconfiginterfaceextension.h +++ b/kate/interfaces/pluginconfiginterfaceextension.h @@ -19,8 +19,8 @@ #ifndef __kate_pluginconfiginterfaceextension_h__ #define __kate_pluginconfiginterfaceextension_h__ -#include -#include +#include +#include #include namespace Kate @@ -31,7 +31,7 @@ class KDE_EXPORT PluginConfigPage : public QWidget Q_OBJECT public: - PluginConfigPage ( QWidget *parent=0, const char *name=0 ); + PluginConfigPage ( TQWidget *parent=0, const char *name=0 ); virtual ~PluginConfigPage (); // @@ -84,11 +84,11 @@ class KDE_EXPORT PluginConfigInterfaceExtension config pages from 0 to configPages()-1 are available if configPages() > 0 */ - virtual PluginConfigPage *configPage (uint number = 0, QWidget *parent = 0, const char *name=0 ) = 0; + virtual PluginConfigPage *configPage (uint number = 0, TQWidget *parent = 0, const char *name=0 ) = 0; - virtual QString configPageName (uint number = 0) const = 0; - virtual QString configPageFullName (uint number = 0) const = 0; - virtual QPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const = 0; + virtual TQString configPageName (uint number = 0) const = 0; + virtual TQString configPageFullName (uint number = 0) const = 0; + virtual TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const = 0; private: class PrivatePluginConfigInterfaceExtension *d; diff --git a/kate/interfaces/pluginmanager.cpp b/kate/interfaces/pluginmanager.cpp index 2ea7c54b5..8d4f13f7c 100644 --- a/kate/interfaces/pluginmanager.cpp +++ b/kate/interfaces/pluginmanager.cpp @@ -43,7 +43,7 @@ class PrivatePluginManager KatePluginManager *pluginMan; }; -PluginManager::PluginManager (void *pluginManager) : QObject ((KatePluginManager*) pluginManager) +PluginManager::PluginManager (void *pluginManager) : TQObject ((KatePluginManager*) pluginManager) { d = new PrivatePluginManager (); d->pluginMan = (KatePluginManager*) pluginManager; @@ -54,22 +54,22 @@ PluginManager::~PluginManager () delete d; } -Plugin *PluginManager::plugin(const QString &name) +Plugin *PluginManager::plugin(const TQString &name) { return d->pluginMan->plugin(name); } -bool PluginManager::pluginAvailable(const QString &name) +bool PluginManager::pluginAvailable(const TQString &name) { return d->pluginMan->pluginAvailable (name); } -Plugin *PluginManager::loadPlugin(const QString &name,bool permanent) +Plugin *PluginManager::loadPlugin(const TQString &name,bool permanent) { return d->pluginMan->loadPlugin (name, permanent); } -void PluginManager::unloadPlugin(const QString &name,bool permanent) +void PluginManager::unloadPlugin(const TQString &name,bool permanent) { d->pluginMan->unloadPlugin (name, permanent); } diff --git a/kate/interfaces/pluginmanager.h b/kate/interfaces/pluginmanager.h index 53279fd94..d9473e584 100644 --- a/kate/interfaces/pluginmanager.h +++ b/kate/interfaces/pluginmanager.h @@ -20,7 +20,7 @@ #ifndef _KATE_PLUGINMANAGER_INCLUDE_ #define _KATE_PLUGINMANAGER_INCLUDE_ -#include +#include #include namespace Kate @@ -39,27 +39,27 @@ class KDE_EXPORT PluginManager : public QObject public: /** if the plugin with the library name "name" is loaded, a pointer to that plugin is returned */ - class Plugin *plugin(const QString &name); + class Plugin *plugin(const TQString &name); /** return true, if plugin is known to kate (either loaded or not loaded) * * This method is not used yet */ - bool pluginAvailable(const QString &name); + bool pluginAvailable(const TQString &name); /** tries loading the specified plugin and returns a pointer to the new plugin or 0 * if permanent is true (default value) the plugin will be loaded at the next kate startup * * This method is not used yet */ - class Plugin *loadPlugin(const QString &name,bool permanent=true); + class Plugin *loadPlugin(const TQString &name,bool permanent=true); /** unload the specified plugin. If the value permanent is true (default value), the plugin will not be * loaded on kate's next startup. Even if it had been loaded with permanent=true. * * This method is not used yet */ - void unloadPlugin(const QString &name,bool permanent=true); + void unloadPlugin(const TQString &name,bool permanent=true); private: class PrivatePluginManager *d; diff --git a/kate/interfaces/toolviewmanager.cpp b/kate/interfaces/toolviewmanager.cpp index 9f96a476d..848ec5fa2 100644 --- a/kate/interfaces/toolviewmanager.cpp +++ b/kate/interfaces/toolviewmanager.cpp @@ -42,7 +42,7 @@ class PrivateToolViewManager KateMainWindow *toolViewMan; }; -ToolViewManager::ToolViewManager (void *toolViewManager) : QObject ((KateMainWindow*) toolViewManager) +ToolViewManager::ToolViewManager (void *toolViewManager) : TQObject ((KateMainWindow*) toolViewManager) { d = new PrivateToolViewManager (); d->toolViewMan = (KateMainWindow*) toolViewManager; @@ -53,12 +53,12 @@ ToolViewManager::~ToolViewManager () delete d; } -QWidget *ToolViewManager::createToolView (const QString &identifier, ToolViewManager::Position pos, const QPixmap &icon, const QString &text) +TQWidget *ToolViewManager::createToolView (const TQString &identifier, ToolViewManager::Position pos, const TQPixmap &icon, const TQString &text) { return d->toolViewMan->createToolView (identifier, (KMultiTabBar::KMultiTabBarPosition)pos, icon, text); } -bool ToolViewManager::moveToolView (QWidget *widget, ToolViewManager::Position pos) +bool ToolViewManager::moveToolView (TQWidget *widget, ToolViewManager::Position pos) { if (!widget || !widget->qt_cast("KateMDI::ToolView")) return false; @@ -66,7 +66,7 @@ bool ToolViewManager::moveToolView (QWidget *widget, ToolViewManager::Position return d->toolViewMan->moveToolView (static_cast(widget), (KMultiTabBar::KMultiTabBarPosition)pos); } -bool ToolViewManager::showToolView(QWidget *widget) +bool ToolViewManager::showToolView(TQWidget *widget) { if (!widget || !widget->qt_cast("KateMDI::ToolView")) return false; @@ -74,7 +74,7 @@ bool ToolViewManager::showToolView(QWidget *widget) return d->toolViewMan->showToolView (static_cast(widget)); } -bool ToolViewManager::hideToolView(QWidget *widget) +bool ToolViewManager::hideToolView(TQWidget *widget) { if (!widget || !widget->qt_cast("KateMDI::ToolView")) return false; diff --git a/kate/interfaces/toolviewmanager.h b/kate/interfaces/toolviewmanager.h index 0a1011181..2e9242f3a 100644 --- a/kate/interfaces/toolviewmanager.h +++ b/kate/interfaces/toolviewmanager.h @@ -20,7 +20,7 @@ #ifndef _KATE_TOOLVIEWMANAGER_INCLUDE_ #define _KATE_TOOLVIEWMANAGER_INCLUDE_ -#include +#include #include namespace Kate @@ -60,7 +60,7 @@ class KDE_EXPORT ToolViewManager : public QObject * @param text text to use in addition to icon * @return created toolview on success or 0 */ - QWidget *createToolView (const QString &identifier, ToolViewManager::Position pos, const QPixmap &icon, const QString &text); + TQWidget *createToolView (const TQString &identifier, ToolViewManager::Position pos, const TQPixmap &icon, const TQString &text); /** * Move the toolview @@ -68,21 +68,21 @@ class KDE_EXPORT ToolViewManager : public QObject * @param pos position to move widget to * @return bool success */ - bool moveToolView (QWidget *widget, ToolViewManager::Position pos); + bool moveToolView (TQWidget *widget, ToolViewManager::Position pos); /** * Show the toolview * @param widget to show, widget given must be widget constructed by createToolView * @return bool success */ - bool showToolView (QWidget *widget); + bool showToolView (TQWidget *widget); /** * Hide the toolview * @param widget to hide, widget given must be widget constructed by createToolView * @return bool success */ - bool hideToolView (QWidget *widget); + bool hideToolView (TQWidget *widget); private: /** diff --git a/kate/interfaces/viewmanager.cpp b/kate/interfaces/viewmanager.cpp index e2dbd34de..d365f514e 100644 --- a/kate/interfaces/viewmanager.cpp +++ b/kate/interfaces/viewmanager.cpp @@ -43,7 +43,7 @@ class PrivateViewManager KateViewManager *viewMan; }; -ViewManager::ViewManager (void *viewManager) : QObject ((KateViewManager*) viewManager) +ViewManager::ViewManager (void *viewManager) : TQObject ((KateViewManager*) viewManager) { d = new PrivateViewManager (); d->viewMan = (KateViewManager*) viewManager; @@ -66,7 +66,7 @@ void ViewManager::activateView ( uint documentNumber ) void ViewManager::openURL (const KURL &url) { - d->viewMan->openURL (url, QString::null, true); + d->viewMan->openURL (url, TQString::null, true); } } diff --git a/kate/interfaces/viewmanager.h b/kate/interfaces/viewmanager.h index ab7a74ce8..9bdc938d7 100644 --- a/kate/interfaces/viewmanager.h +++ b/kate/interfaces/viewmanager.h @@ -19,7 +19,7 @@ #ifndef _KATE_VIEWMANAGER_INCLUDE_ #define _KATE_VIEWMANAGER_INCLUDE_ -#include +#include #include namespace Kate diff --git a/kate/utils/dockviewbase.cpp b/kate/utils/dockviewbase.cpp index 54a4d6d6e..76e5844ed 100644 --- a/kate/utils/dockviewbase.cpp +++ b/kate/utils/dockviewbase.cpp @@ -19,8 +19,8 @@ #include "dockviewbase.h" #include "dockviewbase.moc" -#include -#include +#include +#include //#include @@ -29,22 +29,22 @@ namespace Kate { // data storage class DockViewBasePrivate { public: - QWidget *header; - QLabel *lTitle; - QLabel *lPrefix; + TQWidget *header; + TQLabel *lTitle; + TQLabel *lPrefix; }; } -Kate::DockViewBase::DockViewBase( QWidget* parent, const char* name ) - : QVBox( parent, name ), +Kate::DockViewBase::DockViewBase( TQWidget* parent, const char* name ) + : TQVBox( parent, name ), d ( new Kate::DockViewBasePrivate ) { - init( QString::null, QString::null ); + init( TQString::null, TQString::null ); } -Kate::DockViewBase::DockViewBase( const QString &prefix, const QString &title, QWidget* parent, const char* name ) - : QVBox( parent, name ), +Kate::DockViewBase::DockViewBase( const TQString &prefix, const TQString &title, TQWidget* parent, const char* name ) + : TQVBox( parent, name ), d ( new Kate::DockViewBasePrivate ) { init( prefix, title ); @@ -55,45 +55,45 @@ Kate::DockViewBase::~DockViewBase() delete d; } -void Kate::DockViewBase::setTitlePrefix( const QString &prefix ) +void Kate::DockViewBase::setTitlePrefix( const TQString &prefix ) { d->lPrefix->setText( prefix ); d->lPrefix->show(); } -QString Kate::DockViewBase::titlePrefix() const +TQString Kate::DockViewBase::titlePrefix() const { return d->lPrefix->text(); } -void Kate::DockViewBase::setTitle( const QString &title ) +void Kate::DockViewBase::setTitle( const TQString &title ) { d->lTitle->setText( title ); d->lTitle->show(); } -QString Kate::DockViewBase::title() const +TQString Kate::DockViewBase::title() const { return d->lTitle->text(); } -void Kate::DockViewBase::setTitle( const QString &prefix, const QString &title ) +void Kate::DockViewBase::setTitle( const TQString &prefix, const TQString &title ) { setTitlePrefix( prefix ); setTitle( title ); } -void Kate::DockViewBase::init( const QString &prefix, const QString &title ) +void Kate::DockViewBase::init( const TQString &prefix, const TQString &title ) { setSpacing( 4 ); - d->header = new QWidget( this ); - d->header->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed, true ) ); - QHBoxLayout *lo = new QHBoxLayout( d->header ); + d->header = new TQWidget( this ); + d->header->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) ); + TQHBoxLayout *lo = new TQHBoxLayout( d->header ); lo->setSpacing( 6 ); lo->insertSpacing( 0, 6 ); - d->lPrefix = new QLabel( title, d->header ); + d->lPrefix = new TQLabel( title, d->header ); lo->addWidget( d->lPrefix ); - d->lTitle = new QLabel( title, d->header ); + d->lTitle = new TQLabel( title, d->header ); lo->addWidget( d->lTitle ); lo->setStretchFactor( d->lTitle, 1 ); lo->insertSpacing( -1, 6 ); diff --git a/kate/utils/dockviewbase.h b/kate/utils/dockviewbase.h index 9e3010302..73d564e04 100644 --- a/kate/utils/dockviewbase.h +++ b/kate/utils/dockviewbase.h @@ -19,7 +19,7 @@ #ifndef _KATE_DOCKVIEW_BASE_H_ #define _KATE_DOCKVIEW_BASE_H_ -#include +#include /** * Namespace collecting as much of the internal Kate classes as we @@ -50,50 +50,50 @@ namespace Kate */ -class DockViewBase : public QVBox { +class DockViewBase : public TQVBox { Q_OBJECT public: /** Create a KateDockViewBase. */ - DockViewBase( QWidget *parent=0, const char *name=0 ); + DockViewBase( TQWidget *parent=0, const char *name=0 ); /** Create a KateDockViewBase with the title prefix @p prefix and the title @p title. */ - DockViewBase( const QString &prefix, const QString &title, QWidget *parent=0, const char *name=0 ); + DockViewBase( const TQString &prefix, const TQString &title, TQWidget *parent=0, const char *name=0 ); ~DockViewBase(); /** Set the title prefix to @p prefix. */ - void setTitlePrefix( const QString &prefix ); + void setTitlePrefix( const TQString &prefix ); /** @return The title prefix. */ - QString titlePrefix() const; + TQString titlePrefix() const; /** Set the title to @p title */ - void setTitle( const QString &title ); + void setTitle( const TQString &title ); /** Convenience method, sets both the prefix and title */ - void setTitle( const QString &prefix, const QString &title ); + void setTitle( const TQString &prefix, const TQString &title ); /** @return the title of the KateDockViewBase */ - QString title() const; + TQString title() const; private: /** Private initialization */ - void init( const QString &, const QString &); + void init( const TQString &, const TQString &); class DockViewBasePrivate *d; }; diff --git a/kate/utils/listboxview.cpp b/kate/utils/listboxview.cpp index 69e103bad..a71ea038b 100644 --- a/kate/utils/listboxview.cpp +++ b/kate/utils/listboxview.cpp @@ -31,14 +31,14 @@ class ListboxViewPrivate { } -Kate::ListboxView::ListboxView( QWidget *parent, const char *name ) +Kate::ListboxView::ListboxView( TQWidget *parent, const char *name ) : Kate::DockViewBase( parent, name), d( new Kate::ListboxViewPrivate) { d->listbox = new KListBox( this ); } -Kate::ListboxView::ListboxView( const QString &titlePrefix, const QString &title, QWidget *parent, const char *name ) +Kate::ListboxView::ListboxView( const TQString &titlePrefix, const TQString &title, TQWidget *parent, const char *name ) : Kate::DockViewBase( titlePrefix, title, parent, name), d( new Kate::ListboxViewPrivate) { diff --git a/kate/utils/listboxview.h b/kate/utils/listboxview.h index 233b4798a..7fee0d808 100644 --- a/kate/utils/listboxview.h +++ b/kate/utils/listboxview.h @@ -29,8 +29,8 @@ namespace Kate class ListboxView : public DockViewBase { Q_OBJECT public: - ListboxView( QWidget *parent=0, const char *name=0 ); - ListboxView( const QString &titlePrefix, const QString &title, QWidget *parent=0, const char *name=0 ); + ListboxView( TQWidget *parent=0, const char *name=0 ); + ListboxView( const TQString &titlePrefix, const TQString &title, TQWidget *parent=0, const char *name=0 ); ~ListboxView(); KListBox * listbox(); diff --git a/kate/utils/messageview.cpp b/kate/utils/messageview.cpp index 2f0904433..40155f959 100644 --- a/kate/utils/messageview.cpp +++ b/kate/utils/messageview.cpp @@ -19,22 +19,22 @@ #include "messageview.h" #include "messageview.moc" -#include +#include -Kate::MessageView::MessageView( QWidget *parent, const char *name ) +Kate::MessageView::MessageView( TQWidget *parent, const char *name ) : Kate::DockViewBase( parent, name ) { - m_view = new QTextBrowser( this ); + m_view = new TQTextBrowser( this ); // m_view->setFormat( Qt::richText ); // should be!! - connect( m_view, SIGNAL( linkClicked( const QString & ) ), - SIGNAL( linkClicked( const QString & ) ) ); + connect( m_view, TQT_SIGNAL( linkClicked( const TQString & ) ), + TQT_SIGNAL( linkClicked( const TQString & ) ) ); } Kate::MessageView::~MessageView() { } -void Kate::MessageView::addMessage( const QString &msg ) +void Kate::MessageView::addMessage( const TQString &msg ) { m_view->append( msg ); m_view->scrollToBottom(); diff --git a/kate/utils/messageview.h b/kate/utils/messageview.h index d6d330842..248855515 100644 --- a/kate/utils/messageview.h +++ b/kate/utils/messageview.h @@ -26,7 +26,7 @@ This is a message view for displaying output from processes. - It uses a QTextEdit in _ mode to display the text. + It uses a TQTextEdit in _ mode to display the text. You can use HTML links, for example to allow the user to go to a line in a precessed document. @@ -52,18 +52,18 @@ namespace Kate class MessageView : public DockViewBase { Q_OBJECT public: - MessageView( QWidget *parent=0, const char *name=0 ); + MessageView( TQWidget *parent=0, const char *name=0 ); ~MessageView(); public slots: - void addMessage( const QString &msg ); + void addMessage( const TQString &msg ); void clear(); signals: - void linkClicked( const QString & href ); + void linkClicked( const TQString & href ); private: - QTextBrowser *m_view; + TQTextBrowser *m_view; }; } diff --git a/kcminit/main.cpp b/kcminit/main.cpp index 5531b326e..507d648c9 100644 --- a/kcminit/main.cpp +++ b/kcminit/main.cpp @@ -23,8 +23,8 @@ #include -#include -#include +#include +#include #include #include @@ -65,13 +65,13 @@ static void waitForReady() close( ready[ 0 ] ); } -bool KCMInit::runModule(const QString &libName, KService::Ptr service) +bool KCMInit::runModule(const TQString &libName, KService::Ptr service) { KLibLoader *loader = KLibLoader::self(); - KLibrary *lib = loader->library(QFile::encodeName(libName)); + KLibrary *lib = loader->library(TQFile::encodeName(libName)); if (lib) { // get the init_ function - QString factory = QString("init_%1").arg(service->init()); + TQString factory = TQString("init_%1").arg(service->init()); void *init = lib->symbol(factory.utf8()); if (init) { // initialize the module @@ -81,7 +81,7 @@ bool KCMInit::runModule(const QString &libName, KService::Ptr service) func(); return true; } - loader->unloadLibrary(QFile::encodeName(libName)); + loader->unloadLibrary(TQFile::encodeName(libName)); } return false; } @@ -94,7 +94,7 @@ void KCMInit::runModules( int phase ) ++it) { KService::Ptr service = (*it); - QString library = service->property("X-KDE-Init-Library", QVariant::String).toString(); + TQString library = service->property("X-KDE-Init-Library", TQVariant::String).toString(); if (library.isEmpty()) library = service->library(); @@ -102,7 +102,7 @@ void KCMInit::runModules( int phase ) continue; // Skip // see ksmserver's README for the description of the phases - QVariant vphase = service->property("X-KDE-Init-Phase", QVariant::Int ); + TQVariant vphase = service->property("X-KDE-Init-Phase", TQVariant::Int ); int libphase = 1; if( vphase.isValid() ) libphase = vphase.toInt(); @@ -110,12 +110,12 @@ void KCMInit::runModules( int phase ) if( phase != -1 && libphase != phase ) continue; - QString libName = QString("kcm_%1").arg(library); + TQString libName = TQString("kcm_%1").arg(library); // try to load the library if (! alreadyInitialized.contains( libName.ascii() )) { if (!runModule(libName, service)) { - libName = QString("libkcm_%1").arg(library); + libName = TQString("libkcm_%1").arg(library); if (! alreadyInitialized.contains( libName.ascii() )) { runModule(libName, service); alreadyInitialized.append( libName.ascii() ); @@ -129,7 +129,7 @@ void KCMInit::runModules( int phase ) KCMInit::KCMInit( KCmdLineArgs* args ) : DCOPObject( "kcminit" ) { - QCString arg; + TQCString arg; if (args->count() == 1) { arg = args->arg(0); } @@ -145,14 +145,14 @@ KCMInit::KCMInit( KCmdLineArgs* args ) KService::Ptr service = (*it); if (service->library().isEmpty() || service->init().isEmpty()) continue; // Skip - printf("%s\n", QFile::encodeName(service->desktopEntryName()).data()); + printf("%s\n", TQFile::encodeName(service->desktopEntryName()).data()); } return; } if (!arg.isEmpty()) { - QString module = QFile::decodeName(arg); + TQString module = TQFile::decodeName(arg); if (!module.endsWith(".desktop")) module += ".desktop"; @@ -180,20 +180,20 @@ KCMInit::KCMInit( KCmdLineArgs* args ) bool multihead = !config.readBoolEntry( "disableMultihead", false) && (ScreenCount(qt_xdisplay()) > 1); // Pass env. var to kdeinit. - QCString name = "KDE_MULTIHEAD"; - QCString value = multihead ? "true" : "false"; - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQCString name = "KDE_MULTIHEAD"; + TQCString value = multihead ? "true" : "false"; + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << name << value; - kapp->dcopClient()->send("klauncher", "klauncher", "setLaunchEnv(QCString,QCString)", params); + kapp->dcopClient()->send("klauncher", "klauncher", "setLaunchEnv(TQCString,TQCString)", params); setenv( name, value, 1 ); // apply effect also to itself if( startup ) { runModules( 0 ); - kapp->dcopClient()->send( "ksplash", "", "upAndRunning(QString)", QString("kcminit")); + kapp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("kcminit")); sendReady(); - QTimer::singleShot( 300 * 1000, qApp, SLOT( quit())); // just in case + TQTimer::singleShot( 300 * 1000, qApp, TQT_SLOT( quit())); // just in case qApp->exec(); // wait for runPhase1() and runPhase2() } else @@ -208,13 +208,13 @@ KCMInit::~KCMInit() void KCMInit::runPhase1() { runModules( 1 ); - emitDCOPSignal( "phase1Done()", QByteArray()); + emitDCOPSignal( "phase1Done()", TQByteArray()); } void KCMInit::runPhase2() { runModules( 2 ); - emitDCOPSignal( "phase2Done()", QByteArray()); + emitDCOPSignal( "phase2Done()", TQByteArray()); qApp->exit( 0 ); } diff --git a/kcminit/main.h b/kcminit/main.h index f78aba9c4..0efa0c10c 100644 --- a/kcminit/main.h +++ b/kcminit/main.h @@ -25,7 +25,7 @@ class KCmdLineArgs; -class KCMInit : public QObject, public DCOPObject +class KCMInit : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -36,10 +36,10 @@ class KCMInit : public QObject, public DCOPObject KCMInit( KCmdLineArgs* args ); virtual ~KCMInit(); private: - bool runModule(const QString &libName, KService::Ptr service); + bool runModule(const TQString &libName, KService::Ptr service); void runModules( int phase ); KService::List list; - QStrList alreadyInitialized; + TQStrList alreadyInitialized; }; #endif diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 5956697b9..10c593ed7 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -1,11 +1,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -96,10 +96,10 @@ KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled) overlay(0), wm(0, KWinModule::INFO_DESKTOP) { _activeWindow = wm.activeWindow(); - connect(&wm, SIGNAL(activeWindowChanged(WId)), this, SLOT(activeWindowChanged(WId))); + connect(&wm, TQT_SIGNAL(activeWindowChanged(WId)), this, TQT_SLOT(activeWindowChanged(WId))); - artsBellTimer = new QTimer( this ); - connect( artsBellTimer, SIGNAL( timeout() ), SLOT( slotArtsBellTimeout() )); + artsBellTimer = new TQTimer( this ); + connect( artsBellTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotArtsBellTimeout() )); features = 0; requestedFeatures = 0; @@ -132,7 +132,7 @@ void KAccessApp::readSettings() _artsBellFile = config->readPathEntry("ArtsBellFile"); _visibleBell = config->readBoolEntry("VisibleBell", false); _visibleBellInvert = config->readBoolEntry("VisibleBellInvert", false); - QColor def(Qt::red); + TQColor def(Qt::red); _visibleBellColor = config->readColorEntry("VisibleBellColor", &def); _visibleBellPause = config->readNumEntry("VisibleBellPause", 500); @@ -361,10 +361,10 @@ bool KAccessApp::x11EventFilter(XEvent *event) } -void VisualBell::paintEvent(QPaintEvent *event) +void VisualBell::paintEvent(TQPaintEvent *event) { - QWidget::paintEvent(event); - QTimer::singleShot(_pause, this, SLOT(hide())); + TQWidget::paintEvent(event); + TQTimer::singleShot(_pause, this, TQT_SLOT(hide())); } @@ -438,10 +438,10 @@ void KAccessApp::xkbBellNotify(XkbBellNotifyEvent *event) if (_visibleBellInvert) { - QPixmap screen = QPixmap::grabWindow(id, 0, 0, window.size.width, window.size.height); - QPixmap invert(window.size.width, window.size.height); - QPainter p(&invert); - p.setRasterOp(QPainter::NotCopyROP); + TQPixmap screen = TQPixmap::grabWindow(id, 0, 0, window.size.width, window.size.height); + TQPixmap invert(window.size.width, window.size.height); + TQPainter p(&invert); + p.setRasterOp(TQPainter::NotCopyROP); p.drawPixmap(0, 0, screen); overlay->setBackgroundPixmap(invert); } @@ -462,7 +462,7 @@ void KAccessApp::xkbBellNotify(XkbBellNotifyEvent *event) } } -QString mouseKeysShortcut (Display *display) { +TQString mouseKeysShortcut (Display *display) { // Calculate the keycode KeySym sym = XK_MouseKeys_Enable; KeyCode code = XKeysymToKeycode(display, sym); @@ -513,7 +513,7 @@ QString mouseKeysShortcut (Display *display) { ev.xkey.keycode = code; ev.xkey.state = 0; KKey key = KKey(KKeyNative(&ev)); - QString keyname = key.toString(); + TQString keyname = key.toString(); unsigned int AltMask = KKeyNative::modX(KKey::ALT); unsigned int WinMask = KKeyNative::modX(KKey::WIN); @@ -565,33 +565,33 @@ void KAccessApp::createDialogContents() { 0, "AccessXWarning", true, true, KStdGuiItem::cont(), KStdGuiItem::cancel()); - QVBox *topcontents = new QVBox (dialog); + TQVBox *topcontents = new TQVBox (dialog); topcontents->setSpacing(KDialog::spacingHint()*2); topcontents->setMargin(KDialog::marginHint()); - QWidget *contents = new QWidget(topcontents); - QHBoxLayout * lay = new QHBoxLayout(contents); + TQWidget *contents = new TQWidget(topcontents); + TQHBoxLayout * lay = new TQHBoxLayout(contents); lay->setSpacing(KDialog::spacingHint()); - QLabel *label1 = new QLabel( contents); - QPixmap pixmap = KApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); + TQLabel *label1 = new TQLabel( contents); + TQPixmap pixmap = KApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); if (pixmap.isNull()) - pixmap = QMessageBox::standardIcon(QMessageBox::Warning); + pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning); label1->setPixmap(pixmap); lay->addWidget( label1, 0, Qt::AlignCenter ); lay->addSpacing(KDialog::spacingHint()); - QVBoxLayout * vlay = new QVBoxLayout(lay); + TQVBoxLayout * vlay = new TQVBoxLayout(lay); - featuresLabel = new QLabel( "", contents ); + featuresLabel = new TQLabel( "", contents ); featuresLabel->setAlignment( WordBreak|AlignVCenter ); vlay->addWidget( featuresLabel ); vlay->addStretch(); - QHBoxLayout * hlay = new QHBoxLayout(vlay); + TQHBoxLayout * hlay = new TQHBoxLayout(vlay); - QLabel *showModeLabel = new QLabel( i18n("&When a gesture was used:"), contents ); + TQLabel *showModeLabel = new TQLabel( i18n("&When a gesture was used:"), contents ); hlay->addWidget( showModeLabel ); showModeCombobox = new KComboBox (contents); @@ -605,9 +605,9 @@ void KAccessApp::createDialogContents() { dialog->setMainWidget(topcontents); dialog->enableButtonSeparator(false); - connect (dialog, SIGNAL(yesClicked()), this, SLOT(yesClicked())); - connect (dialog, SIGNAL(noClicked()), this, SLOT(noClicked())); - connect (dialog, SIGNAL(closeClicked()), this, SLOT(dialogClosed())); + connect (dialog, TQT_SIGNAL(yesClicked()), this, TQT_SLOT(yesClicked())); + connect (dialog, TQT_SIGNAL(noClicked()), this, TQT_SLOT(noClicked())); + connect (dialog, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(dialogClosed())); } } @@ -634,8 +634,8 @@ void KAccessApp::xkbControlsNotify(XkbControlsNotifyEvent *event) enabled = requestedFeatures & ~features; disabled = features & ~requestedFeatures; - QStringList enabledFeatures; - QStringList disabledFeatures; + TQStringList enabledFeatures; + TQStringList disabledFeatures; if (enabled & XkbStickyKeysMask) enabledFeatures << i18n("Sticky keys"); @@ -657,7 +657,7 @@ void KAccessApp::xkbControlsNotify(XkbControlsNotifyEvent *event) else if (disabled & XkbMouseKeysMask) disabledFeatures << i18n("Mouse keys"); - QString question; + TQString question; switch (enabledFeatures.count()) { case 0: switch (disabledFeatures.count()) { case 1: question = i18n("Do you really want to deactivate \"%1\"?") @@ -723,7 +723,7 @@ void KAccessApp::xkbControlsNotify(XkbControlsNotifyEvent *event) .arg(enabledFeatures[2]).arg(enabledFeatures[3]); break; } - QString explanation; + TQString explanation; if (enabledFeatures.count()+disabledFeatures.count() == 1) { explanation = i18n("An application has requested to change this setting."); @@ -733,7 +733,7 @@ void KAccessApp::xkbControlsNotify(XkbControlsNotifyEvent *event) else if ((enabled | disabled) == XkbStickyKeysMask) explanation = i18n("You pressed the Shift key 5 consecutive times or an application has requested to change this setting."); else if ((enabled | disabled) == XkbMouseKeysMask) { - QString shortcut = mouseKeysShortcut(qt_xdisplay()); + TQString shortcut = mouseKeysShortcut(qt_xdisplay()); if (!shortcut.isEmpty() && !shortcut.isNull()) explanation = i18n("You pressed %1 or an application has requested to change this setting.").arg(shortcut); } diff --git a/kcontrol/access/kaccess.h b/kcontrol/access/kaccess.h index d75d0bdb6..daecba440 100644 --- a/kcontrol/access/kaccess.h +++ b/kcontrol/access/kaccess.h @@ -2,8 +2,8 @@ #define __K_ACCESS_H__ -#include -#include +#include +#include #include @@ -62,23 +62,23 @@ private: bool _systemBell, _artsBell, _visibleBell, _visibleBellInvert; bool _artsBellBlocked; - QString _artsBellFile; - QColor _visibleBellColor; + TQString _artsBellFile; + TQColor _visibleBellColor; int _visibleBellPause; bool _gestures, _gestureConfirmation; bool _kNotifyModifiers, _kNotifyAccessX; - QWidget *overlay; + TQWidget *overlay; - QTimer *artsBellTimer; + TQTimer *artsBellTimer; KWinModule wm; WId _activeWindow; KDialogBase *dialog; - QLabel *featuresLabel; + TQLabel *featuresLabel; KComboBox *showModeCombobox; int keys[8]; @@ -93,13 +93,13 @@ class VisualBell : public QWidget public: VisualBell(int pause) - : QWidget(0, 0, WX11BypassWM), _pause(pause) + : TQWidget(0, 0, WX11BypassWM), _pause(pause) {}; protected: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); private: diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index 661748e1d..d7e114c55 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -11,16 +11,16 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -43,7 +43,7 @@ ExtendedIntNumInput::ExtendedIntNumInput - (QWidget* parent, const char* name) + (TQWidget* parent, const char* name) : KIntNumInput(parent, name) { } @@ -55,10 +55,10 @@ void ExtendedIntNumInput::setRange(int min, int max, int step, bool slider) { KIntNumInput::setRange (min,max,step, slider); if (slider) { - disconnect(m_slider, SIGNAL(valueChanged(int)), - m_spin, SLOT(setValue(int))); - disconnect(m_spin, SIGNAL(valueChanged(int)), - this, SLOT(spinValueChanged(int))); + disconnect(m_slider, TQT_SIGNAL(valueChanged(int)), + m_spin, TQT_SLOT(setValue(int))); + disconnect(m_spin, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(spinValueChanged(int))); this->min = min; this->max = max; @@ -72,10 +72,10 @@ void ExtendedIntNumInput::setRange(int min, int max, int step, bool slider) { double logVal = alpha * (log(value())-log(min)); m_slider->setValue ((int)floor (0.5 + logVal)); - connect(m_slider, SIGNAL(valueChanged(int)), - this, SLOT(slotSliderValueChanged(int))); - connect(m_spin, SIGNAL(valueChanged(int)), - this, SLOT(slotSpinValueChanged(int))); + connect(m_slider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotSliderValueChanged(int))); + connect(m_spin, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotSpinValueChanged(int))); } } @@ -109,7 +109,7 @@ static bool needToRunKAccessDaemon( KConfig *config ) return true; } -QString mouseKeysShortcut (Display *display) { +TQString mouseKeysShortcut (Display *display) { // Calculate the keycode KeySym sym = XK_MouseKeys_Enable; KeyCode code = XKeysymToKeycode(display, sym); @@ -159,7 +159,7 @@ QString mouseKeysShortcut (Display *display) { ev.xkey.keycode = code; ev.xkey.state = 0; KKey key = KKey(KKeyNative(&ev)); - QString keyname = key.toString(); + TQString keyname = key.toString(); unsigned int AltMask = KKeyNative::modX(KKey::ALT); unsigned int WinMask = KKeyNative::modX(KKey::WIN); @@ -197,7 +197,7 @@ QString mouseKeysShortcut (Display *display) { if ((modifiers & ShiftMask) != 0) keyname = KKey::modFlagLabel(KKey::SHIFT) + "+" + keyname; - QString result; + TQString result; if ((modifiers & ScrollMask) != 0) if ((modifiers & LockMask) != 0) if ((modifiers & NumMask) != 0) @@ -221,7 +221,7 @@ QString mouseKeysShortcut (Display *display) { return result.arg(keyname); } -KAccessConfig::KAccessConfig(QWidget *parent, const char *) +KAccessConfig::KAccessConfig(TQWidget *parent, const char *) : KCModule(parent, "kcmaccess") { @@ -234,89 +234,89 @@ KAccessConfig::KAccessConfig(QWidget *parent, const char *) setAboutData( about ); - QVBoxLayout *main = new QVBoxLayout(this, 0, KDialogBase::spacingHint()); - QTabWidget *tab = new QTabWidget(this); + TQVBoxLayout *main = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); + TQTabWidget *tab = new TQTabWidget(this); main->addWidget(tab); // bell settings --------------------------------------- - QWidget *bell = new QWidget(this); + TQWidget *bell = new TQWidget(this); - QVBoxLayout *vbox = new QVBoxLayout(bell, KDialogBase::marginHint(), + TQVBoxLayout *vbox = new TQVBoxLayout(bell, KDialogBase::marginHint(), KDialogBase::spacingHint()); - QGroupBox *grp = new QGroupBox(i18n("Audible Bell"), bell); + TQGroupBox *grp = new TQGroupBox(i18n("Audible Bell"), bell); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - QVBoxLayout *vvbox = new QVBoxLayout(grp->layout(), + TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(), KDialogBase::spacingHint()); - systemBell = new QCheckBox(i18n("Use &system bell"), grp); + systemBell = new TQCheckBox(i18n("Use &system bell"), grp); vvbox->addWidget(systemBell); - customBell = new QCheckBox(i18n("Us&e customized bell"), grp); + customBell = new TQCheckBox(i18n("Us&e customized bell"), grp); vvbox->addWidget(customBell); - QWhatsThis::add( systemBell, i18n("If this option is checked, the default system bell will be used. See the" + TQWhatsThis::add( systemBell, i18n("If this option is checked, the default system bell will be used. See the" " \"System Bell\" control module for how to customize the system bell." " Normally, this is just a \"beep\".") ); - QWhatsThis::add( customBell, i18n("Check this option if you want to use a customized bell, playing" + TQWhatsThis::add( customBell, i18n("Check this option if you want to use a customized bell, playing" " a sound file. If you do this, you will probably want to turn off the system bell.

    Please note" " that on slow machines this may cause a \"lag\" between the event causing the bell and the sound being played.") ); - QHBoxLayout *hbox = new QHBoxLayout(vvbox, KDialogBase::spacingHint()); + TQHBoxLayout *hbox = new TQHBoxLayout(vvbox, KDialogBase::spacingHint()); hbox->addSpacing(24); - soundEdit = new QLineEdit(grp); - soundLabel = new QLabel(soundEdit, i18n("Sound &to play:"), grp); + soundEdit = new TQLineEdit(grp); + soundLabel = new TQLabel(soundEdit, i18n("Sound &to play:"), grp); hbox->addWidget(soundLabel); hbox->addWidget(soundEdit); - soundButton = new QPushButton(i18n("Browse..."), grp); + soundButton = new TQPushButton(i18n("Browse..."), grp); hbox->addWidget(soundButton); - QString wtstr = i18n("If the option \"Use customized bell\" is enabled, you can choose a sound file here." + TQString wtstr = i18n("If the option \"Use customized bell\" is enabled, you can choose a sound file here." " Click \"Browse...\" to choose a sound file using the file dialog."); - QWhatsThis::add( soundEdit, wtstr ); - QWhatsThis::add( soundLabel, wtstr ); - QWhatsThis::add( soundButton, wtstr ); + TQWhatsThis::add( soundEdit, wtstr ); + TQWhatsThis::add( soundLabel, wtstr ); + TQWhatsThis::add( soundButton, wtstr ); - connect(soundButton, SIGNAL(clicked()), this, SLOT(selectSound())); + connect(soundButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectSound())); - connect(customBell, SIGNAL(clicked()), this, SLOT(checkAccess())); + connect(customBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(systemBell, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(customBell, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(soundEdit, SIGNAL(textChanged(const QString&)), this, SLOT(configChanged())); + connect(systemBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(customBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(soundEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged())); // ----------------------------------------------------- // visible bell ---------------------------------------- - grp = new QGroupBox(i18n("Visible Bell"), bell); + grp = new TQGroupBox(i18n("Visible Bell"), bell); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new QVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); - visibleBell = new QCheckBox(i18n("&Use visible bell"), grp); + visibleBell = new TQCheckBox(i18n("&Use visible bell"), grp); vvbox->addWidget(visibleBell); - QWhatsThis::add( visibleBell, i18n("This option will turn on the \"visible bell\", i.e. a visible" + TQWhatsThis::add( visibleBell, i18n("This option will turn on the \"visible bell\", i.e. a visible" " notification shown every time that normally just a bell would occur. This is especially useful" " for deaf people.") ); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - invertScreen = new QRadioButton(i18n("I&nvert screen"), grp); + invertScreen = new TQRadioButton(i18n("I&nvert screen"), grp); hbox->addWidget(invertScreen); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); - QWhatsThis::add( invertScreen, i18n("All screen colors will be inverted for the amount of time specified below.") ); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); + TQWhatsThis::add( invertScreen, i18n("All screen colors will be inverted for the amount of time specified below.") ); hbox->addSpacing(24); - flashScreen = new QRadioButton(i18n("F&lash screen"), grp); + flashScreen = new TQRadioButton(i18n("F&lash screen"), grp); hbox->addWidget(flashScreen); - QWhatsThis::add( flashScreen, i18n("The screen will turn to a custom color for the amount of time specified below.") ); + 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); hbox->addWidget(colorButton); hbox->addStretch(); - QWhatsThis::add( colorButton, i18n("Click here to choose the color used for the \"flash screen\" visible bell.") ); + TQWhatsThis::add( colorButton, i18n("Click here to choose the color used for the \"flash screen\" visible bell.") ); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); durationSlider = new ExtendedIntNumInput(grp); @@ -324,18 +324,18 @@ KAccessConfig::KAccessConfig(QWidget *parent, const char *) durationSlider->setLabel(i18n("Duration:")); durationSlider->setSuffix(i18n(" msec")); hbox->addWidget(durationSlider); - QWhatsThis::add( durationSlider, i18n("Here you can customize the duration of the \"visible bell\" effect being shown.") ); + TQWhatsThis::add( durationSlider, i18n("Here you can customize the duration of the \"visible bell\" effect being shown.") ); - connect(invertScreen, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(flashScreen, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(visibleBell, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(visibleBell, SIGNAL(clicked()), this, SLOT(checkAccess())); - connect(colorButton, SIGNAL(clicked()), this, SLOT(changeFlashScreenColor())); + connect(invertScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(flashScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(visibleBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(visibleBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(colorButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeFlashScreenColor())); - connect(invertScreen, SIGNAL(clicked()), this, SLOT(invertClicked())); - connect(flashScreen, SIGNAL(clicked()), this, SLOT(flashClicked())); + connect(invertScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(invertClicked())); + connect(flashScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(flashClicked())); - connect(durationSlider, SIGNAL(valueChanged(int)), this, SLOT(configChanged())); + connect(durationSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); vbox->addStretch(); @@ -345,82 +345,82 @@ KAccessConfig::KAccessConfig(QWidget *parent, const char *) // modifier key settings ------------------------------- - QWidget *modifiers = new QWidget(this); + TQWidget *modifiers = new TQWidget(this); - vbox = new QVBoxLayout(modifiers, KDialog::marginHint(), KDialog::spacingHint()); + vbox = new TQVBoxLayout(modifiers, KDialog::marginHint(), KDialog::spacingHint()); - grp = new QGroupBox(i18n("S&ticky Keys"), modifiers); + grp = new TQGroupBox(i18n("S&ticky Keys"), modifiers); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new QVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); - stickyKeys = new QCheckBox(i18n("Use &sticky keys"), grp); + stickyKeys = new TQCheckBox(i18n("Use &sticky keys"), grp); vvbox->addWidget(stickyKeys); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - stickyKeysLock = new QCheckBox(i18n("&Lock sticky keys"), grp); + stickyKeysLock = new TQCheckBox(i18n("&Lock sticky keys"), grp); hbox->addWidget(stickyKeysLock); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - stickyKeysAutoOff = new QCheckBox(i18n("Turn sticky keys off when two keys are pressed simultaneously"), grp); + stickyKeysAutoOff = new TQCheckBox(i18n("Turn sticky keys off when two keys are pressed simultaneously"), grp); hbox->addWidget(stickyKeysAutoOff); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - stickyKeysBeep = new QCheckBox(i18n("Use system bell whenever a modifier gets latched, locked or unlocked"), grp); + stickyKeysBeep = new TQCheckBox(i18n("Use system bell whenever a modifier gets latched, locked or unlocked"), grp); hbox->addWidget(stickyKeysBeep); - grp = new QGroupBox(i18n("Locking Keys"), modifiers); + grp = new TQGroupBox(i18n("Locking Keys"), modifiers); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new QVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); - toggleKeysBeep = new QCheckBox(i18n("Use system bell whenever a locking key gets activated or deactivated"), grp); + toggleKeysBeep = new TQCheckBox(i18n("Use system bell whenever a locking key gets activated or deactivated"), grp); vvbox->addWidget(toggleKeysBeep); - kNotifyModifiers = new QCheckBox(i18n("Use KDE's system notification mechanism whenever a modifier or locking key changes its state"), grp); + kNotifyModifiers = new TQCheckBox(i18n("Use KDE's system notification mechanism whenever a modifier or locking key changes its state"), grp); vvbox->addWidget(kNotifyModifiers); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addStretch(1); - kNotifyModifiersButton = new QPushButton(i18n("Configure System Notification..."), grp); - kNotifyModifiersButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + kNotifyModifiersButton = new TQPushButton(i18n("Configure System Notification..."), grp); + kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); hbox->addWidget(kNotifyModifiersButton); - connect(stickyKeys, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(stickyKeysLock, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(stickyKeysAutoOff, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(stickyKeys, SIGNAL(clicked()), this, SLOT(checkAccess())); + connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(stickyKeysLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(stickyKeysAutoOff, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(stickyKeysBeep, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(toggleKeysBeep, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(kNotifyModifiers, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(kNotifyModifiers, SIGNAL(clicked()), this, SLOT(checkAccess())); - connect(kNotifyModifiersButton, SIGNAL(clicked()), this, SLOT(configureKNotify())); + connect(stickyKeysBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(toggleKeysBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(kNotifyModifiers, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(kNotifyModifiers, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(kNotifyModifiersButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureKNotify())); vbox->addStretch(); tab->addTab(modifiers, i18n("&Modifier Keys")); // key filter settings --------------------------------- - QWidget *filters = new QWidget(this); + TQWidget *filters = new TQWidget(this); - vbox = new QVBoxLayout(filters, KDialog::marginHint(), KDialog::spacingHint()); + vbox = new TQVBoxLayout(filters, KDialog::marginHint(), KDialog::spacingHint()); - grp = new QGroupBox(i18n("Slo&w Keys"), filters); + grp = new TQGroupBox(i18n("Slo&w Keys"), filters); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new QVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); - slowKeys = new QCheckBox(i18n("&Use slow keys"), grp); + slowKeys = new TQCheckBox(i18n("&Use slow keys"), grp); vvbox->addWidget(slowKeys); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); slowKeysDelay = new ExtendedIntNumInput(grp); slowKeysDelay->setSuffix(i18n(" msec")); @@ -428,31 +428,31 @@ KAccessConfig::KAccessConfig(QWidget *parent, const char *) slowKeysDelay->setLabel(i18n("Acceptance dela&y:")); hbox->addWidget(slowKeysDelay); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - slowKeysPressBeep = new QCheckBox(i18n("&Use system bell whenever a key is pressed"), grp); + slowKeysPressBeep = new TQCheckBox(i18n("&Use system bell whenever a key is pressed"), grp); hbox->addWidget(slowKeysPressBeep); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - slowKeysAcceptBeep = new QCheckBox(i18n("&Use system bell whenever a key is accepted"), grp); + slowKeysAcceptBeep = new TQCheckBox(i18n("&Use system bell whenever a key is accepted"), grp); hbox->addWidget(slowKeysAcceptBeep); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - slowKeysRejectBeep = new QCheckBox(i18n("&Use system bell whenever a key is rejected"), grp); + slowKeysRejectBeep = new TQCheckBox(i18n("&Use system bell whenever a key is rejected"), grp); hbox->addWidget(slowKeysRejectBeep); - grp = new QGroupBox(i18n("Bounce Keys"), filters); + grp = new TQGroupBox(i18n("Bounce Keys"), filters); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new QVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); - bounceKeys = new QCheckBox(i18n("Use bou&nce keys"), grp); + bounceKeys = new TQCheckBox(i18n("Use bou&nce keys"), grp); vvbox->addWidget(bounceKeys); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); bounceKeysDelay = new ExtendedIntNumInput(grp); bounceKeysDelay->setSuffix(i18n(" msec")); @@ -460,56 +460,56 @@ KAccessConfig::KAccessConfig(QWidget *parent, const char *) bounceKeysDelay->setLabel(i18n("D&ebounce time:")); hbox->addWidget(bounceKeysDelay); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - bounceKeysRejectBeep = new QCheckBox(i18n("Use the system bell whenever a key is rejected"), grp); + bounceKeysRejectBeep = new TQCheckBox(i18n("Use the system bell whenever a key is rejected"), grp); hbox->addWidget(bounceKeysRejectBeep); - connect(slowKeysDelay, SIGNAL(valueChanged(int)), this, SLOT(configChanged())); - connect(slowKeys, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(slowKeys, SIGNAL(clicked()), this, SLOT(checkAccess())); + connect(slowKeysDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect(slowKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(slowKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(slowKeysPressBeep, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(slowKeysAcceptBeep, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(slowKeysRejectBeep, SIGNAL(clicked()), this, SLOT(configChanged())); + connect(slowKeysPressBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(slowKeysAcceptBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(slowKeysRejectBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(bounceKeysDelay, SIGNAL(valueChanged(int)), this, SLOT(configChanged())); - connect(bounceKeys, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(bounceKeysRejectBeep, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(bounceKeys, SIGNAL(clicked()), this, SLOT(checkAccess())); + connect(bounceKeysDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect(bounceKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(bounceKeysRejectBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(bounceKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); vbox->addStretch(); tab->addTab(filters, i18n("&Keyboard Filters")); // gestures -------------------------------------------- - QWidget *features = new QWidget(this); + TQWidget *features = new TQWidget(this); - vbox = new QVBoxLayout(features, KDialog::marginHint(), KDialog::spacingHint()); + vbox = new TQVBoxLayout(features, KDialog::marginHint(), KDialog::spacingHint()); - grp = new QGroupBox(i18n("Activation Gestures"), features); + grp = new TQGroupBox(i18n("Activation Gestures"), features); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new QVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); - gestures = new QCheckBox(i18n("Use gestures for activating sticky keys and slow keys"), grp); + gestures = new TQCheckBox(i18n("Use gestures for activating sticky keys and slow keys"), grp); vvbox->addWidget(gestures); - QString shortcut = mouseKeysShortcut(this->x11Display()); + TQString shortcut = mouseKeysShortcut(this->x11Display()); if (shortcut.isEmpty()) - QWhatsThis::add (gestures, i18n("Here you can activate keyboard gestures that turn on the following features: \n" + TQWhatsThis::add (gestures, i18n("Here you can activate keyboard gestures that turn on the following features: \n" "Sticky keys: Press Shift key 5 consecutive times\n" "Slow keys: Hold down Shift for 8 seconds")); else - QWhatsThis::add (gestures, i18n("Here you can activate keyboard gestures that turn on the following features: \n" + TQWhatsThis::add (gestures, i18n("Here you can activate keyboard gestures that turn on the following features: \n" "Mouse Keys: %1\n" "Sticky keys: Press Shift key 5 consecutive times\n" "Slow keys: Hold down Shift for 8 seconds").arg(shortcut)); - timeout = new QCheckBox(i18n("Turn sticky keys and slow keys off after a certain period of inactivity"), grp); + timeout = new TQCheckBox(i18n("Turn sticky keys and slow keys off after a certain period of inactivity"), grp); vvbox->addWidget(timeout); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); timeoutDelay = new KIntNumInput(grp); timeoutDelay->setSuffix(i18n(" min")); @@ -517,37 +517,37 @@ KAccessConfig::KAccessConfig(QWidget *parent, const char *) timeoutDelay->setLabel(i18n("Timeout:")); hbox->addWidget(timeoutDelay); - grp = new QGroupBox(i18n("Notification"), features); + grp = new TQGroupBox(i18n("Notification"), features); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new QVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); - accessxBeep = new QCheckBox(i18n("Use the system bell whenever a gesture is used to turn an accessibility feature on or off"), grp); + 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); - gestureConfirmation = new QCheckBox(i18n("Show a confirmation dialog whenever a keyboard accessibility feature is turned on or off"), grp); + gestureConfirmation = new TQCheckBox(i18n("Show a confirmation dialog whenever a keyboard accessibility feature is turned on or off"), grp); vvbox->addWidget(gestureConfirmation); - QWhatsThis::add (gestureConfirmation, i18n("If this option is checked, KDE will show a confirmation dialog whenever a keyboard accessibility feature is turned on or off.\nBe sure you know what you are doing if you uncheck it, as the keyboard accessibility settings will then always be applied without confirmation.") ); + TQWhatsThis::add (gestureConfirmation, i18n("If this option is checked, KDE will show a confirmation dialog whenever a keyboard accessibility feature is turned on or off.\nBe sure you know what you are doing if you uncheck it, as the keyboard accessibility settings will then always be applied without confirmation.") ); - kNotifyAccessX = new QCheckBox(i18n("Use KDE's system notification mechanism whenever a keyboard accessibility feature is turned on or off"), grp); + kNotifyAccessX = new TQCheckBox(i18n("Use KDE's system notification mechanism whenever a keyboard accessibility feature is turned on or off"), grp); vvbox->addWidget(kNotifyAccessX); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addStretch(1); - kNotifyAccessXButton = new QPushButton(i18n("Configure System Notification..."), grp); - kNotifyAccessXButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + kNotifyAccessXButton = new TQPushButton(i18n("Configure System Notification..."), grp); + kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); hbox->addWidget(kNotifyAccessXButton); - connect(gestures, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(timeout, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(timeout, SIGNAL(clicked()), this, SLOT(checkAccess())); - connect(timeoutDelay, SIGNAL(valueChanged(int)), this, SLOT(configChanged())); - connect(accessxBeep, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(gestureConfirmation, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(kNotifyAccessX, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(kNotifyAccessX, SIGNAL(clicked()), this, SLOT(checkAccess())); - connect(kNotifyAccessXButton, SIGNAL(clicked()), this, SLOT(configureKNotify())); + connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(timeout, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(timeout, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(timeoutDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect(accessxBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(gestureConfirmation, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(kNotifyAccessX, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(kNotifyAccessX, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(kNotifyAccessXButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureKNotify())); vbox->addStretch(); @@ -578,12 +578,12 @@ void KAccessConfig::changeFlashScreenColor() void KAccessConfig::selectSound() { - QStringList list = KGlobal::dirs()->findDirs("sound", ""); - QString start; + TQStringList list = KGlobal::dirs()->findDirs("sound", ""); + TQString start; if (list.count()>0) start = list[0]; // TODO: Why only wav's? How can I find out what artsd supports? - QString fname = KFileDialog::getOpenFileName(start, i18n("*.wav|WAV Files")); + TQString fname = KFileDialog::getOpenFileName(start, i18n("*.wav|WAV Files")); if (!fname.isEmpty()) soundEdit->setText(fname); } @@ -614,7 +614,7 @@ void KAccessConfig::load( bool useDefaults ) visibleBell->setChecked(config->readBoolEntry("VisibleBell", false)); invertScreen->setChecked(config->readBoolEntry("VisibleBellInvert", true)); flashScreen->setChecked(!invertScreen->isChecked()); - QColor def(Qt::red); + TQColor def(Qt::red); colorButton->setColor(config->readColorEntry("VisibleBellColor", &def)); durationSlider->setValue(config->readNumEntry("VisibleBellPause", 500)); @@ -783,7 +783,7 @@ void KAccessConfig::checkAccess() extern "C" { - KDE_EXPORT KCModule *create_access(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_access(TQWidget *parent, const char *name) { return new KAccessConfig(parent, name); } diff --git a/kcontrol/access/kcmaccess.h b/kcontrol/access/kcmaccess.h index c40152324..058b1c491 100644 --- a/kcontrol/access/kcmaccess.h +++ b/kcontrol/access/kcmaccess.h @@ -33,7 +33,7 @@ class ExtendedIntNumInput : public KIntNumInput * Constructs an input control for integer values * with base 10 and initial value 0. */ - ExtendedIntNumInput(QWidget *parent=0, const char *name=0); + ExtendedIntNumInput(TQWidget *parent=0, const char *name=0); /** * Destructor @@ -63,7 +63,7 @@ class KAccessConfig : public KCModule public: - KAccessConfig(QWidget *parent = 0L, const char *name = 0L); + KAccessConfig(TQWidget *parent = 0L, const char *name = 0L); virtual ~KAccessConfig(); void load(); @@ -83,28 +83,28 @@ protected slots: private: - QCheckBox *systemBell, *customBell, *visibleBell; - QRadioButton *invertScreen, *flashScreen; - QLabel *soundLabel, *colorLabel; - QLineEdit *soundEdit; - QPushButton *soundButton; + TQCheckBox *systemBell, *customBell, *visibleBell; + TQRadioButton *invertScreen, *flashScreen; + TQLabel *soundLabel, *colorLabel; + TQLineEdit *soundEdit; + TQPushButton *soundButton; KColorButton *colorButton; ExtendedIntNumInput *durationSlider; - QCheckBox *stickyKeys, *stickyKeysLock, *stickyKeysAutoOff; - QCheckBox *stickyKeysBeep, *toggleKeysBeep, *kNotifyModifiers; - QPushButton *kNotifyModifiersButton; + TQCheckBox *stickyKeys, *stickyKeysLock, *stickyKeysAutoOff; + TQCheckBox *stickyKeysBeep, *toggleKeysBeep, *kNotifyModifiers; + TQPushButton *kNotifyModifiersButton; - QCheckBox *slowKeys, *bounceKeys; + TQCheckBox *slowKeys, *bounceKeys; ExtendedIntNumInput *slowKeysDelay, *bounceKeysDelay; - QCheckBox *slowKeysPressBeep, *slowKeysAcceptBeep; - QCheckBox *slowKeysRejectBeep, *bounceKeysRejectBeep; + TQCheckBox *slowKeysPressBeep, *slowKeysAcceptBeep; + TQCheckBox *slowKeysRejectBeep, *bounceKeysRejectBeep; - QCheckBox *gestures, *gestureConfirmation; - QCheckBox *timeout; + TQCheckBox *gestures, *gestureConfirmation; + TQCheckBox *timeout; KIntNumInput *timeoutDelay; - QCheckBox *accessxBeep, *kNotifyAccessX; - QPushButton *kNotifyAccessXButton; + TQCheckBox *accessxBeep, *kNotifyAccessX; + TQPushButton *kNotifyAccessXButton; }; diff --git a/kcontrol/accessibility/accessibility.cpp b/kcontrol/accessibility/accessibility.cpp index de7b9953b..7cd8fa29b 100644 --- a/kcontrol/accessibility/accessibility.cpp +++ b/kcontrol/accessibility/accessibility.cpp @@ -18,9 +18,9 @@ * * ****************************************************************************/ -#include -#include -#include +#include +#include +#include #include #include @@ -31,7 +31,7 @@ #include "accessibility.moc" -typedef KGenericFactory AccessibilityFactory; +typedef KGenericFactory AccessibilityFactory; K_EXPORT_COMPONENT_FACTORY( kcm_accessibility, AccessibilityFactory("kcmaccessibility") ) /** @@ -53,7 +53,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_accessibility, AccessibilityFactory("kcmaccessib // return false; // don't need it // } -AccessibilityConfig::AccessibilityConfig(QWidget *parent, const char *name, const QStringList &) +AccessibilityConfig::AccessibilityConfig(TQWidget *parent, const char *name, const TQStringList &) : AccessibilityConfigWidget( parent, name){ KAboutData *about = @@ -65,9 +65,9 @@ AccessibilityConfig::AccessibilityConfig(QWidget *parent, const char *name, cons about->addAuthor("José Pablo Ezequiel Fernández", I18N_NOOP("Author") , "pupeno@kde.org"); setAboutData( about ); - kdDebug() << "Running: AccessibilityConfig::AccessibilityConfig(QWidget *parent, const char *name, const QStringList &)" << endl; + kdDebug() << "Running: AccessibilityConfig::AccessibilityConfig(TQWidget *parent, const char *name, const TQStringList &)" << endl; // TODO: set the KURL Dialog to open just audio files - connect( mainTab, SIGNAL(currentChanged(QWidget*)), this, SIGNAL(quickHelpChanged()) ); + connect( mainTab, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SIGNAL(quickHelpChanged()) ); load(); } @@ -101,7 +101,7 @@ void AccessibilityConfig::load( bool useDefaults ) invertScreen->setChecked(bell->readBoolEntry("Invert", true)); flashScreen->setChecked(bell->readBoolEntry("Flash", false)); // TODO: There has to be a cleaner way. - QColor *redColor = new QColor(Qt::red); + TQColor *redColor = new TQColor(Qt::red); flashScreenColor->setColor(bell->readColorEntry("FlashColor", redColor)); delete redColor; visibleBellDuration->setValue(bell->readNumEntry("Duration", 500)); diff --git a/kcontrol/accessibility/accessibility.h b/kcontrol/accessibility/accessibility.h index ad94dcdcc..9b4c833c3 100644 --- a/kcontrol/accessibility/accessibility.h +++ b/kcontrol/accessibility/accessibility.h @@ -32,7 +32,7 @@ class AccessibilityConfig : public AccessibilityConfigWidget { /** * Constructor */ - AccessibilityConfig(QWidget *parent = 0L, const char *name = 0L, const QStringList &foo = QStringList()); + AccessibilityConfig(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &foo = TQStringList()); /** * Destructor diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index a8edb30a2..792951aec 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -25,14 +25,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -55,7 +55,7 @@ extern "C" { KDE_EXPORT void init_arts(); - KDE_EXPORT KCModule *create_arts(QWidget *parent, const char* /*name*/) + KDE_EXPORT KCModule *create_arts(TQWidget *parent, const char* /*name*/) { KGlobal::locale()->insertCatalogue("kcmarts"); return new KArtsModule(parent, "kcmarts" ); @@ -69,13 +69,13 @@ static bool startArts() config->setGroup("Arts"); bool startServer = config->readBoolEntry("StartServer",true); bool startRealtime = config->readBoolEntry("StartRealtime",true); - QString args = config->readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -c drkonqi -l 3 -f"); + TQString args = config->readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -c drkonqi -l 3 -f"); delete config; if (startServer) kapp->kdeinitExec(startRealtime?"artswrapper":"artsd", - QStringList::split(" ",args)); + TQStringList::split(" ",args)); return startServer; } @@ -100,10 +100,10 @@ void KArtsModule::initAudioIOList() *artsd << "artsd"; *artsd << "-A"; - connect(artsd, SIGNAL(processExited(KProcess*)), - this, SLOT(slotArtsdExited(KProcess*))); - connect(artsd, SIGNAL(receivedStderr(KProcess*, char*, int)), - this, SLOT(slotProcessArtsdOutput(KProcess*, char*, int))); + connect(artsd, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotArtsdExited(KProcess*))); + connect(artsd, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), + this, TQT_SLOT(slotProcessArtsdOutput(KProcess*, char*, int))); if (!artsd->start(KProcess::Block, KProcess::Stderr)) { KMessageBox::error(0, i18n("Unable to start the sound server to " @@ -124,13 +124,13 @@ void KArtsModule::slotProcessArtsdOutput(KProcess*, char* buf, int len) { // XXX(gioele): I suppose this will be called with full lines, am I wrong? - QStringList availableIOs = QStringList::split("\n", QCString(buf, len)); + TQStringList availableIOs = TQStringList::split("\n", TQCString(buf, len)); // valid entries have two leading spaces - availableIOs = availableIOs.grep(QRegExp("^ {2}")); + availableIOs = availableIOs.grep(TQRegExp("^ {2}")); availableIOs.sort(); - QString name, fullName; - QStringList::Iterator it; + TQString name, fullName; + TQStringList::Iterator it; for (it = availableIOs.begin(); it != availableIOs.end(); ++it) { name = (*it).left(12).stripWhiteSpace(); fullName = (*it).mid(12).stripWhiteSpace(); @@ -138,7 +138,7 @@ void KArtsModule::slotProcessArtsdOutput(KProcess*, char* buf, int len) } } -KArtsModule::KArtsModule(QWidget *parent, const char *name) +KArtsModule::KArtsModule(TQWidget *parent, const char *name) : KCModule(parent, name), configChanged(false) { setButtons(Default|Apply); @@ -151,8 +151,8 @@ KArtsModule::KArtsModule(QWidget *parent, const char *name) initAudioIOList(); - QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); - QTabWidget *tab = new QTabWidget(this); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQTabWidget *tab = new TQTabWidget(this); layout->addWidget(tab); general = new generalTab(tab); @@ -179,18 +179,18 @@ KArtsModule::KArtsModule(QWidget *parent, const char *name) customRate = hardware->customRate; samplingRate = hardware->samplingRate; - QString deviceHint = i18n("Normally, the sound server defaults to using the device called /dev/dsp for sound output. That should work in most cases. On some systems where devfs is used, however, you may need to use /dev/sound/dsp instead. Other alternatives are things like /dev/dsp0 or /dev/dsp1, if you have a soundcard that supports multiple outputs, or you have multiple soundcards."); + TQString deviceHint = i18n("Normally, the sound server defaults to using the device called /dev/dsp for sound output. That should work in most cases. On some systems where devfs is used, however, you may need to use /dev/sound/dsp instead. Other alternatives are things like /dev/dsp0 or /dev/dsp1, if you have a soundcard that supports multiple outputs, or you have multiple soundcards."); - QString rateHint = i18n("Normally, the sound server defaults to using a sampling rate of 44100 Hz (CD quality), which is supported on almost any hardware. If you are using certain Yamaha soundcards, you might need to configure this to 48000 Hz here, if you are using old SoundBlaster cards, like SoundBlaster Pro, you might need to change this to 22050 Hz. All other values are possible, too, and may make sense in certain contexts (i.e. professional studio equipment)."); + TQString rateHint = i18n("Normally, the sound server defaults to using a sampling rate of 44100 Hz (CD quality), which is supported on almost any hardware. If you are using certain Yamaha soundcards, you might need to configure this to 48000 Hz here, if you are using old SoundBlaster cards, like SoundBlaster Pro, you might need to change this to 22050 Hz. All other values are possible, too, and may make sense in certain contexts (i.e. professional studio equipment)."); - QString optionsHint = i18n("This configuration module is intended to cover almost every aspect of the aRts sound server that you can configure. However, there are some things which may not be available here, so you can add command line options here which will be passed directly to artsd. The command line options will override the choices made in the GUI. To see the possible choices, open a Konsole window, and type artsd -h."); + TQString optionsHint = i18n("This configuration module is intended to cover almost every aspect of the aRts sound server that you can configure. However, there are some things which may not be available here, so you can add command line options here which will be passed directly to artsd. The command line options will override the choices made in the GUI. To see the possible choices, open a Konsole window, and type artsd -h."); - QWhatsThis::add(customDevice, deviceHint); - QWhatsThis::add(deviceName, deviceHint); - QWhatsThis::add(customRate, rateHint); - QWhatsThis::add(samplingRate, rateHint); - QWhatsThis::add(hardware->customOptions, optionsHint); - QWhatsThis::add(hardware->addOptions, optionsHint); + TQWhatsThis::add(customDevice, deviceHint); + TQWhatsThis::add(deviceName, deviceHint); + TQWhatsThis::add(customRate, rateHint); + TQWhatsThis::add(samplingRate, rateHint); + TQWhatsThis::add(hardware->customOptions, optionsHint); + TQWhatsThis::add(hardware->addOptions, optionsHint); hardware->audioIO->insertItem( i18n( "Autodetect" ) ); for (AudioIOElement *a = audioIOList.first(); a != 0; a = audioIOList.next()) @@ -199,7 +199,7 @@ KArtsModule::KArtsModule(QWidget *parent, const char *name) deviceManager = new DeviceManager(); deviceManager->initManager(); - QString s; + TQString s; for ( int i = 0; i < deviceManager->midiPorts()+deviceManager->synthDevices(); i++) { if ( strcmp( deviceManager->type( i ), "" ) != 0 ) @@ -216,31 +216,31 @@ KArtsModule::KArtsModule(QWidget *parent, const char *name) suspendTime->setRange( 1, 999, 1, true ); - connect(startServer,SIGNAL(clicked()),this,SLOT(slotChanged())); - connect(networkTransparent,SIGNAL(clicked()),this,SLOT(slotChanged())); - connect(startRealtime,SIGNAL(clicked()),this,SLOT(slotChanged())); - connect(fullDuplex,SIGNAL(clicked()),this,SLOT(slotChanged())); - connect(customDevice, SIGNAL(clicked()), SLOT(slotChanged())); - connect(deviceName, SIGNAL(textChanged(const QString&)), SLOT(slotChanged())); - connect(customRate, SIGNAL(clicked()), SLOT(slotChanged())); - connect(samplingRate, SIGNAL(valueChanged(const QString&)), SLOT(slotChanged())); -// connect(general->volumeSystray, SIGNAL(clicked()), this, SLOT(slotChanged()) ); - - connect(hardware->audioIO,SIGNAL(highlighted(int)),SLOT(slotChanged())); - connect(hardware->audioIO,SIGNAL(activated(int)),SLOT(slotChanged())); - connect(hardware->customOptions,SIGNAL(clicked()),SLOT(slotChanged())); - connect(hardware->addOptions,SIGNAL(textChanged(const QString&)),SLOT(slotChanged())); - connect(hardware->soundQuality,SIGNAL(highlighted(int)),SLOT(slotChanged())); - connect(hardware->soundQuality,SIGNAL(activated(int)),SLOT(slotChanged())); - connect(general->latencySlider,SIGNAL(valueChanged(int)),SLOT(slotChanged())); - connect(autoSuspend,SIGNAL(clicked()),SLOT(slotChanged())); - connect(suspendTime,SIGNAL(valueChanged(int)),SLOT(slotChanged())); - connect(general->testSound,SIGNAL(clicked()),SLOT(slotTestSound())); - connect(hardware->midiDevice, SIGNAL( highlighted(int) ), this, SLOT( slotChanged() ) ); - connect(hardware->midiDevice, SIGNAL( activated(int) ), this, SLOT( slotChanged() ) ); - connect(hardware->midiUseMapper, SIGNAL( clicked() ), this, SLOT( slotChanged() ) ); - connect(hardware->midiMapper, SIGNAL( textChanged( const QString& ) ), - this, SLOT( slotChanged() ) ); + connect(startServer,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); + connect(networkTransparent,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); + connect(startRealtime,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); + connect(fullDuplex,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); + connect(customDevice, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(deviceName, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); + connect(customRate, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(samplingRate, TQT_SIGNAL(valueChanged(const TQString&)), TQT_SLOT(slotChanged())); +// connect(general->volumeSystray, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChanged()) ); + + connect(hardware->audioIO,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotChanged())); + connect(hardware->audioIO,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChanged())); + connect(hardware->customOptions,TQT_SIGNAL(clicked()),TQT_SLOT(slotChanged())); + connect(hardware->addOptions,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotChanged())); + connect(hardware->soundQuality,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotChanged())); + connect(hardware->soundQuality,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChanged())); + connect(general->latencySlider,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotChanged())); + connect(autoSuspend,TQT_SIGNAL(clicked()),TQT_SLOT(slotChanged())); + connect(suspendTime,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotChanged())); + connect(general->testSound,TQT_SIGNAL(clicked()),TQT_SLOT(slotTestSound())); + connect(hardware->midiDevice, TQT_SIGNAL( highlighted(int) ), this, TQT_SLOT( slotChanged() ) ); + connect(hardware->midiDevice, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotChanged() ) ); + connect(hardware->midiUseMapper, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); + connect(hardware->midiMapper, TQT_SIGNAL( textChanged( const TQString& ) ), + this, TQT_SLOT( slotChanged() ) ); KAboutData *about = new KAboutData(I18N_NOOP("kcmarts"), I18N_NOOP("The Sound Server Control Module"), @@ -261,9 +261,9 @@ void KArtsModule::load( bool useDefaults ) fullDuplex->setChecked(config->readBoolEntry("FullDuplex",false)); autoSuspend->setChecked(config->readBoolEntry("AutoSuspend",true)); suspendTime->setValue(config->readNumEntry("SuspendTime",60)); - deviceName->setText(config->readEntry("DeviceName",QString::null)); + deviceName->setText(config->readEntry("DeviceName",TQString::null)); customDevice->setChecked(!deviceName->text().isEmpty()); - hardware->addOptions->setText(config->readEntry("AddOptions",QString::null)); + hardware->addOptions->setText(config->readEntry("AddOptions",TQString::null)); hardware->customOptions->setChecked(!hardware->addOptions->text().isEmpty()); general->latencySlider->setValue(config->readNumEntry("Latency",250)); @@ -291,7 +291,7 @@ void KArtsModule::load( bool useDefaults ) break; } - QString audioIO = config->readEntry("AudioIO", QString::null); + TQString audioIO = config->readEntry("AudioIO", TQString::null); hardware->audioIO->setCurrentItem(0); for(AudioIOElement *a = audioIOList.first(); a != 0; a = audioIOList.next()) { @@ -310,7 +310,7 @@ void KArtsModule::load( bool useDefaults ) midiConfig->setGroup( "Configuration" ); hardware->midiDevice->setCurrentItem( midiConfig->readNumEntry( "midiDevice", 0 ) ); - QString mapurl( midiConfig->readPathEntry( "mapFilename" ) ); + TQString mapurl( midiConfig->readPathEntry( "mapFilename" ) ); hardware->midiMapper->setURL( mapurl ); hardware->midiUseMapper->setChecked( midiConfig->readBoolEntry( "useMidiMapper", false ) ); hardware->midiMapper->setEnabled( hardware->midiUseMapper->isChecked() ); @@ -329,7 +329,7 @@ KArtsModule::~KArtsModule() { void KArtsModule::saveParams( void ) { - QString audioIO; + TQString audioIO; int item = hardware->audioIO->currentItem() - 1; // first item: "default" @@ -337,9 +337,9 @@ void KArtsModule::saveParams( void ) audioIO = audioIOList.at(item)->name; } - QString dev = customDevice->isChecked() ? deviceName->text() : QString::null; + TQString dev = customDevice->isChecked() ? deviceName->text() : TQString::null; int rate = customRate->isChecked()?samplingRate->value() : 0; - QString addOptions; + TQString addOptions; if(hardware->customOptions->isChecked()) addOptions = hardware->addOptions->text(); @@ -419,10 +419,10 @@ int KArtsModule::userSavedChanges() if (!configChanged) return KMessageBox::Yes; - QString question = i18n("The settings have changed since the last time " + TQString question = i18n("The settings have changed since the last time " "you restarted the sound server.\n" "Do you want to save them?"); - QString caption = i18n("Save Sound Server Settings?"); + TQString caption = i18n("Save Sound Server Settings?"); reply = KMessageBox::questionYesNo(this, question, caption,KStdGuiItem::save(),KStdGuiItem::discard()); if ( reply == KMessageBox::Yes) { @@ -494,12 +494,12 @@ void KArtsModule::updateWidgets() "missing or disabled")); } deviceName->setEnabled(customDevice->isChecked()); - QString audioIO; + TQString audioIO; int item = hardware->audioIO->currentItem() - 1; // first item: "default" if (item >= 0) { audioIO = audioIOList.at(item)->name; - bool jack = (audioIO == QString::fromLatin1("jack")); + bool jack = (audioIO == TQString::fromLatin1("jack")); if(jack) { customRate->setChecked(false); @@ -542,8 +542,8 @@ bool KArtsModule::realtimeIsPossible() *checkProcess << "artswrapper"; *checkProcess << "check"; - connect(checkProcess, SIGNAL(processExited(KProcess*)), - this, SLOT(slotArtsdExited(KProcess*))); + connect(checkProcess, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotArtsdExited(KProcess*))); if (!checkProcess->start(KProcess::Block)) { delete checkProcess; @@ -608,60 +608,60 @@ void init_arts() startArts(); } -QString KArtsModule::createArgs(bool netTrans, +TQString KArtsModule::createArgs(bool netTrans, bool duplex, int fragmentCount, int fragmentSize, - const QString &deviceName, - int rate, int bits, const QString &audioIO, - const QString &addOptions, bool autoSuspend, + const TQString &deviceName, + int rate, int bits, const TQString &audioIO, + const TQString &addOptions, bool autoSuspend, int suspendTime ) { - QString args; + TQString args; if(fragmentCount) - args += QString::fromLatin1(" -F %1").arg(fragmentCount); + args += TQString::fromLatin1(" -F %1").arg(fragmentCount); if(fragmentSize) - args += QString::fromLatin1(" -S %1").arg(fragmentSize); + args += TQString::fromLatin1(" -S %1").arg(fragmentSize); if (!audioIO.isEmpty()) - args += QString::fromLatin1(" -a %1").arg(audioIO); + args += TQString::fromLatin1(" -a %1").arg(audioIO); if (duplex) - args += QString::fromLatin1(" -d"); + args += TQString::fromLatin1(" -d"); if (netTrans) - args += QString::fromLatin1(" -n"); + args += TQString::fromLatin1(" -n"); if (!deviceName.isEmpty()) - args += QString::fromLatin1(" -D ") + deviceName; + args += TQString::fromLatin1(" -D ") + deviceName; if (rate) - args += QString::fromLatin1(" -r %1").arg(rate); + args += TQString::fromLatin1(" -r %1").arg(rate); if (bits) - args += QString::fromLatin1(" -b %1").arg(bits); + args += TQString::fromLatin1(" -b %1").arg(bits); if (autoSuspend && suspendTime) - args += QString::fromLatin1(" -s %1").arg(suspendTime); + args += TQString::fromLatin1(" -s %1").arg(suspendTime); if (!addOptions.isEmpty()) - args += QChar(' ') + addOptions; + args += TQChar(' ') + addOptions; - args += QString::fromLatin1(" -m artsmessage"); - args += QString::fromLatin1(" -c drkonqi"); - args += QString::fromLatin1(" -l 3"); - args += QString::fromLatin1(" -f"); + args += TQString::fromLatin1(" -m artsmessage"); + args += TQString::fromLatin1(" -c drkonqi"); + args += TQString::fromLatin1(" -l 3"); + args += TQString::fromLatin1(" -f"); return args; } KStartArtsProgressDialog::KStartArtsProgressDialog(KArtsModule *parent, const char *name, - const QString &caption, const QString &text) + const TQString &caption, const TQString &text) : KProgressDialog(parent, name, caption, text, true), m_module(parent), m_shutdown(false) { - connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotProgress())); + connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProgress())); progressBar()->setTotalSteps(20); m_timeStep = 700; m_timer.start(m_timeStep); @@ -707,7 +707,7 @@ KStartArtsProgressDialog::slotFinished() { progressBar()->setProgress(20); m_timer.stop(); - QTimer::singleShot(1000, this, SLOT(close())); + TQTimer::singleShot(1000, this, TQT_SLOT(close())); } diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h index e69f5767d..80df5bd8e 100644 --- a/kcontrol/arts/arts.h +++ b/kcontrol/arts/arts.h @@ -28,12 +28,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -52,7 +52,7 @@ class KArtsModule : public KCModule public: - KArtsModule(QWidget *parent=0, const char *name=0); + KArtsModule(TQWidget *parent=0, const char *name=0); ~KArtsModule(); void saveParams( void ); @@ -75,18 +75,18 @@ private: void updateWidgets (); void calculateLatency(); - QString createArgs(bool netTrans,bool duplex, int fragmentCount, + TQString createArgs(bool netTrans,bool duplex, int fragmentCount, int fragmentSize, - const QString &deviceName, - int rate, int bits, const QString &audioIO, - const QString &addOptions, bool autoSuspend, + const TQString &deviceName, + int rate, int bits, const TQString &audioIO, + const TQString &addOptions, bool autoSuspend, int suspendTime); int userSavedChanges(); - QCheckBox *startServer, *startRealtime, *networkTransparent, + TQCheckBox *startServer, *startRealtime, *networkTransparent, *fullDuplex, *customDevice, *customRate, *autoSuspend; - QLineEdit *deviceName; - QSpinBox *samplingRate; + TQLineEdit *deviceName; + TQSpinBox *samplingRate; KIntNumInput *suspendTime; generalTab *general; hardwareTab *hardware; @@ -100,14 +100,14 @@ private: class AudioIOElement { public: - AudioIOElement(const QString &name, const QString &fullName) + AudioIOElement(const TQString &name, const TQString &fullName) : name(name), fullName(fullName) {;} - QString name; - QString fullName; + TQString name; + TQString fullName; }; void initAudioIOList(); - QPtrList audioIOList; + TQPtrList audioIOList; void restartServer(); bool realtimeIsPossible(); @@ -119,13 +119,13 @@ class KStartArtsProgressDialog : public KProgressDialog Q_OBJECT public: KStartArtsProgressDialog(KArtsModule *parent, const char *name, - const QString &caption, const QString &text); + const TQString &caption, const TQString &text); public slots: void slotProgress(); void slotFinished(); private: - QTimer m_timer; + TQTimer m_timer; int m_timeStep; KArtsModule *m_module; bool m_shutdown; diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp index 7e292cde1..5c7618a1b 100644 --- a/kcontrol/arts/krichtextlabel.cpp +++ b/kcontrol/arts/krichtextlabel.cpp @@ -18,35 +18,35 @@ #include "krichtextlabel.h" -#include -#include -#include +#include +#include +#include #include -static QString qrichtextify( const QString& text ) +static TQString qrichtextify( const TQString& text ) { if ( text.isEmpty() || text[0] == '<' ) return text; - QStringList lines = QStringList::split('\n', text); - for(QStringList::Iterator it = lines.begin(); it != lines.end(); ++it) + TQStringList lines = TQStringList::split('\n', text); + for(TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) { - *it = QStyleSheet::convertFromPlainText( *it, QStyleSheetItem::WhiteSpaceNormal ); + *it = TQStyleSheet::convertFromPlainText( *it, TQStyleSheetItem::WhiteSpaceNormal ); } - return lines.join(QString::null); + return lines.join(TQString::null); } -KRichTextLabel::KRichTextLabel( const QString &text , QWidget *parent, const char *name ) - : QLabel ( parent, name ) { +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 ); setText(text); } -KRichTextLabel::KRichTextLabel( QWidget *parent, const char *name ) - : QLabel ( parent, name ) { +KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) + : TQLabel ( parent, name ) { m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); setAlignment( Qt::WordBreak ); } @@ -57,17 +57,17 @@ void KRichTextLabel::setDefaultWidth(int defaultWidth) updateGeometry(); } -QSizePolicy KRichTextLabel::sizePolicy() const +TQSizePolicy KRichTextLabel::sizePolicy() const { - return QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum, false); + return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false); } -QSize KRichTextLabel::minimumSizeHint() const +TQSize KRichTextLabel::minimumSizeHint() const { - QString qt_text = qrichtextify( text() ); + TQString qt_text = qrichtextify( text() ); int pref_width = 0; int pref_height = 0; - QSimpleRichText rt(qt_text, font()); + TQSimpleRichText rt(qt_text, font()); pref_width = m_defaultWidth; rt.setWidth(pref_width); int used_width = rt.widthUsed(); @@ -94,19 +94,19 @@ QSize KRichTextLabel::minimumSizeHint() const pref_width = used_width; } - return QSize(pref_width, rt.height()); + return TQSize(pref_width, rt.height()); } -QSize KRichTextLabel::sizeHint() const +TQSize KRichTextLabel::sizeHint() const { return minimumSizeHint(); } -void KRichTextLabel::setText( const QString &text ) { +void KRichTextLabel::setText( const TQString &text ) { if (!text.startsWith("")) - QLabel::setText(""+text+""); + TQLabel::setText(""+text+""); else - QLabel::setText(text); + TQLabel::setText(text); } void KRichTextLabel::virtual_hook( int, void* ) diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h index e03fe2509..40ead0375 100644 --- a/kcontrol/arts/krichtextlabel.h +++ b/kcontrol/arts/krichtextlabel.h @@ -19,12 +19,12 @@ #ifndef KRICHTEXTLABEL_H #define KRICHTEXTLABEL_H -#include +#include #include /** - * @short A replacement for QLabel that supports richtext and proper layout management + * @short A replacement for TQLabel that supports richtext and proper layout management * * @author Waldo Bastian */ @@ -32,25 +32,25 @@ /* * QLabel */ -class KDEUI_EXPORT KRichTextLabel : public QLabel { +class KDEUI_EXPORT KRichTextLabel : public TQLabel { Q_OBJECT public: /** * Default constructor. */ - KRichTextLabel( QWidget *parent, const char *name = 0 ); - KRichTextLabel( const QString &text, QWidget *parent, const char *name = 0 ); + KRichTextLabel( TQWidget *parent, const char *name = 0 ); + KRichTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); - virtual QSize minimumSizeHint() const; - virtual QSize sizeHint() const; - QSizePolicy sizePolicy() const; + virtual TQSize minimumSizeHint() const; + virtual TQSize sizeHint() const; + TQSizePolicy sizePolicy() const; public slots: - void setText( const QString & ); + void setText( const TQString & ); protected: int m_defaultWidth; diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp index 3218ec470..e1f9ece96 100644 --- a/kcontrol/background/bgadvanced.cpp +++ b/kcontrol/background/bgadvanced.cpp @@ -20,17 +20,17 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -48,12 +48,12 @@ /**** BGAdvancedDialog ****/ -static QCString desktopConfigname() +static TQCString desktopConfigname() { int desktop=0; if (qt_xdisplay()) desktop = DefaultScreen(qt_xdisplay()); - QCString name; + TQCString name; if (desktop == 0) name = "kdesktoprc"; else @@ -64,7 +64,7 @@ static QCString desktopConfigname() BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, - QWidget *parent, + TQWidget *parent, bool m_multidesktop) : KDialogBase(parent, "BGAdvancedDialog", true, i18n("Advanced Background Settings"), @@ -77,12 +77,12 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, dlg->m_listPrograms->header()->setStretchEnabled ( true, 1 ); dlg->m_listPrograms->setAllColumnsShowFocus(true); - connect(dlg->m_listPrograms, SIGNAL(clicked(QListViewItem *)), - SLOT(slotProgramItemClicked(QListViewItem *))); + connect(dlg->m_listPrograms, TQT_SIGNAL(clicked(TQListViewItem *)), + TQT_SLOT(slotProgramItemClicked(TQListViewItem *))); // Load programs - QStringList lst = KBackgroundProgram::list(); - QStringList::Iterator it; + TQStringList lst = KBackgroundProgram::list(); + TQStringList::Iterator it; for (it=lst.begin(); it != lst.end(); ++it) addProgram(*it); @@ -100,15 +100,15 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, dlg->m_spinCache->setSpecialValueText(i18n("Unlimited")); dlg->m_spinCache->setSuffix(i18n(" KB")); - connect(dlg->m_buttonAdd, SIGNAL(clicked()), - SLOT(slotAdd())); - connect(dlg->m_buttonRemove, SIGNAL(clicked()), - SLOT(slotRemove())); - connect(dlg->m_buttonModify, SIGNAL(clicked()), - SLOT(slotModify())); + connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()), + TQT_SLOT(slotAdd())); + connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()), + TQT_SLOT(slotRemove())); + connect(dlg->m_buttonModify, TQT_SIGNAL(clicked()), + TQT_SLOT(slotModify())); - connect(dlg->m_listPrograms, SIGNAL(doubleClicked(QListViewItem *)), - SLOT(slotProgramItemDoubleClicked(QListViewItem *))); + connect(dlg->m_listPrograms, TQT_SIGNAL(doubleClicked(TQListViewItem *)), + TQT_SLOT(slotProgramItemDoubleClicked(TQListViewItem *))); } else { @@ -119,8 +119,8 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, dlg->m_groupCache->hide(); } - connect( dlg->m_cbProgram, SIGNAL(toggled(bool)), - SLOT(slotEnableProgram(bool))); + connect( dlg->m_cbProgram, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(slotEnableProgram(bool))); m_backgroundMode = m_oldBackgroundMode = r->backgroundMode(); if (m_oldBackgroundMode == KBackgroundSettings::Program) @@ -146,23 +146,23 @@ int BGAdvancedDialog::cacheSize() return dlg->m_spinCache->value(); } -QColor BGAdvancedDialog::textColor() +TQColor BGAdvancedDialog::textColor() { return dlg->m_colorText->color(); } -void BGAdvancedDialog::setTextColor(const QColor &color) +void BGAdvancedDialog::setTextColor(const TQColor &color) { dlg->m_colorText->setColor(color); } -QColor BGAdvancedDialog::textBackgroundColor() +TQColor BGAdvancedDialog::textBackgroundColor() { return dlg->m_cbSolidTextBackground->isChecked() ? - dlg->m_colorTextBackground->color() : QColor(); + dlg->m_colorTextBackground->color() : TQColor(); } -void BGAdvancedDialog::setTextBackgroundColor(const QColor &color) +void BGAdvancedDialog::setTextBackgroundColor(const TQColor &color) { dlg->m_colorTextBackground->blockSignals(true); dlg->m_cbSolidTextBackground->blockSignals(true); @@ -214,7 +214,7 @@ int BGAdvancedDialog::textWidth() const void BGAdvancedDialog::updateUI() { - QString prog = r->KBackgroundProgram::name(); + TQString prog = r->KBackgroundProgram::name(); dlg->m_cbProgram->blockSignals(true); if ((r->backgroundMode() == KBackgroundSettings::Program) @@ -238,7 +238,7 @@ void BGAdvancedDialog::updateUI() dlg->m_cbProgram->blockSignals(false); } -void BGAdvancedDialog::removeProgram(const QString &name) +void BGAdvancedDialog::removeProgram(const TQString &name) { if (m_programItems.find(name)) { @@ -247,7 +247,7 @@ void BGAdvancedDialog::removeProgram(const QString &name) } } -void BGAdvancedDialog::addProgram(const QString &name) +void BGAdvancedDialog::addProgram(const TQString &name) { removeProgram(name); @@ -255,7 +255,7 @@ void BGAdvancedDialog::addProgram(const QString &name) if (prog.command().isEmpty() || (prog.isGlobal() && !prog.isAvailable())) return; - QListViewItem *item = new QListViewItem(dlg->m_listPrograms); + TQListViewItem *item = new TQListViewItem(dlg->m_listPrograms); item->setText(0, prog.name()); item->setText(1, prog.comment()); item->setText(2, i18n("%1 min.").arg(prog.refresh())); @@ -263,11 +263,11 @@ void BGAdvancedDialog::addProgram(const QString &name) m_programItems.insert(name, item); } -void BGAdvancedDialog::selectProgram(const QString &name) +void BGAdvancedDialog::selectProgram(const TQString &name) { if (m_programItems.find(name)) { - QListViewItem *item = m_programItems[name]; + TQListViewItem *item = m_programItems[name]; dlg->m_listPrograms->ensureItemVisible(item); dlg->m_listPrograms->setSelected(item, true); m_selectedProgram = name; @@ -278,9 +278,9 @@ void BGAdvancedDialog::slotAdd() { KProgramEditDialog dlg; dlg.exec(); - if (dlg.result() == QDialog::Accepted) + if (dlg.result() == TQDialog::Accepted) { - QString program = dlg.program(); + TQString program = dlg.program(); addProgram(program); selectProgram(program); } @@ -309,7 +309,7 @@ void BGAdvancedDialog::slotRemove() prog.remove(); removeProgram(m_selectedProgram); - m_selectedProgram = QString::null; + m_selectedProgram = TQString::null; } /* @@ -322,9 +322,9 @@ void BGAdvancedDialog::slotModify() KProgramEditDialog dlg(m_selectedProgram); dlg.exec(); - if (dlg.result() == QDialog::Accepted) + if (dlg.result() == TQDialog::Accepted) { - QString program = dlg.program(); + TQString program = dlg.program(); if (program != m_selectedProgram) { KBackgroundProgram prog(m_selectedProgram); @@ -336,14 +336,14 @@ void BGAdvancedDialog::slotModify() } } -void BGAdvancedDialog::slotProgramItemClicked(QListViewItem *item) +void BGAdvancedDialog::slotProgramItemClicked(TQListViewItem *item) { if (item) m_selectedProgram = item->text(0); slotProgramChanged(); } -void BGAdvancedDialog::slotProgramItemDoubleClicked(QListViewItem *item) +void BGAdvancedDialog::slotProgramItemDoubleClicked(TQListViewItem *item) { slotProgramItemClicked(item); slotModify(); @@ -363,7 +363,7 @@ void BGAdvancedDialog::slotEnableProgram(bool b) if (b) { dlg->m_listPrograms->blockSignals(true); - QListViewItem *cur = dlg->m_listPrograms->currentItem(); + TQListViewItem *cur = dlg->m_listPrograms->currentItem(); dlg->m_listPrograms->setSelected(cur, true); dlg->m_listPrograms->ensureItemVisible(cur); dlg->m_listPrograms->blockSignals(false); @@ -375,7 +375,7 @@ void BGAdvancedDialog::slotEnableProgram(bool b) } } -QString BGAdvancedDialog::backgroundProgram() const +TQString BGAdvancedDialog::backgroundProgram() const { return m_selectedProgram; } @@ -387,48 +387,48 @@ int BGAdvancedDialog::backgroundMode() const /**** KProgramEditDialog ****/ -KProgramEditDialog::KProgramEditDialog(const QString &program, QWidget *parent, char *name) +KProgramEditDialog::KProgramEditDialog(const TQString &program, TQWidget *parent, char *name) : KDialogBase(parent, name, true, i18n("Configure Background Program"), Ok | Cancel, Ok, true) { - QFrame *frame = makeMainWidget(); + TQFrame *frame = makeMainWidget(); - QGridLayout *grid = new QGridLayout(frame, 6, 2, 0, spacingHint()); + TQGridLayout *grid = new TQGridLayout(frame, 6, 2, 0, spacingHint()); grid->addColSpacing(1, 300); - QLabel *lbl = new QLabel(i18n("&Name:"), frame); + TQLabel *lbl = new TQLabel(i18n("&Name:"), frame); grid->addWidget(lbl, 0, 0); - m_NameEdit = new QLineEdit(frame); + m_NameEdit = new TQLineEdit(frame); lbl->setBuddy(m_NameEdit); grid->addWidget(m_NameEdit, 0, 1); - lbl = new QLabel(i18n("Co&mment:"), frame); + lbl = new TQLabel(i18n("Co&mment:"), frame); grid->addWidget(lbl, 1, 0); - m_CommentEdit = new QLineEdit(frame); + m_CommentEdit = new TQLineEdit(frame); lbl->setBuddy(m_CommentEdit); grid->addWidget(m_CommentEdit, 1, 1); - lbl = new QLabel(i18n("Comman&d:"), frame); + lbl = new TQLabel(i18n("Comman&d:"), frame); grid->addWidget(lbl, 2, 0); - m_CommandEdit = new QLineEdit(frame); + m_CommandEdit = new TQLineEdit(frame); lbl->setBuddy(m_CommandEdit); grid->addWidget(m_CommandEdit, 2, 1); - lbl = new QLabel(i18n("&Preview cmd:"), frame); + lbl = new TQLabel(i18n("&Preview cmd:"), frame); grid->addWidget(lbl, 3, 0); - m_PreviewEdit = new QLineEdit(frame); + m_PreviewEdit = new TQLineEdit(frame); lbl->setBuddy(m_PreviewEdit); grid->addWidget(m_PreviewEdit, 3, 1); - lbl = new QLabel(i18n("&Executable:"), frame); + lbl = new TQLabel(i18n("&Executable:"), frame); grid->addWidget(lbl, 4, 0); - m_ExecEdit = new QLineEdit(frame); + m_ExecEdit = new TQLineEdit(frame); lbl->setBuddy(m_ExecEdit); grid->addWidget(m_ExecEdit, 4, 1); - lbl = new QLabel(i18n("&Refresh time:"), frame); + lbl = new TQLabel(i18n("&Refresh time:"), frame); grid->addWidget(lbl, 5, 0); - m_RefreshEdit = new QSpinBox(frame); + m_RefreshEdit = new TQSpinBox(frame); m_RefreshEdit->setRange(5, 60); m_RefreshEdit->setSteps(5, 10); m_RefreshEdit->setSuffix(i18n(" min")); @@ -459,14 +459,14 @@ KProgramEditDialog::KProgramEditDialog(const QString &program, QWidget *parent, } -QString KProgramEditDialog::program()const +TQString KProgramEditDialog::program()const { return m_NameEdit->text(); } void KProgramEditDialog::slotOk() { - QString s = m_NameEdit->text(); + TQString s = m_NameEdit->text(); if (s.isEmpty()) { KMessageBox::sorry(this, i18n("You did not fill in the `Name' field.\n" "This is a required field.")); @@ -477,7 +477,7 @@ void KProgramEditDialog::slotOk() if ((s != m_Program) && !prog.command().isEmpty()) { int ret = KMessageBox::warningContinueCancel(this, i18n("There is already a program with the name `%1'.\n" - "Do you want to overwrite it?").arg(s),QString::null,i18n("Overwrite")); + "Do you want to overwrite it?").arg(s),TQString::null,i18n("Overwrite")); if (ret != KMessageBox::Continue) return; } diff --git a/kcontrol/background/bgadvanced.h b/kcontrol/background/bgadvanced.h index 6ede665a1..8c2a0b801 100644 --- a/kcontrol/background/bgadvanced.h +++ b/kcontrol/background/bgadvanced.h @@ -23,9 +23,9 @@ #ifndef BGADVANCED_H #define BGADVANCED_H -#include -#include -#include +#include +#include +#include #include @@ -40,14 +40,14 @@ class BGAdvancedDialog : public KDialogBase { Q_OBJECT public: - BGAdvancedDialog(KBackgroundRenderer *_r, QWidget *parent, bool m_multidesktop); + BGAdvancedDialog(KBackgroundRenderer *_r, TQWidget *parent, bool m_multidesktop); void setCacheSize(int s); int cacheSize(); - QColor textColor(); - void setTextColor(const QColor &color); - QColor textBackgroundColor(); - void setTextBackgroundColor(const QColor &color); + TQColor textColor(); + void setTextColor(const TQColor &color); + TQColor textBackgroundColor(); + void setTextBackgroundColor(const TQColor &color); bool shadowEnabled(); void setShadowEnabled(bool enabled); void setTextLines(int lines); @@ -59,7 +59,7 @@ public: void makeReadOnly(); - QString backgroundProgram() const; + TQString backgroundProgram() const; int backgroundMode() const; public slots: @@ -68,13 +68,13 @@ public slots: void slotModify(); protected: - void addProgram(const QString &name); - void removeProgram(const QString &name); - void selectProgram(const QString &name); + void addProgram(const TQString &name); + void removeProgram(const TQString &name); + void selectProgram(const TQString &name); protected slots: - void slotProgramItemClicked(QListViewItem *item); - void slotProgramItemDoubleClicked(QListViewItem *item); + void slotProgramItemClicked(TQListViewItem *item); + void slotProgramItemDoubleClicked(TQListViewItem *item); void slotProgramChanged(); void slotEnableProgram(bool b); @@ -83,9 +83,9 @@ private: BGAdvancedBase *dlg; - QWidget *m_pMonitor; - QDict m_programItems; - QString m_selectedProgram; + TQWidget *m_pMonitor; + TQDict m_programItems; + TQString m_selectedProgram; int m_oldBackgroundMode; int m_backgroundMode; }; @@ -98,21 +98,21 @@ class KProgramEditDialog: public KDialogBase Q_OBJECT public: - KProgramEditDialog(const QString &program=QString::null, QWidget *parent=0L, + KProgramEditDialog(const TQString &program=TQString::null, TQWidget *parent=0L, char *name=0L); /** The program name is here in case the user changed it */ - QString program()const; + TQString program()const; public slots: void slotOk(); private: - QString m_Program; - QLineEdit *m_NameEdit, *m_CommentEdit; - QLineEdit *m_ExecEdit, *m_CommandEdit; - QLineEdit *m_PreviewEdit; - QSpinBox *m_RefreshEdit; + TQString m_Program; + TQLineEdit *m_NameEdit, *m_CommentEdit; + TQLineEdit *m_ExecEdit, *m_CommandEdit; + TQLineEdit *m_PreviewEdit; + TQSpinBox *m_RefreshEdit; KBackgroundProgram *m_Prog; }; diff --git a/kcontrol/background/bgdefaults.h b/kcontrol/background/bgdefaults.h index 99846f0b0..b7de45bda 100644 --- a/kcontrol/background/bgdefaults.h +++ b/kcontrol/background/bgdefaults.h @@ -26,8 +26,8 @@ // Per desktop defaults // Before you change this get in touch with me (torsten@kde.org) // Thanks!! -#define _defColorA QColor("#003082") -#define _defColorB QColor("#C0C0C0") +#define _defColorA TQColor("#003082") +#define _defColorB TQColor("#C0C0C0") #define _defBackgroundMode KBackgroundSettings::Flat #define _defWallpaperMode KBackgroundSettings::NoWallpaper #define _defMultiMode KBackgroundSettings::NoMulti diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 6a7e44234..ae76b701a 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -29,16 +29,16 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -66,7 +66,7 @@ #define NR_PREDEF_PATTERNS 6 -BGDialog::BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop) +BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop) : BGDialog_UI(parent, "BGDialog") { m_pGlobals = new KGlobalBackgroundSettings(_config); @@ -77,20 +77,20 @@ BGDialog::BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop) KWinModule *m_kwin; m_kwin = new KWinModule(this); m_curDesk = m_kwin->currentDesktop(); - QSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); + TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); m_useViewports = s.width() * s.height() > 1; m_numDesks = m_multidesktop ? KWin::numberOfDesktops() : 1; m_numViewports = s.width() * s.height(); - m_numScreens = QApplication::desktop()->numScreens(); + m_numScreens = TQApplication::desktop()->numScreens(); - QCString multiHead = getenv("KDE_MULTIHEAD"); + TQCString multiHead = getenv("KDE_MULTIHEAD"); if (multiHead.lower() == "true") { m_numScreens = 1; } - QPoint vx(m_kwin->currentViewport(m_kwin->currentDesktop())); + TQPoint vx(m_kwin->currentViewport(m_kwin->currentDesktop())); int t_eViewport = (vx.x() * vx.y()); if (t_eViewport < 1) { t_eViewport = 1; @@ -101,7 +101,7 @@ BGDialog::BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop) m_desk = m_multidesktop ? (m_useViewports ? (((m_desk - 1) * m_numViewports) + t_eViewport) : m_desk) : m_desk; m_numDesks = m_multidesktop ? (m_useViewports ? (m_numDesks * m_numViewports) : m_numDesks) : m_numDesks; - m_screen = QApplication::desktop()->screenNumber(this); + m_screen = TQApplication::desktop()->screenNumber(this); if (m_screen >= (int)m_numScreens) m_screen = m_numScreens-1; @@ -124,62 +124,62 @@ BGDialog::BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop) m_eScreen = 0; } - connect(m_buttonIdentifyScreens, SIGNAL(clicked()), SLOT(slotIdentifyScreens())); + connect(m_buttonIdentifyScreens, TQT_SIGNAL(clicked()), TQT_SLOT(slotIdentifyScreens())); // preview monitor m_pMonitorArrangement = new BGMonitorArrangement(m_screenArrangement, "monitor arrangement"); - connect(m_pMonitorArrangement, SIGNAL(imageDropped(const QString &)), SLOT(slotImageDropped(const QString &))); + connect(m_pMonitorArrangement, TQT_SIGNAL(imageDropped(const TQString &)), TQT_SLOT(slotImageDropped(const TQString &))); if( m_multidesktop) { // desktop - connect(m_comboDesktop, SIGNAL(activated(int)), - SLOT(slotSelectDesk(int))); + connect(m_comboDesktop, TQT_SIGNAL(activated(int)), + TQT_SLOT(slotSelectDesk(int))); } if (m_numScreens > 1) { - connect(m_comboScreen, SIGNAL(activated(int)), - SLOT(slotSelectScreen(int))); + connect(m_comboScreen, TQT_SIGNAL(activated(int)), + TQT_SLOT(slotSelectScreen(int))); } // background image settings - QIconSet iconSet = SmallIconSet(QString::fromLatin1("fileopen")); - QPixmap pixMap = iconSet.pixmap( QIconSet::Small, QIconSet::Normal ); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen")); + TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_urlWallpaperButton->setIconSet( iconSet ); m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - QToolTip::add(m_urlWallpaperButton, i18n("Open file dialog")); - - connect(m_buttonGroupBackground, SIGNAL(clicked(int)), - SLOT(slotWallpaperTypeChanged(int))); - connect(m_urlWallpaperBox, SIGNAL(activated(int)), - SLOT(slotWallpaper(int))); - connect(m_urlWallpaperButton, SIGNAL(clicked()), - SLOT(slotWallpaperSelection())); - connect(m_comboWallpaperPos, SIGNAL(activated(int)), - SLOT(slotWallpaperPos(int))); - connect(m_buttonSetupWallpapers, SIGNAL(clicked()), - SLOT(slotSetupMulti())); + TQToolTip::add(m_urlWallpaperButton, i18n("Open file dialog")); + + connect(m_buttonGroupBackground, TQT_SIGNAL(clicked(int)), + TQT_SLOT(slotWallpaperTypeChanged(int))); + connect(m_urlWallpaperBox, TQT_SIGNAL(activated(int)), + TQT_SLOT(slotWallpaper(int))); + connect(m_urlWallpaperButton, TQT_SIGNAL(clicked()), + TQT_SLOT(slotWallpaperSelection())); + connect(m_comboWallpaperPos, TQT_SIGNAL(activated(int)), + TQT_SLOT(slotWallpaperPos(int))); + connect(m_buttonSetupWallpapers, TQT_SIGNAL(clicked()), + TQT_SLOT(slotSetupMulti())); // set up the background colour stuff - connect(m_colorPrimary, SIGNAL(changed(const QColor &)), - SLOT(slotPrimaryColor(const QColor &))); - connect(m_colorSecondary, SIGNAL(changed(const QColor &)), - SLOT(slotSecondaryColor(const QColor &))); - connect(m_comboPattern, SIGNAL(activated(int)), - SLOT(slotPattern(int))); + connect(m_colorPrimary, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(slotPrimaryColor(const TQColor &))); + connect(m_colorSecondary, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(slotSecondaryColor(const TQColor &))); + connect(m_comboPattern, TQT_SIGNAL(activated(int)), + TQT_SLOT(slotPattern(int))); // blend - connect(m_comboBlend, SIGNAL(activated(int)), SLOT(slotBlendMode(int))); - connect(m_sliderBlend, SIGNAL(valueChanged(int)), - SLOT(slotBlendBalance(int))); - connect(m_cbBlendReverse, SIGNAL(toggled(bool)), - SLOT(slotBlendReverse(bool))); + connect(m_comboBlend, TQT_SIGNAL(activated(int)), TQT_SLOT(slotBlendMode(int))); + connect(m_sliderBlend, TQT_SIGNAL(valueChanged(int)), + TQT_SLOT(slotBlendBalance(int))); + connect(m_cbBlendReverse, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(slotBlendReverse(bool))); // advanced options - connect(m_buttonAdvanced, SIGNAL(clicked()), - SLOT(slotAdvanced())); + connect(m_buttonAdvanced, TQT_SIGNAL(clicked()), + TQT_SLOT(slotAdvanced())); - connect(m_buttonGetNew, SIGNAL(clicked()), - SLOT(slotGetNewStuff())); + connect(m_buttonGetNew, TQT_SIGNAL(clicked()), + TQT_SLOT(slotGetNewStuff())); // renderers m_renderer.resize(m_numDesks+1); @@ -196,19 +196,19 @@ BGDialog::BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop) // Setup the merged-screen renderer KBackgroundRenderer * r = new KBackgroundRenderer(eDesk, 0, false, _config); m_renderer[i].insert( 0, r ); - connect( r, SIGNAL(imageDone(int,int)), SLOT(slotPreviewDone(int,int)) ); + connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); // Setup the common-screen renderer r = new KBackgroundRenderer(eDesk, 0, true, _config); m_renderer[i].insert( 1, r ); - connect( r, SIGNAL(imageDone(int,int)), SLOT(slotPreviewDone(int,int)) ); + connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); // Setup the remaining renderers for each screen for (unsigned j=0; j < m_numScreens; ++j ) { r = new KBackgroundRenderer(eDesk, j, true, _config); m_renderer[i].insert( j+2, r ); - connect( r, SIGNAL(imageDone(int,int)), SLOT(slotPreviewDone(int,int)) ); + connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); } } } @@ -223,14 +223,14 @@ BGDialog::BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop) // set up the common desktop renderer KBackgroundRenderer * r = new KBackgroundRenderer(0, 0, false, _config); m_renderer[0].insert(0, r); - connect(r, SIGNAL(imageDone(int,int)), SLOT(slotPreviewDone(int,int))); + connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int))); // set up all the other desktop renderers for (unsigned i = 0; i < m_numDesks; ++i) { r = new KBackgroundRenderer(i, 0, false, _config); m_renderer[i+1].insert(0, r); - connect(r, SIGNAL(imageDone(int,int)), SLOT(slotPreviewDone(int,int))); + connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int))); } } @@ -257,7 +257,7 @@ BGDialog::BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop) updateUI(); #if (QT_VERSION-0 >= 0x030200) - connect( qApp->desktop(), SIGNAL( resized( int )), SLOT( desktopResized())); // RANDR support + connect( qApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support #endif } @@ -380,7 +380,7 @@ void BGDialog::defaults() eRenderer()->setWallpaper( eRenderer()->wallpaper() ); } -QString BGDialog::quickHelp() const +TQString BGDialog::quickHelp() const { return i18n("

    Background

    This module allows you to control the" " appearance of the virtual desktops. KDE offers a variety of options" @@ -405,23 +405,23 @@ void BGDialog::slotIdentifyScreens() // Taken from PositionTab::showIdentify in kdebase/kcontrol/kicker/positiontab_impl.cpp for(unsigned s = 0; s < m_numScreens; s++) { - QLabel *screenLabel = new QLabel(0,"Screen Identify", WDestructiveClose | WStyle_Customize | WX11BypassWM); + TQLabel *screenLabel = new TQLabel(0,"Screen Identify", WDestructiveClose | WStyle_Customize | WX11BypassWM); - QFont identifyFont(KGlobalSettings::generalFont()); + TQFont identifyFont(KGlobalSettings::generalFont()); identifyFont.setPixelSize(100); screenLabel->setFont(identifyFont); - screenLabel->setFrameStyle(QFrame::Panel); - screenLabel->setFrameShadow(QFrame::Plain); + screenLabel->setFrameStyle(TQFrame::Panel); + screenLabel->setFrameShadow(TQFrame::Plain); screenLabel->setAlignment(Qt::AlignCenter); screenLabel->setNum(int(s + 1)); // BUGLET: we should not allow the identification to be entered again // until the timer fires. - QTimer::singleShot(1500, screenLabel, SLOT(close())); + TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); - QPoint screenCenter(QApplication::desktop()->screenGeometry(s).center()); - QRect targetGeometry(QPoint(0,0),screenLabel->sizeHint()); + TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); + TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint()); targetGeometry.moveCenter(screenCenter); screenLabel->setGeometry(targetGeometry); @@ -448,7 +448,7 @@ void BGDialog::initUI() // Screens for (unsigned i = 0; i < m_numScreens; ++i) - m_comboScreen->insertItem( i18n("Screen %1").arg(QString::number(i+1)) ); + m_comboScreen->insertItem( i18n("Screen %1").arg(TQString::number(i+1)) ); // Patterns m_comboPattern->insertItem(i18n("Single Color")); @@ -460,7 +460,7 @@ void BGDialog::initUI() m_patterns = KBackgroundPattern::list(); m_patterns.sort(); // Defined order - QStringList::Iterator it; + TQStringList::Iterator it; for (it=m_patterns.begin(); it != m_patterns.end(); ++it) { KBackgroundPattern pat(*it); @@ -497,20 +497,20 @@ void BGDialog::initUI() void BGDialog::loadWallpaperFilesList() { // Wallpapers - // the following QMap is lower cased names mapped to cased names and URLs + // the following TQMap is lower cased names mapped to cased names and URLs // this way we get case insensitive sorting - QMap > papers; + TQMap > papers; //search for .desktop files before searching for images without .desktop files - QStringList lst = m_pDirs->findAllResources("wallpaper", "*desktop", false, true); - QStringList files; - for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) + TQStringList lst = m_pDirs->findAllResources("wallpaper", "*desktop", false, true); + TQStringList files; + for (TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) { KSimpleConfig fileConfig(*it); fileConfig.setGroup("Wallpaper"); - QString imageCaption = fileConfig.readEntry("Name"); - QString fileName = fileConfig.readEntry("File"); + TQString imageCaption = fileConfig.readEntry("Name"); + TQString fileName = fileConfig.readEntry("File"); if (imageCaption.isEmpty()) { @@ -520,15 +520,15 @@ void BGDialog::loadWallpaperFilesList() { } // avoid name collisions - QString rs = imageCaption; - QString lrs = rs.lower(); + TQString rs = imageCaption; + TQString lrs = rs.lower(); for (int n = 1; papers.find(lrs) != papers.end(); ++n) { - rs = imageCaption + " (" + QString::number(n) + ')'; + rs = imageCaption + " (" + TQString::number(n) + ')'; lrs = rs.lower(); } int slash = (*it).findRev('/') + 1; - QString directory = (*it).left(slash); + TQString directory = (*it).left(slash); bool canLoadScaleable = false; #ifdef HAVE_LIBART canLoadScaleable = true; @@ -541,13 +541,13 @@ void BGDialog::loadWallpaperFilesList() { //now find any wallpapers that don't have a .desktop file lst = m_pDirs->findAllResources("wallpaper", "*", false, true); - for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) + for (TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) { if ( !(*it).endsWith(".desktop") && files.grep(*it).empty() ) { // First try to see if we have a comment describing the image. If we do // just use the first line of said comment. KFileMetaInfo metaInfo(*it); - QString imageCaption; + TQString imageCaption; if (metaInfo.isValid() && metaInfo.item("Comment").isValid()) imageCaption = metaInfo.item("Comment").string().section('\n', 0, 0); @@ -568,11 +568,11 @@ void BGDialog::loadWallpaperFilesList() { } // avoid name collisions - QString rs = imageCaption; - QString lrs = rs.lower(); + TQString rs = imageCaption; + TQString lrs = rs.lower(); for (int n = 1; papers.find(lrs) != papers.end(); ++n) { - rs = imageCaption + " (" + QString::number(n) + ')'; + rs = imageCaption + " (" + TQString::number(n) + ')'; lrs = rs.lower(); } papers[lrs] = qMakePair(rs, *it); @@ -583,7 +583,7 @@ void BGDialog::loadWallpaperFilesList() { comboWallpaper->clear(); m_wallpaper.clear(); int i = 0; - for (QMap >::Iterator it = papers.begin(); + for (TQMap >::Iterator it = papers.begin(); it != papers.end(); ++it) { @@ -593,7 +593,7 @@ void BGDialog::loadWallpaperFilesList() { } } -void BGDialog::setWallpaper(const QString &s) +void BGDialog::setWallpaper(const TQString &s) { KComboBox *comboWallpaper = m_urlWallpaperBox; comboWallpaper->blockSignals(true); @@ -601,7 +601,7 @@ void BGDialog::setWallpaper(const QString &s) if (m_wallpaper.find(s) == m_wallpaper.end()) { int i = comboWallpaper->count(); - QString imageCaption; + TQString imageCaption; int slash = s.findRev('/') + 1; int endDot = s.findRev('.'); @@ -628,13 +628,13 @@ void BGDialog::setWallpaper(const QString &s) void BGDialog::slotWallpaperSelection() { - KFileDialog dlg( QString::null, QString::null, this, + KFileDialog dlg( TQString::null, TQString::null, this, "file dialog", true ); KImageFilePreview* previewWidget = new KImageFilePreview(&dlg); dlg.setPreviewWidget(previewWidget); - QStringList mimeTypes = KImageIO::mimeTypes( KImageIO::Reading ); + TQStringList mimeTypes = KImageIO::mimeTypes( KImageIO::Reading ); #ifdef HAVE_LIBART mimeTypes += "image/svg+xml"; #endif @@ -643,8 +643,8 @@ void BGDialog::slotWallpaperSelection() dlg.setCaption( i18n("Select Wallpaper") ); int j = m_urlWallpaperBox->currentItem(); - QString uri; - for(QMap::ConstIterator it = m_wallpaper.begin(); + TQString uri; + for(TQMap::ConstIterator it = m_wallpaper.begin(); it != m_wallpaper.end(); ++it) { @@ -659,7 +659,7 @@ void BGDialog::slotWallpaperSelection() dlg.setSelection( uri ); } - if ( dlg.exec() == QDialog::Accepted ) + if ( dlg.exec() == TQDialog::Accepted ) { setWallpaper(dlg.selectedFile()); @@ -819,7 +819,7 @@ void BGDialog::slotPreviewDone(int desk_done, int screen_done) r->saveCacheFile(); KPixmap pm; - if (QPixmap::defaultDepth() < 15) + if (TQPixmap::defaultDepth() < 15) pm.convertFromImage(r->image(), KPixmap::LowColor); else pm.convertFromImage(r->image()); @@ -839,7 +839,7 @@ void BGDialog::slotPreviewDone(int desk_done, int screen_done) } } -void BGDialog::slotImageDropped(const QString &uri) +void BGDialog::slotImageDropped(const TQString &uri) { setWallpaper(uri); @@ -911,8 +911,8 @@ void BGDialog::slotWallpaperTypeChanged(int i) r->setMultiWallpaperMode(KBackgroundSettings::NoMultiRandom); int j = m_urlWallpaperBox->currentItem(); - QString path; - for(QMap::ConstIterator it = m_wallpaper.begin(); + TQString path; + for(TQMap::ConstIterator it = m_wallpaper.begin(); it != m_wallpaper.end(); ++it) { @@ -929,7 +929,7 @@ void BGDialog::slotWallpaperTypeChanged(int i) // If the image is greater than 800x600 default to using scaled mode, // otherwise default to tiled. - QSize s = metaInfo.item("Dimensions").value().toSize(); + TQSize s = metaInfo.item("Dimensions").value().toSize(); if (s.width() >= 800 && s.height() >= 600) m_wallpaperPos = KBackgroundSettings::Scaled; else @@ -997,7 +997,7 @@ void BGDialog::slotSetupMulti() KBackgroundRenderer *r = eRenderer(); BGMultiWallpaperDialog dlg(r, topLevelWidget()); - if (dlg.exec() == QDialog::Accepted) { + if (dlg.exec() == TQDialog::Accepted) { r->stop(); m_slideShowRandom = r->multiWallpaperMode(); r->setWallpaperMode(m_wallpaperPos); @@ -1008,7 +1008,7 @@ void BGDialog::slotSetupMulti() } } -void BGDialog::slotPrimaryColor(const QColor &color) +void BGDialog::slotPrimaryColor(const TQColor &color) { KBackgroundRenderer *r = eRenderer(); @@ -1023,7 +1023,7 @@ void BGDialog::slotPrimaryColor(const QColor &color) emit changed(true); } -void BGDialog::slotSecondaryColor(const QColor &color) +void BGDialog::slotSecondaryColor(const TQColor &color) { KBackgroundRenderer *r = eRenderer(); diff --git a/kcontrol/background/bgdialog.h b/kcontrol/background/bgdialog.h index 8782b73f7..30bb0f004 100644 --- a/kcontrol/background/bgdialog.h +++ b/kcontrol/background/bgdialog.h @@ -20,9 +20,9 @@ #ifndef _BGDIALOG_H_ #define _BGDIALOG_H_ -#include -#include -#include +#include +#include +#include #include "bgdialog_ui.h" #include "bgrender.h" @@ -36,7 +36,7 @@ class BGDialog : public BGDialog_UI { Q_OBJECT public: - BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop = true); + BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop = true); ~BGDialog(); void load( bool useDefaults ); @@ -45,7 +45,7 @@ public: void makeReadOnly(); - QString quickHelp() const; + TQString quickHelp() const; signals: void changed(bool); @@ -55,7 +55,7 @@ protected: void updateUI(); KBackgroundRenderer * eRenderer(); - void setWallpaper(const QString &); + void setWallpaper(const TQString &); void loadWallpaperFilesList(); @@ -68,10 +68,10 @@ protected slots: void slotWallpaperPos(int); void slotWallpaperSelection(); void slotSetupMulti(); - void slotPrimaryColor(const QColor &color); - void slotSecondaryColor(const QColor &color); + void slotPrimaryColor(const TQColor &color); + void slotSecondaryColor(const TQColor &color); void slotPattern(int pattern); - void slotImageDropped(const QString &uri); + void slotImageDropped(const TQString &uri); void slotPreviewDone(int desk, int screen); void slotAdvanced(); void slotGetNewStuff(); @@ -95,9 +95,9 @@ protected: int m_screen; int m_eDesk; int m_eScreen; - QValueVector< QPtrVector > m_renderer; // m_renderer[desk][screen] - QMap m_wallpaper; - QStringList m_patterns; + TQValueVector< TQPtrVector > m_renderer; // m_renderer[desk][screen] + TQMap m_wallpaper; + TQStringList m_patterns; int m_slideShowRandom; // Remembers last Slide Show setting int m_wallpaperPos; // Remembers last wallpaper pos diff --git a/kcontrol/background/bghash.h b/kcontrol/background/bghash.h index 932c6ebab..ab13daf90 100644 --- a/kcontrol/background/bghash.h +++ b/kcontrol/background/bghash.h @@ -2,13 +2,13 @@ #define BGHASH_H /* - * QString -> int hash. From Qt's QGDict::hashKeyString(). + * TQString -> int hash. From Qt's TQGDict::hashKeyString(). */ -static int QHash(QString key) +static int QHash(TQString key) { int g, h = 0; - const QChar *p = key.unicode(); + const TQChar *p = key.unicode(); 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 6af2f7458..f78a7b616 100644 --- a/kcontrol/background/bgmonitor.cpp +++ b/kcontrol/background/bgmonitor.cpp @@ -27,9 +27,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "bgmonitor.h" @@ -38,17 +38,17 @@ // Geometry of "display" part of monitor image: (23,14)-[151x115] //BEGIN class BGMonitorArrangement -BGMonitorArrangement::BGMonitorArrangement(QWidget *parent, const char *name) - : QWidget(parent, name) +BGMonitorArrangement::BGMonitorArrangement(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - m_pBGMonitor.resize( QApplication::desktop()->numScreens(), 0l ); + m_pBGMonitor.resize( TQApplication::desktop()->numScreens(), 0l ); - for (int screen = 0; screen < QApplication::desktop()->numScreens(); ++screen) + for (int screen = 0; screen < TQApplication::desktop()->numScreens(); ++screen) { BGMonitorLabel * label = new BGMonitorLabel(this); m_pBGMonitor[screen] = label; - connect( label->monitor(), SIGNAL(imageDropped(const QString &)), this, SIGNAL(imageDropped(const QString &)) ); + connect( label->monitor(), TQT_SIGNAL(imageDropped(const TQString &)), this, TQT_SIGNAL(imageDropped(const TQString &)) ); } parent->setFixedSize(200, 186); @@ -63,27 +63,27 @@ BGMonitor * BGMonitorArrangement::monitor( unsigned screen ) const } -QRect BGMonitorArrangement::expandToPreview( QRect r ) const +TQRect BGMonitorArrangement::expandToPreview( TQRect r ) const { double scaleX = 200.0 / 151.0; double scaleY = 186.0 / 115.0; - return QRect( int(r.x()*scaleX), int(r.y()*scaleY), int(r.width()*scaleX), int(r.height()*scaleY) ); + return TQRect( int(r.x()*scaleX), int(r.y()*scaleY), int(r.width()*scaleX), int(r.height()*scaleY) ); } -QSize BGMonitorArrangement::expandToPreview( QSize s ) const +TQSize BGMonitorArrangement::expandToPreview( TQSize s ) const { double scaleX = 200.0 / 151.0; double scaleY = 186.0 / 115.0; - return QSize( int(s.width()*scaleX), int(s.height()*scaleY) ); + return TQSize( int(s.width()*scaleX), int(s.height()*scaleY) ); } -QPoint BGMonitorArrangement::expandToPreview( QPoint p ) const +TQPoint BGMonitorArrangement::expandToPreview( TQPoint p ) const { double scaleX = 200.0 / 151.0; double scaleY = 186.0 / 115.0; - return QPoint( int(p.x()*scaleX), int(p.y()*scaleY) ); + return TQPoint( int(p.x()*scaleX), int(p.y()*scaleY) ); } @@ -94,11 +94,11 @@ void BGMonitorArrangement::updateArrangement() // image that contains the preview of the background. The monitor image // will set the background preview back to the normal value. - QRect overallGeometry; - for (int screen = 0; screen < QApplication::desktop()->numScreens(); ++screen) - overallGeometry |= QApplication::desktop()->screenGeometry(screen); + TQRect overallGeometry; + for (int screen = 0; screen < TQApplication::desktop()->numScreens(); ++screen) + overallGeometry |= TQApplication::desktop()->screenGeometry(screen); - QRect expandedOverallGeometry = expandToPreview(overallGeometry); + TQRect expandedOverallGeometry = expandToPreview(overallGeometry); double scale = QMIN( double(width()) / double(expandedOverallGeometry.width()), @@ -107,16 +107,16 @@ void BGMonitorArrangement::updateArrangement() m_combinedPreviewSize = overallGeometry.size() * scale; - m_maxPreviewSize = QSize(0,0); + m_maxPreviewSize = TQSize(0,0); int previousMax = 0; - for (int screen = 0; screen < QApplication::desktop()->numScreens(); ++screen) + for (int screen = 0; screen < TQApplication::desktop()->numScreens(); ++screen) { - QPoint topLeft = (QApplication::desktop()->screenGeometry(screen).topLeft() - overallGeometry.topLeft()) * scale; - QPoint expandedTopLeft = expandToPreview(topLeft); + TQPoint topLeft = (TQApplication::desktop()->screenGeometry(screen).topLeft() - overallGeometry.topLeft()) * scale; + TQPoint expandedTopLeft = expandToPreview(topLeft); - QSize previewSize = QApplication::desktop()->screenGeometry(screen).size() * scale; - QSize expandedPreviewSize = expandToPreview(previewSize); + TQSize previewSize = TQApplication::desktop()->screenGeometry(screen).size() * scale; + TQSize expandedPreviewSize = expandToPreview(previewSize); if ( (previewSize.width() * previewSize.height()) > previousMax ) { @@ -124,16 +124,16 @@ void BGMonitorArrangement::updateArrangement() m_maxPreviewSize = previewSize; } - m_pBGMonitor[screen]->setPreviewPosition( QRect( topLeft, previewSize ) ); - m_pBGMonitor[screen]->setGeometry( QRect( expandedTopLeft, expandedPreviewSize ) ); + m_pBGMonitor[screen]->setPreviewPosition( TQRect( topLeft, previewSize ) ); + m_pBGMonitor[screen]->setGeometry( TQRect( expandedTopLeft, expandedPreviewSize ) ); m_pBGMonitor[screen]->updateMonitorGeometry(); } } -void BGMonitorArrangement::resizeEvent( QResizeEvent * e ) +void BGMonitorArrangement::resizeEvent( TQResizeEvent * e ) { - QWidget::resizeEvent(e); + TQWidget::resizeEvent(e); updateArrangement(); } @@ -142,9 +142,9 @@ void BGMonitorArrangement::setPixmap( const KPixmap & pm ) { for (unsigned screen = 0; screen < m_pBGMonitor.size(); ++screen) { - QRect position = m_pBGMonitor[screen]->previewPosition(); + TQRect position = m_pBGMonitor[screen]->previewPosition(); - QPixmap monitorPixmap( position.size(), pm.depth() ); + TQPixmap monitorPixmap( position.size(), pm.depth() ); copyBlt( &monitorPixmap, 0, 0, &pm, position.x(), position.y(), position.width(), position.height() ); m_pBGMonitor[screen]->monitor()->setPixmap(monitorPixmap); } @@ -154,15 +154,15 @@ void BGMonitorArrangement::setPixmap( const KPixmap & pm ) //BEGIN class BGMonitorLabel -BGMonitorLabel::BGMonitorLabel(QWidget *parent, const char *name) - : QLabel(parent, name) +BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name) + : TQLabel(parent, name) { setAlignment(AlignCenter); setScaledContents(true); - setPixmap( QPixmap( locate("data", "kcontrol/pics/monitor.png") ) ); + setPixmap( TQPixmap( locate("data", "kcontrol/pics/monitor.png") ) ); m_pBGMonitor = new BGMonitor(this); - QWhatsThis::add( this, i18n("This picture of a monitor contains a preview of what the current settings will look like on your desktop.") ); + TQWhatsThis::add( this, i18n("This picture of a monitor contains a preview of what the current settings will look like on your desktop.") ); } @@ -171,14 +171,14 @@ void BGMonitorLabel::updateMonitorGeometry() double scaleX = double(width()) / double(sizeHint().width()); double scaleY = double(height()) / double(sizeHint().height()); - kdDebug() << k_funcinfo << " Setting geometry to " << QRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl; + 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) ); } -void BGMonitorLabel::resizeEvent( QResizeEvent * e ) +void BGMonitorLabel::resizeEvent( TQResizeEvent * e ) { - QWidget::resizeEvent(e); + TQWidget::resizeEvent(e); updateMonitorGeometry(); } //END class BGMonitorLabel @@ -186,8 +186,8 @@ void BGMonitorLabel::resizeEvent( QResizeEvent * e ) //BEGIN class BGMonitor -BGMonitor::BGMonitor(QWidget *parent, const char *name) - : QLabel(parent, name) +BGMonitor::BGMonitor(TQWidget *parent, const char *name) + : TQLabel(parent, name) { setAlignment(AlignCenter); setScaledContents(true); @@ -195,7 +195,7 @@ BGMonitor::BGMonitor(QWidget *parent, const char *name) } -void BGMonitor::dropEvent(QDropEvent *e) +void BGMonitor::dropEvent(TQDropEvent *e) { if (!KURLDrag::canDecode(e)) return; @@ -208,7 +208,7 @@ void BGMonitor::dropEvent(QDropEvent *e) } } -void BGMonitor::dragEnterEvent(QDragEnterEvent *e) +void BGMonitor::dragEnterEvent(TQDragEnterEvent *e) { if (KURLDrag::canDecode(e)) e->accept(rect()); diff --git a/kcontrol/background/bgmonitor.h b/kcontrol/background/bgmonitor.h index 1e714194e..92cf5eef4 100644 --- a/kcontrol/background/bgmonitor.h +++ b/kcontrol/background/bgmonitor.h @@ -25,9 +25,9 @@ #ifndef _BGMONITOR_H_ #define _BGMONITOR_H_ -#include -#include -#include +#include +#include +#include class BGMonitor; class BGMonitorLabel; @@ -41,32 +41,32 @@ class BGMonitorArrangement : public QWidget { Q_OBJECT public: - BGMonitorArrangement(QWidget *parent, const char *name=0L); + BGMonitorArrangement(TQWidget *parent, const char *name=0L); /** * Splits up the pixmap according to monitor geometries and sets each * BGMonitor pixmap accordingly. */ void setPixmap( const KPixmap & pm ); - QSize combinedPreviewSize() const { return m_combinedPreviewSize; } - QSize maxPreviewSize() const { return m_maxPreviewSize; } + TQSize combinedPreviewSize() const { return m_combinedPreviewSize; } + TQSize maxPreviewSize() const { return m_maxPreviewSize; } unsigned numMonitors() const { return m_pBGMonitor.size(); } BGMonitor * monitor( unsigned screen ) const; void updateArrangement(); signals: - void imageDropped(const QString &); + void imageDropped(const TQString &); protected: - virtual void resizeEvent( QResizeEvent * ); - QRect expandToPreview( QRect r ) const; - QSize expandToPreview( QSize s ) const; - QPoint expandToPreview( QPoint p ) const; + virtual void resizeEvent( TQResizeEvent * ); + TQRect expandToPreview( TQRect r ) const; + TQSize expandToPreview( TQSize s ) const; + TQPoint expandToPreview( TQPoint p ) const; - QValueVector m_pBGMonitor; - QSize m_combinedPreviewSize; - QSize m_maxPreviewSize; + TQValueVector m_pBGMonitor; + TQSize m_combinedPreviewSize; + TQSize m_maxPreviewSize; }; /** @@ -75,18 +75,18 @@ protected: class BGMonitorLabel : public QLabel { public: - BGMonitorLabel(QWidget *parent, const char *name=0L); + BGMonitorLabel(TQWidget *parent, const char *name=0L); BGMonitor * monitor() const { return m_pBGMonitor; } void updateMonitorGeometry(); - void setPreviewPosition( QRect r ) { m_previewPosition = r; } - QRect previewPosition() const { return m_previewPosition; } + void setPreviewPosition( TQRect r ) { m_previewPosition = r; } + TQRect previewPosition() const { return m_previewPosition; } protected: - virtual void resizeEvent( QResizeEvent * ); + virtual void resizeEvent( TQResizeEvent * ); BGMonitor * m_pBGMonitor; - QRect m_previewPosition; + TQRect m_previewPosition; }; @@ -97,14 +97,14 @@ class BGMonitor : public QLabel { Q_OBJECT public: - BGMonitor(QWidget *parent, const char *name=0L); + BGMonitor(TQWidget *parent, const char *name=0L); signals: - void imageDropped(const QString &); + void imageDropped(const TQString &); protected: - virtual void dropEvent(QDropEvent *); - virtual void dragEnterEvent(QDragEnterEvent *); + virtual void dropEvent(TQDropEvent *); + virtual void dragEnterEvent(TQDragEnterEvent *); }; diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index 47d52b193..4aca82145 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -14,11 +14,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -61,8 +61,8 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou m_Cached = false; m_TilingEnabled = false; - m_pTimer = new QTimer(this); - connect(m_pTimer, SIGNAL(timeout()), SLOT(render())); + m_pTimer = new TQTimer(this); + connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(render())); } @@ -74,7 +74,7 @@ KBackgroundRenderer::~KBackgroundRenderer() } -void KBackgroundRenderer::setSize(const QSize &size) +void KBackgroundRenderer::setSize(const TQSize &size) { m_rSize = m_Size = size; } @@ -91,7 +91,7 @@ void KBackgroundRenderer::desktopResized() } -void KBackgroundRenderer::tile(QImage& dest, QRect rect, const QImage& src) +void KBackgroundRenderer::tile(TQImage& dest, TQRect rect, const TQImage& src) { rect &= dest.rect(); @@ -110,19 +110,19 @@ void KBackgroundRenderer::tile(QImage& dest, QRect rect, const QImage& src) * Build a command line to run the program. */ -QString KBackgroundRenderer::buildCommand() +TQString KBackgroundRenderer::buildCommand() { - QString num; + TQString num; int pos = 0; - QString cmd; + TQString cmd; if (m_bPreview) cmd = previewCommand(); else cmd = command(); if (cmd.isEmpty()) - return QString(); + return TQString(); while ((pos = cmd.find('%', pos)) != -1) { @@ -182,13 +182,13 @@ int KBackgroundRenderer::doBackground(bool quit) } int retval = Done; - QString file; + TQString file; static unsigned int tileWidth = 0; static unsigned int tileHeight = 0; if( tileWidth == 0 ) { - int tile_val = QPixmap::defaultDepth() >= 24 ? 1 : 2; + 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 ) @@ -238,15 +238,15 @@ int KBackgroundRenderer::doBackground(bool quit) delete m_pProc; m_pProc = new KShellProcess; *m_pProc << file; - connect(m_pProc, SIGNAL(processExited(KProcess *)), - SLOT(slotBackgroundDone(KProcess *))); + connect(m_pProc, TQT_SIGNAL(processExited(KProcess *)), + TQT_SLOT(slotBackgroundDone(KProcess *))); m_pProc->start(KShellProcess::NotifyOnExit); retval = Wait; break; case HorizontalGradient: { - QSize size = m_Size; + TQSize size = m_Size; // on <16bpp displays the gradient sucks when tiled because of dithering if( canTile()) size.setHeight( tileHeight ); @@ -256,7 +256,7 @@ int KBackgroundRenderer::doBackground(bool quit) } case VerticalGradient: { - QSize size = m_Size; + TQSize size = m_Size; // on <16bpp displays the gradient sucks when tiled because of dithering if( canTile()) size.setWidth( tileWidth ); @@ -298,14 +298,14 @@ int KBackgroundRenderer::doWallpaper(bool quit) int wpmode= enabled()?wallpaperMode():NoWallpaper; - m_Wallpaper = QImage(); + m_Wallpaper = TQImage(); if (wpmode != NoWallpaper) { wp_load: if (currentWallpaper().isEmpty()) { wpmode = NoWallpaper; goto wp_out; } - QString file = m_pDirs->findResource("wallpaper", currentWallpaper()); + TQString file = m_pDirs->findResource("wallpaper", currentWallpaper()); if (file.isEmpty()) { wpmode = NoWallpaper; goto wp_out; @@ -362,7 +362,7 @@ wp_load: } if (svgEngine->load(svgWidth, svgHeight, file )) { - QImage *image = svgEngine->image(); + TQImage *image = svgEngine->image(); m_Wallpaper = *image; delete image; } else { @@ -394,7 +394,7 @@ wp_load: { xs = ys = 1; } - if( m_Wallpaper.size() != QSize( xs, ys )) + if( m_Wallpaper.size() != TQSize( xs, ys )) m_Wallpaper = m_Wallpaper.smoothScale(xs, ys); } @@ -456,7 +456,7 @@ wp_out: int ww = m_Wallpaper.width(); // wallpaper width/height int wh = m_Wallpaper.height(); - m_WallpaperRect = QRect(); // to be filled destination rectangle; may exceed desktop! + m_WallpaperRect = TQRect(); // to be filled destination rectangle; may exceed desktop! switch (wpmode) { @@ -474,7 +474,7 @@ wp_out: case Scaled: ww = w; wh = h; - if( m_WallpaperRect.size() != QSize( w, h )) + if( m_WallpaperRect.size() != TQSize( w, h )) m_Wallpaper = m_Wallpaper.smoothScale( w, h ); m_WallpaperRect.setRect(0, 0, w, h); break; @@ -495,7 +495,7 @@ wp_out: wh = (int)(sx * wh); ww = w; } - if( m_WallpaperRect.size() != QSize( ww, wh )) + if( m_WallpaperRect.size() != TQSize( ww, wh )) m_Wallpaper = m_Wallpaper.smoothScale(ww, wh); m_WallpaperRect.setRect((w - ww) / 2, (h - wh) / 2, ww, wh); break; @@ -511,7 +511,7 @@ wp_out: wh = (int)(sx * wh); ww = w; } - if( m_WallpaperRect.size() != QSize( ww, wh )) + if( m_WallpaperRect.size() != TQSize( ww, wh )) m_Wallpaper = m_Wallpaper.smoothScale(ww, wh); m_WallpaperRect.setRect(0, 0, w, h); break; @@ -529,7 +529,7 @@ wp_out: wh = h; ww = (int)(sy*ww); } - if( m_WallpaperRect.size() != QSize( ww, wh )) + if( m_WallpaperRect.size() != TQSize( ww, wh )) m_Wallpaper = m_Wallpaper.smoothScale(ww, wh); m_WallpaperRect.setRect((w - ww) / 2, (h - wh) / 2,w, h); break; @@ -563,10 +563,10 @@ void KBackgroundRenderer::wallpaperBlend() } // works only for NoBlending and no alpha in wallpaper -// but is much faster than QImage fidling +// but is much faster than TQImage fidling void KBackgroundRenderer::fastWallpaperBlend() { - m_Image = QImage(); + m_Image = TQImage(); // copy background to m_pPixmap if( !enabled() || (wallpaperMode() == NoWallpaper && canTile())) { // if there's no wallpaper, no need to tile the pixmap to the size of desktop, as X does @@ -584,22 +584,22 @@ void KBackgroundRenderer::fastWallpaperBlend() m_Pixmap.convertFromImage( m_Wallpaper ); return; } - else if( m_WallpaperRect.contains( QRect( QPoint( 0, 0 ), m_Size )) + else if( m_WallpaperRect.contains( TQRect( TQPoint( 0, 0 ), m_Size )) && !m_Wallpaper.hasAlphaBuffer()) // wallpaper covers all and no blending - m_Pixmap = QPixmap( m_Size ); + m_Pixmap = TQPixmap( m_Size ); else if (m_Background.size() == m_Size) m_Pixmap.convertFromImage( m_Background ); else { - m_Pixmap = QPixmap( m_Size ); - QPainter p( &m_Pixmap ); - QPixmap pm; + m_Pixmap = TQPixmap( m_Size ); + TQPainter p( &m_Pixmap ); + TQPixmap pm; pm.convertFromImage( m_Background ); p.drawTiledPixmap( 0, 0, m_Size.width(), m_Size.height(), pm ); } // paint/alpha-blend wallpaper to destination rectangle of m_pPixmap if (m_WallpaperRect.isValid()) { - QPixmap wp_pixmap; + TQPixmap wp_pixmap; if( useShm() && !m_Wallpaper.hasAlphaBuffer()) { KPixmapIO io; wp_pixmap = io.convertToPixmap( m_Wallpaper ); @@ -619,7 +619,7 @@ void KBackgroundRenderer::fastWallpaperBlend() void KBackgroundRenderer::fullWallpaperBlend() { - m_Pixmap = QPixmap(); + m_Pixmap = TQPixmap(); int w = m_Size.width(); // desktop width/height int h = m_Size.height(); // copy background to m_pImage @@ -631,7 +631,7 @@ void KBackgroundRenderer::fullWallpaperBlend() } else { m_Image.create(w, h, 32); - tile(m_Image, QRect(0, 0, w, h), m_Background); + tile(m_Image, TQRect(0, 0, w, h), m_Background); } // blend wallpaper to destination rectangle of m_pImage @@ -644,8 +644,8 @@ void KBackgroundRenderer::fullWallpaperBlend() int wh = m_Wallpaper.height(); for (int y = m_WallpaperRect.top(); y < m_WallpaperRect.bottom(); y += wh) { for (int x = m_WallpaperRect.left(); x < m_WallpaperRect.right(); x += ww) { - blend(m_Image, QRect(x, y, ww, wh), m_Wallpaper, - QPoint(-QMIN(x, 0), -QMIN(y, 0)), blendFactor); + blend(m_Image, TQRect(x, y, ww, wh), m_Wallpaper, + TQPoint(-QMIN(x, 0), -QMIN(y, 0)), blendFactor); } } } @@ -714,10 +714,10 @@ void KBackgroundRenderer::fullWallpaperBlend() } /* Alpha blend an area from with offset to rectangle of - * Default offset is QPoint(0, 0). + * Default offset is TQPoint(0, 0). * blendfactor = [0, 100%] */ -void KBackgroundRenderer::blend(QImage& dst, QRect dr, const QImage& src, QPoint soffs, int blendFactor) +void KBackgroundRenderer::blend(TQImage& dst, TQRect dr, const TQImage& src, TQPoint soffs, int blendFactor) { int x, y, a; dr &= dst.rect(); @@ -785,17 +785,17 @@ void KBackgroundRenderer::render() return; if( !(m_State & InitCheck)) { - QString f = cacheFileName(); + TQString f = cacheFileName(); if( useCacheFile()) { - QString w = m_pDirs->findResource("wallpaper", currentWallpaper()); - QFileInfo wi( w ); - QFileInfo fi( f ); + TQString w = m_pDirs->findResource("wallpaper", currentWallpaper()); + TQFileInfo wi( w ); + TQFileInfo fi( f ); if( wi.lastModified().isValid() && fi.lastModified().isValid() && wi.lastModified() < fi.lastModified()) { - QImage im; + TQImage im; if( im.load( f, "PNG" )) { m_Image = im; - m_Pixmap = QPixmap( m_Size ); + m_Pixmap = TQPixmap( m_Size ); m_Pixmap.convertFromImage( m_Image ); m_Cached = true; m_State |= InitCheck | BackgroundDone | WallpaperDone; @@ -857,9 +857,9 @@ void KBackgroundRenderer::setBusyCursor(bool isBusy) { return; m_isBusyCursor = isBusy; if(isBusy) - QApplication::setOverrideCursor( KCursor::workingCursor() ); + TQApplication::setOverrideCursor( KCursor::workingCursor() ); else - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } /* @@ -882,18 +882,18 @@ void KBackgroundRenderer::stop() void KBackgroundRenderer::cleanup() { setBusyCursor(false); - m_Background = QImage(); - m_Image = QImage(); - m_Pixmap = QPixmap(); - m_Wallpaper = QImage(); + m_Background = TQImage(); + m_Image = TQImage(); + m_Pixmap = TQPixmap(); + m_Wallpaper = TQImage(); delete m_pProc; m_pProc = 0L; m_State = 0; - m_WallpaperRect = QRect(); + m_WallpaperRect = TQRect(); m_Cached = false; } -void KBackgroundRenderer::setPreview(const QSize &size) +void KBackgroundRenderer::setPreview(const TQSize &size) { if (size.isNull()) m_bPreview = false; @@ -904,24 +904,24 @@ void KBackgroundRenderer::setPreview(const QSize &size) } -QPixmap KBackgroundRenderer::pixmap() +TQPixmap KBackgroundRenderer::pixmap() { if (m_State & AllDone) { if( m_Pixmap.isNull()) m_Pixmap.convertFromImage( m_Image ); return m_Pixmap; } - return QPixmap(); + return TQPixmap(); } -QImage KBackgroundRenderer::image() +TQImage KBackgroundRenderer::image() { if (m_State & AllDone) { if( m_Image.isNull()) fullWallpaperBlend(); // create from m_Pixmap return m_Image; } - return QImage(); + return TQImage(); } @@ -943,12 +943,12 @@ void KBackgroundRenderer::createTempFile() m_Tempfile = new KTempFile(); } -QString KBackgroundRenderer::cacheFileName() +TQString KBackgroundRenderer::cacheFileName() { - QString f = fingerprint(); + TQString f = fingerprint(); f.replace ( ':', '_' ); // avoid characters that shouldn't be in filenames f.replace ( '/', '#' ); - f = locateLocal( "cache", QString( "background/%1x%2_%3.png" ) + f = locateLocal( "cache", TQString( "background/%1x%2_%3.png" ) .arg( m_Size.width()).arg( m_Size.height()).arg( f )); return f; } @@ -961,7 +961,7 @@ bool KBackgroundRenderer::useCacheFile() const return false; // don't cache these at all if( wallpaperMode() == NoWallpaper ) return false; // generating only background patterns should be always faster - QString file = currentWallpaper(); + TQString file = currentWallpaper(); if( file.endsWith(".svg") || file.endsWith(".svgz")) return true; // cache these, they can be bloody slow switch( backgroundMode()) @@ -989,21 +989,21 @@ void KBackgroundRenderer::saveCacheFile() return; if( m_Image.isNull()) fullWallpaperBlend(); // generate from m_Pixmap - QString f = cacheFileName(); + TQString f = cacheFileName(); if( KStandardDirs::exists( f ) || m_Cached ) - utime( QFile::encodeName( f ), NULL ); + utime( TQFile::encodeName( f ), NULL ); else { m_Image.save( f, "PNG" ); // remove old entries from the cache - QDir dir( locateLocal( "cache", "background/" )); - if( const QFileInfoList* list = dir.entryInfoList( "*.png", QDir::Files, QDir::Time | QDir::Reversed )) { + TQDir dir( locateLocal( "cache", "background/" )); + if( const QFileInfoList* list = dir.entryInfoList( "*.png", TQDir::Files, TQDir::Time | TQDir::Reversed )) { int size = 0; for( QFileInfoListIterator it( *list ); - QFileInfo* info = it.current(); + TQFileInfo* info = it.current(); ++it ) size += info->size(); for( QFileInfoListIterator it( *list ); - QFileInfo* info = it.current(); + TQFileInfo* info = it.current(); ++it ) { if( size < 8 * 1024 * 1024 ) break; @@ -1012,7 +1012,7 @@ void KBackgroundRenderer::saveCacheFile() && ( time_t ) info->lastModified().toTime_t() >= time( NULL ) - 10 * 60 ) break; size -= info->size(); - QFile::remove( info->absFilePath()); + TQFile::remove( info->absFilePath()); } } } @@ -1032,7 +1032,7 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config ) int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString configname; + TQCString configname; if (screen_number == 0) configname = "kdesktoprc"; else @@ -1067,7 +1067,7 @@ KBackgroundRenderer * KVirtualBGRenderer::renderer(unsigned screen) } -QPixmap KVirtualBGRenderer::pixmap() +TQPixmap KVirtualBGRenderer::pixmap() { if (m_numRenderers == 1) return m_renderer[0]->pixmap(); @@ -1123,7 +1123,7 @@ void KVirtualBGRenderer::changeWallpaper() int KVirtualBGRenderer::hash() { - QString fp; + TQString fp; for (unsigned i=0; ifingerprint(); @@ -1158,7 +1158,7 @@ void KVirtualBGRenderer::desktopResized() if (m_pPixmap) { delete m_pPixmap; - m_pPixmap = new QPixmap(m_size); + m_pPixmap = new TQPixmap(m_size); m_pPixmap->fill(Qt::black); } @@ -1166,7 +1166,7 @@ void KVirtualBGRenderer::desktopResized() } -void KVirtualBGRenderer::setPreview(const QSize & size) +void KVirtualBGRenderer::setPreview(const TQSize & size) { if (m_size == size) return; @@ -1177,22 +1177,22 @@ void KVirtualBGRenderer::setPreview(const QSize & size) m_pPixmap->resize(m_size); // Scaling factors - m_scaleX = float(m_size.width()) / float(QApplication::desktop()->size().width()); - m_scaleY = float(m_size.height()) / float(QApplication::desktop()->size().height()); + m_scaleX = float(m_size.width()) / float(TQApplication::desktop()->size().width()); + m_scaleY = float(m_size.height()) / float(TQApplication::desktop()->size().height()); // Scale renderers appropriately for (unsigned i=0; isetPreview( QSize( + m_renderer[i]->setPreview( TQSize( int(unscaledRendererSize.width() * m_scaleX), int(unscaledRendererSize.height() * m_scaleY) ) ); } } -QSize KVirtualBGRenderer::renderSize(int screen) +TQSize KVirtualBGRenderer::renderSize(int screen) { return m_bDrawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size(); } @@ -1201,7 +1201,7 @@ QSize KVirtualBGRenderer::renderSize(int screen) void KVirtualBGRenderer::initRenderers() { m_pConfig->setGroup("Background Common"); - m_bDrawBackgroundPerScreen = m_pConfig->readBoolEntry( QString("DrawBackgroundPerScreen_%1").arg(m_desk), _defDrawBackgroundPerScreen ); + m_bDrawBackgroundPerScreen = m_pConfig->readBoolEntry( TQString("DrawBackgroundPerScreen_%1").arg(m_desk), _defDrawBackgroundPerScreen ); m_bCommonScreen = m_pConfig->readBoolEntry("CommonScreen", _defCommonScreen); @@ -1223,7 +1223,7 @@ void KVirtualBGRenderer::initRenderers() KBackgroundRenderer * r = new KBackgroundRenderer( m_desk, eScreen, m_bDrawBackgroundPerScreen, m_pConfig ); m_renderer.insert( i, r ); r->setSize(renderSize(i)); - connect( r, SIGNAL(imageDone(int,int)), this, SLOT(screenDone(int,int)) ); + connect( r, TQT_SIGNAL(imageDone(int,int)), this, TQT_SLOT(screenDone(int,int)) ); } } @@ -1263,21 +1263,21 @@ void KVirtualBGRenderer::screenDone(int _desk, int _screen) { // There's more than one renderer, so we are drawing each output to our own pixmap - QRect overallGeometry; + TQRect overallGeometry; for (int i=0; i < KApplication::desktop()->numScreens(); ++i) { overallGeometry |= KApplication::desktop()->screenGeometry(i); } - QPoint drawPos = KApplication::desktop()->screenGeometry(screen).topLeft() - overallGeometry.topLeft(); + TQPoint drawPos = KApplication::desktop()->screenGeometry(screen).topLeft() - overallGeometry.topLeft(); drawPos.setX( int(drawPos.x() * m_scaleX) ); drawPos.setY( int(drawPos.y() * m_scaleY) ); - QPixmap source = m_renderer[screen]->pixmap(); - QSize renderSize = this->renderSize(screen); + TQPixmap source = m_renderer[screen]->pixmap(); + TQSize renderSize = this->renderSize(screen); renderSize.setWidth( int(renderSize.width() * m_scaleX) ); renderSize.setHeight( int(renderSize.height() * m_scaleY) ); - QPainter p(m_pPixmap); + TQPainter p(m_pPixmap); if (renderSize == source.size()) p.drawPixmap( drawPos, source ); @@ -1308,7 +1308,7 @@ void KVirtualBGRenderer::start() if (m_numRenderers > 1) { - m_pPixmap = new QPixmap(m_size); + m_pPixmap = new TQPixmap(m_size); // If are screen sizes do not properly tile the overall virtual screen // size, then we want the untiled parts to be black for use in desktop // previews, etc diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h index 39e00ff5d..055512618 100644 --- a/kcontrol/background/bgrender.h +++ b/kcontrol/background/bgrender.h @@ -11,10 +11,10 @@ #ifndef BGRender_h_Included #define BGRender_h_Included -#include -#include -#include -#include +#include +#include +#include +#include #include "bgsettings.h" @@ -30,13 +30,13 @@ class KShellProcess; class KStandardDirs; /** - * This class renders a desktop background to a QImage. The operation is + * This class renders a desktop background to a TQImage. The operation is * asynchronous: connect to the signal imageDone() to find out when the * rendering is finished. It also has support for preview images, like * the monitor in kcmdisplay. */ class KBackgroundRenderer: - public QObject, + public TQObject, public KBackgroundSettings { Q_OBJECT @@ -47,11 +47,11 @@ public: void load(int desk, int screen, bool drawBackgroundPerScreen, bool reparseConfig=true); - void setPreview(const QSize &size); - void setSize(const QSize &size); + void setPreview(const TQSize &size); + void setSize(const TQSize &size); - QPixmap pixmap(); - QImage image(); + TQPixmap pixmap(); + TQImage image(); bool isActive() { return m_State & Rendering; } void cleanup(); void saveCacheFile(); @@ -79,10 +79,10 @@ private: WallpaperStarted = 0x10, WallpaperDone = 0x20, AllDone = 0x40 }; - QString buildCommand(); + TQString buildCommand(); void createTempFile(); - void tile(QImage& dst, QRect rect, const QImage& src); - void blend(QImage& dst, QRect dr, const QImage& src, QPoint soffs = QPoint(0, 0), int blendFactor=100); + void tile(TQImage& dst, TQRect rect, const TQImage& src); + void blend(TQImage& dst, TQRect dr, const TQImage& src, TQPoint soffs = TQPoint(0, 0), int blendFactor=100); void wallpaperBlend(); void fastWallpaperBlend(); @@ -91,7 +91,7 @@ private: int doBackground(bool quit=false); int doWallpaper(bool quit=false); void setBusyCursor(bool isBusy); - QString cacheFileName(); + TQString cacheFileName(); bool useCacheFile() const; bool canTile() const; @@ -103,11 +103,11 @@ private: bool m_TilingEnabled; KTempFile* m_Tempfile; - QSize m_Size, m_rSize; - QRect m_WallpaperRect; - QImage m_Image, m_Background, m_Wallpaper; - QPixmap m_Pixmap; - QTimer *m_pTimer; + TQSize m_Size, m_rSize; + TQRect m_WallpaperRect; + TQImage m_Image, m_Background, m_Wallpaper; + TQPixmap m_Pixmap; + TQTimer *m_pTimer; KStandardDirs *m_pDirs; KShellProcess *m_pProc; @@ -130,9 +130,9 @@ public: KBackgroundRenderer * renderer(unsigned screen); unsigned numRenderers() const { return m_numRenderers; } - QPixmap pixmap(); + TQPixmap pixmap(); - void setPreview(const QSize & size); + void setPreview(const TQSize & size); bool needProgramUpdate(); void programUpdate(); @@ -159,7 +159,7 @@ private slots: void screenDone(int desk, int screen); private: - QSize renderSize(int screen); // the size the renderer should be + TQSize renderSize(int screen); // the size the renderer should be void initRenderers(); KConfig *m_pConfig; @@ -170,11 +170,11 @@ private: bool m_bDrawBackgroundPerScreen; bool m_bCommonScreen; bool m_bDeleteConfig; - QSize m_size; + TQSize m_size; - QMemArray m_bFinished; - QPtrVector m_renderer; - QPixmap *m_pPixmap; + TQMemArray m_bFinished; + TQPtrVector m_renderer; + TQPixmap *m_pPixmap; }; diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index 9b657393f..8d3bdac0f 100644 --- a/kcontrol/background/bgsettings.cpp +++ b/kcontrol/background/bgsettings.cpp @@ -17,8 +17,8 @@ #undef Bool #undef Unsorted -#include -#include +#include +#include #include #include @@ -37,7 +37,7 @@ /**** KBackgroundPattern ****/ -KBackgroundPattern::KBackgroundPattern(QString name) +KBackgroundPattern::KBackgroundPattern(TQString name) { dirty = false; hashdirty = true; @@ -70,7 +70,7 @@ void KBackgroundPattern::copyConfig(const KBackgroundPattern *settings) m_File = settings->m_File; } -void KBackgroundPattern::load(QString name) +void KBackgroundPattern::load(TQString name) { m_Name = name; init(); @@ -91,12 +91,12 @@ void KBackgroundPattern::init(bool force_rw) m_pConfig->setGroup("KDE Desktop Pattern"); - QFileInfo fi(m_File); + TQFileInfo fi(m_File); m_bReadOnly = !fi.isWritable(); } -void KBackgroundPattern::setComment(const QString &comment) +void KBackgroundPattern::setComment(const TQString &comment) { if (m_Comment == comment) return; @@ -105,7 +105,7 @@ void KBackgroundPattern::setComment(const QString &comment) } -void KBackgroundPattern::setPattern(QString pattern) +void KBackgroundPattern::setPattern(TQString pattern) { if (m_Pattern == pattern) return; @@ -147,10 +147,10 @@ bool KBackgroundPattern::isAvailable() { if (m_Pattern.isEmpty()) return false; - QString file = m_Pattern; + TQString file = m_Pattern; if (file.at(0) != '/') file = m_pDirs->findResource("dtop_pattern", file); - QFileInfo fi(file); + TQFileInfo fi(file); return (fi.exists()); } @@ -159,11 +159,11 @@ bool KBackgroundPattern::remove() { if (m_bReadOnly) return false; - return !unlink(QFile::encodeName(m_File)); + return !unlink(TQFile::encodeName(m_File)); } -QString KBackgroundPattern::fingerprint() +TQString KBackgroundPattern::fingerprint() { return m_File; } @@ -180,14 +180,14 @@ int KBackgroundPattern::hash() /* static */ -QStringList KBackgroundPattern::list() +TQStringList KBackgroundPattern::list() { KStandardDirs *dirs = KGlobal::dirs(); dirs->addResourceType("dtop_pattern", dirs->kde_default("data") + "kdesktop/patterns"); - QStringList lst = dirs->findAllResources("dtop_pattern", "*.desktop", + TQStringList lst = dirs->findAllResources("dtop_pattern", "*.desktop", false, true); - QStringList::Iterator it; + TQStringList::Iterator it; for (it=lst.begin(); it!=lst.end(); ++it) { // Strip path and suffix int pos = (*it).findRev('/'); @@ -204,7 +204,7 @@ QStringList KBackgroundPattern::list() /**** KBackgroundProgram ****/ -KBackgroundProgram::KBackgroundProgram(QString name) +KBackgroundProgram::KBackgroundProgram(TQString name) { dirty = false; hashdirty = true; @@ -262,7 +262,7 @@ void KBackgroundProgram::init(bool force_rw) } -void KBackgroundProgram::load(const QString &name) +void KBackgroundProgram::load(const TQString &name) { m_Name = name; init(); @@ -270,7 +270,7 @@ void KBackgroundProgram::load(const QString &name) } -void KBackgroundProgram::setComment(const QString &comment) +void KBackgroundProgram::setComment(const TQString &comment) { if (m_Comment == comment) return; @@ -279,7 +279,7 @@ void KBackgroundProgram::setComment(const QString &comment) } -void KBackgroundProgram::setExecutable(const QString &executable) +void KBackgroundProgram::setExecutable(const TQString &executable) { if (m_Executable == executable) return; @@ -288,7 +288,7 @@ void KBackgroundProgram::setExecutable(const QString &executable) } -void KBackgroundProgram::setCommand(const QString &command) +void KBackgroundProgram::setCommand(const TQString &command) { if (m_Command == command) return; @@ -297,7 +297,7 @@ void KBackgroundProgram::setCommand(const QString &command) } -void KBackgroundProgram::setPreviewCommand(const QString &command) +void KBackgroundProgram::setPreviewCommand(const TQString &command) { if (m_PreviewCommand == command) return; @@ -358,7 +358,7 @@ bool KBackgroundProgram::remove() { if (m_bReadOnly) return false; - return !unlink(QFile::encodeName(m_File)); + return !unlink(TQFile::encodeName(m_File)); } @@ -374,9 +374,9 @@ void KBackgroundProgram::update() } -QString KBackgroundProgram::fingerprint() +TQString KBackgroundProgram::fingerprint() { - return QString("co:%1;re:%2").arg(m_Command).arg(m_Refresh); + return TQString("co:%1;re:%2").arg(m_Command).arg(m_Refresh); } @@ -391,14 +391,14 @@ int KBackgroundProgram::hash() /* static */ -QStringList KBackgroundProgram::list() +TQStringList KBackgroundProgram::list() { KStandardDirs *dirs = KGlobal::dirs(); dirs->addResourceType("dtop_program", dirs->kde_default("data") + "kdesktop/programs"); - QStringList lst = dirs->findAllResources("dtop_program", "*.desktop", + TQStringList lst = dirs->findAllResources("dtop_program", "*.desktop", false, true); - QStringList::Iterator it; + TQStringList::Iterator it; for (it=lst.begin(); it!=lst.end(); ++it) { // Strip path and suffix int pos = (*it).findRev('/'); @@ -428,7 +428,7 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou // Default values. defColorA = _defColorA; defColorB = _defColorB; - if (QPixmap::defaultDepth() > 8) + if (TQPixmap::defaultDepth() > 8) defBackgroundMode = _defBackgroundMode; else defBackgroundMode = Flat; @@ -495,7 +495,7 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString configname; + TQCString configname; if (screen_number == 0) configname = "kdesktoprc"; else @@ -558,7 +558,7 @@ void KBackgroundSettings::load(int desk, int screen, bool drawBackgroundPerScree } -void KBackgroundSettings::setColorA(const QColor& color) +void KBackgroundSettings::setColorA(const TQColor& color) { if (m_ColorA == color) return; @@ -567,7 +567,7 @@ void KBackgroundSettings::setColorA(const QColor& color) } -void KBackgroundSettings::setColorB(const QColor& color) +void KBackgroundSettings::setColorB(const TQColor& color) { if (m_ColorB == color) return; @@ -576,7 +576,7 @@ void KBackgroundSettings::setColorB(const QColor& color) } -void KBackgroundSettings::setPatternName(QString name) +void KBackgroundSettings::setPatternName(TQString name) { int ohash = KBackgroundPattern::hash(); KBackgroundPattern::load(name); @@ -588,7 +588,7 @@ void KBackgroundSettings::setPatternName(QString name) } -void KBackgroundSettings::setProgram(QString name) +void KBackgroundSettings::setProgram(TQString name) { int ohash = KBackgroundProgram::hash(); KBackgroundProgram::load(name); @@ -633,7 +633,7 @@ void KBackgroundSettings::setReverseBlending(bool value) } -void KBackgroundSettings::setWallpaper(QString wallpaper) +void KBackgroundSettings::setWallpaper(TQString wallpaper) { dirty = hashdirty = true; m_Wallpaper = wallpaper; @@ -649,7 +649,7 @@ void KBackgroundSettings::setWallpaperMode(int mode) } -void KBackgroundSettings::setWallpaperList(QStringList list) +void KBackgroundSettings::setWallpaperList(TQStringList list) { KStandardDirs *d = KGlobal::dirs(); if (m_WallpaperList == list) @@ -657,10 +657,10 @@ void KBackgroundSettings::setWallpaperList(QStringList list) dirty = hashdirty = true; m_WallpaperList.clear(); - for(QStringList::ConstIterator it = list.begin(); + for(TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - QString rpath = d->relativeLocation("wallpaper", *it); + TQString rpath = d->relativeLocation("wallpaper", *it); m_WallpaperList.append( !rpath.isEmpty() ? rpath : *it ); } updateWallpaperFiles(); @@ -704,9 +704,9 @@ bool KBackgroundSettings::optimize() const case AlwaysOpt : return true; case Opt16bpp : - return QPixmap::defaultDepth() >= 16; + return TQPixmap::defaultDepth() >= 16; case Opt15bpp : - return QPixmap::defaultDepth() >= 15; + return TQPixmap::defaultDepth() >= 15; case NeverOpt : default : return false; @@ -721,12 +721,12 @@ void KBackgroundSettings::setUseShm(bool use) m_bShm = use; } -QString KBackgroundSettings::configGroupName() const +TQString KBackgroundSettings::configGroupName() const { - QString screenName; + TQString screenName; if (m_bDrawBackgroundPerScreen) - screenName = QString("Screen%1").arg(QString::number(m_Screen)); - return QString("Desktop%1%2").arg(m_Desk).arg(screenName); + screenName = TQString("Screen%1").arg(TQString::number(m_Screen)); + return TQString("Desktop%1%2").arg(m_Desk).arg(screenName); } void KBackgroundSettings::readSettings(bool reparse) @@ -740,7 +740,7 @@ void KBackgroundSettings::readSettings(bool reparse) m_ColorA = m_pConfig->readColorEntry("Color1", &defColorA); m_ColorB = m_pConfig->readColorEntry("Color2", &defColorB); - QString s = m_pConfig->readPathEntry("Pattern"); + TQString s = m_pConfig->readPathEntry("Pattern"); if (!s.isEmpty()) KBackgroundPattern::load(s); @@ -853,25 +853,25 @@ void KBackgroundSettings::writeSettings() */ void KBackgroundSettings::updateWallpaperFiles() { - QStringList::Iterator it; + TQStringList::Iterator it; m_WallpaperFiles.clear(); for (it=m_WallpaperList.begin(); it!=m_WallpaperList.end(); ++it) { - QString file = locate("wallpaper", *it); + TQString file = locate("wallpaper", *it); if (file.isEmpty()) continue; - QFileInfo fi(file); + TQFileInfo fi(file); if (!fi.exists()) continue; if (fi.isFile() && fi.isReadable()) m_WallpaperFiles.append(file); if (fi.isDir()) { - QDir dir(file); - QStringList lst = dir.entryList(QDir::Files | QDir::Readable); - QStringList::Iterator it; + TQDir dir(file); + TQStringList lst = dir.entryList(TQDir::Files | TQDir::Readable); + TQStringList::Iterator it; for (it=lst.begin(); it!=lst.end(); ++it) { file = dir.absFilePath(*it); - QFileInfo fi(file); + TQFileInfo fi(file); if (fi.isFile() && fi.isReadable()) m_WallpaperFiles.append(file); } @@ -889,8 +889,8 @@ void KBackgroundSettings::randomizeWallpaperFiles() return; KRandomSequence rseq; - QStringList tmpList = m_WallpaperFiles; - QStringList randomList; + TQStringList tmpList = m_WallpaperFiles; + TQStringList randomList; randomList.append(tmpList.front()); tmpList.pop_front(); while(tmpList.count()) @@ -904,21 +904,21 @@ void KBackgroundSettings::randomizeWallpaperFiles() m_WallpaperFiles = randomList; } -QStringList KBackgroundSettings::wallpaperList() const +TQStringList KBackgroundSettings::wallpaperList() const { if ( m_WallpaperMode == NoWallpaper ) - return QStringList(); + return TQStringList(); if ( m_MultiMode == NoMulti || m_MultiMode == NoMultiRandom ) - return QStringList(m_Wallpaper); + return TQStringList(m_Wallpaper); return m_WallpaperList; } -QStringList KBackgroundSettings::wallpaperFiles() const +TQStringList KBackgroundSettings::wallpaperFiles() const { if ( m_WallpaperMode == NoWallpaper ) - return QStringList(); + return TQStringList(); if ( m_MultiMode == NoMulti || m_MultiMode == NoMultiRandom ) - return QStringList(m_Wallpaper); + return TQStringList(m_Wallpaper); return m_WallpaperFiles; } @@ -930,7 +930,7 @@ void KBackgroundSettings::changeWallpaper(bool init) if (m_WallpaperFiles.count() == 0) { if( init ) { m_CurrentWallpaper = 0; - m_CurrentWallpaperName = QString(); + m_CurrentWallpaperName = TQString(); } return; } @@ -967,16 +967,16 @@ void KBackgroundSettings::changeWallpaper(bool init) } -QString KBackgroundSettings::currentWallpaper() const +TQString KBackgroundSettings::currentWallpaper() const { if ( m_WallpaperMode == NoWallpaper ) - return QString::null; + return TQString::null; if (m_MultiMode == NoMulti || m_MultiMode == NoMultiRandom) return m_Wallpaper; if (m_CurrentWallpaper >= 0 && m_CurrentWallpaper < (int) m_WallpaperFiles.count()) return m_WallpaperFiles[m_CurrentWallpaper]; - return QString::null; + return TQString::null; } bool KBackgroundSettings::discardCurrentWallpaper() @@ -1007,39 +1007,39 @@ bool KBackgroundSettings::needWallpaperChange() * that only a different final result will give a different fingerprint. */ -QString KBackgroundSettings::fingerprint() +TQString KBackgroundSettings::fingerprint() { - QString s = QString("bm:%1;en:%2").arg(m_BackgroundMode).arg(m_bEnabled); + TQString s = TQString("bm:%1;en:%2").arg(m_BackgroundMode).arg(m_bEnabled); switch (m_BackgroundMode) { case Flat: - s += QString("ca:%1;").arg(m_ColorA.rgb()); + s += TQString("ca:%1;").arg(m_ColorA.rgb()); break; case Program: - s += QString("pr:%1;").arg(KBackgroundProgram::hash()); + s += TQString("pr:%1;").arg(KBackgroundProgram::hash()); break; case Pattern: - s += QString("ca:%1;cb:%2;pt:%3;").arg(m_ColorA.rgb()) + s += TQString("ca:%1;cb:%2;pt:%3;").arg(m_ColorA.rgb()) .arg(m_ColorB.rgb()).arg(KBackgroundPattern::hash()); break; default: - s += QString("ca:%1;cb:%2;").arg(m_ColorA.rgb()).arg(m_ColorB.rgb()); + s += TQString("ca:%1;cb:%2;").arg(m_ColorA.rgb()).arg(m_ColorB.rgb()); break; } - s += QString("wm:%1;").arg(m_WallpaperMode); + s += TQString("wm:%1;").arg(m_WallpaperMode); if (m_WallpaperMode != NoWallpaper) { Q_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false); - s += QString("wp:%2:%1;").arg(rh).arg(currentWallpaper()); + s += TQString("wp:%2:%1;").arg(rh).arg(currentWallpaper()); } - s += QString("blm:%1;").arg(m_BlendMode); + s += TQString("blm:%1;").arg(m_BlendMode); if (m_BlendMode != NoBlending) { - s += QString("blb:%1;").arg(m_BlendBalance); - s += QString("rbl:%1;").arg(int(m_ReverseBlending)); + s += TQString("blb:%1;").arg(m_BlendBalance); + s += TQString("rbl:%1;").arg(int(m_ReverseBlending)); } - s += QString::number( m_bShm ); - s += QString::number( m_MinOptimizationDepth ); + s += TQString::number( m_bShm ); + s += TQString::number( m_MinOptimizationDepth ); return s; } @@ -1073,14 +1073,14 @@ KGlobalBackgroundSettings::KGlobalBackgroundSettings(KConfig *_config) } -QString KGlobalBackgroundSettings::deskName(int desk) +TQString KGlobalBackgroundSettings::deskName(int desk) { return m_Names[desk]; } /* -void KGlobalBackgroundSettings::setDeskName(int desk, QString name) +void KGlobalBackgroundSettings::setDeskName(int desk, TQString name) { if (name == m_Names[desk]) return; @@ -1164,7 +1164,7 @@ void KGlobalBackgroundSettings::setExportBackground(bool _export) m_bExport = _export; } -void KGlobalBackgroundSettings::setTextColor(QColor _color) +void KGlobalBackgroundSettings::setTextColor(TQColor _color) { if (_color == m_TextColor) return; @@ -1172,7 +1172,7 @@ void KGlobalBackgroundSettings::setTextColor(QColor _color) m_TextColor = _color; } -void KGlobalBackgroundSettings::setTextBackgroundColor(QColor _color) +void KGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color) { if (_color == m_TextBackgroundColor) return; @@ -1218,7 +1218,7 @@ void KGlobalBackgroundSettings::readSettings() NETRootInfo info( qt_xdisplay(), NET::DesktopNames | NET::NumberOfDesktops ); m_bDrawBackgroundPerScreen.resize(info.numberOfDesktops()); for ( int i = 0 ; i < info.numberOfDesktops() ; ++i ) - m_bDrawBackgroundPerScreen[i] = m_pConfig->readBoolEntry( QString("DrawBackgroundPerScreen_%1").arg(i), _defDrawBackgroundPerScreen ); + m_bDrawBackgroundPerScreen[i] = m_pConfig->readBoolEntry( TQString("DrawBackgroundPerScreen_%1").arg(i), _defDrawBackgroundPerScreen ); m_TextColor = KGlobalSettings::textColor(); m_pConfig->setGroup("FMSettings"); @@ -1229,7 +1229,7 @@ void KGlobalBackgroundSettings::readSettings() m_textWidth = m_pConfig->readNumEntry("TextWidth", DEFAULT_TEXTWIDTH); for ( int i = 0 ; i < info.numberOfDesktops() ; ++i ) - m_Names.append( QString::fromUtf8(info.desktopName(i+1)) ); + m_Names.append( TQString::fromUtf8(info.desktopName(i+1)) ); dirty = false; } @@ -1248,7 +1248,7 @@ void KGlobalBackgroundSettings::writeSettings() m_pConfig->writeEntry("CacheSize", m_CacheSize); for ( unsigned i = 0 ; i < m_bDrawBackgroundPerScreen.size() ; ++i ) - m_pConfig->writeEntry(QString("DrawBackgroundPerScreen_%1").arg(i), m_bDrawBackgroundPerScreen[i] ); + m_pConfig->writeEntry(TQString("DrawBackgroundPerScreen_%1").arg(i), m_bDrawBackgroundPerScreen[i] ); m_pConfig->setGroup("FMSettings"); m_pConfig->writeEntry("NormalTextColor", m_TextColor); @@ -1261,7 +1261,7 @@ void KGlobalBackgroundSettings::writeSettings() dirty = false; // tell kdesktop to get it's butt in gear and pick up the new settings - QByteArray data; + TQByteArray data; kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data); } diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h index 928f66360..bdf971c3c 100644 --- a/kcontrol/background/bgsettings.h +++ b/kcontrol/background/bgsettings.h @@ -12,11 +12,11 @@ #define __BGSettings_h_Included__ -#include -#include -#include +#include +#include +#include -template class QMap; +template class QMap; class KStandardDirs; class KSimpleConfig; class KConfig; @@ -32,19 +32,19 @@ class QImage; class KBackgroundPattern { public: - KBackgroundPattern(QString name=QString::null); + KBackgroundPattern(TQString name=TQString::null); ~KBackgroundPattern(); void copyConfig(const KBackgroundPattern*); - QString name() const { return m_Name; } - void load(QString name); + TQString name() const { return m_Name; } + void load(TQString name); - void setComment(const QString &comment); - QString comment() const {return m_Comment; } + void setComment(const TQString &comment); + TQString comment() const {return m_Comment; } - void setPattern(QString file); - QString pattern() const { return m_Pattern; } + void setPattern(TQString file); + TQString pattern() const { return m_Pattern; } void readSettings(); void writeSettings(); @@ -55,17 +55,17 @@ public: int hash(); - static QStringList list(); + static TQStringList list(); private: void init(bool force_rw=false); - QString fingerprint(); + TQString fingerprint(); bool dirty, hashdirty; bool m_bReadOnly; int m_Hash; - QString m_Name, m_Comment; - QString m_Pattern, m_File; + TQString m_Name, m_Comment; + TQString m_Pattern, m_File; KStandardDirs *m_pDirs; KSimpleConfig *m_pConfig; }; @@ -90,28 +90,28 @@ private: class KBackgroundProgram { public: - KBackgroundProgram(QString name=QString::null); + KBackgroundProgram(TQString name=TQString::null); ~KBackgroundProgram(); void copyConfig(const KBackgroundProgram*); - QString name()const { return m_Name; } - void load(const QString & name); + TQString name()const { return m_Name; } + void load(const TQString & name); - void setComment(const QString &comment); - QString comment()const { return m_Comment; } + void setComment(const TQString &comment); + TQString comment()const { return m_Comment; } - void setCommand(const QString &command); - QString command()const { return m_Command; } + void setCommand(const TQString &command); + TQString command()const { return m_Command; } - void setPreviewCommand(const QString &command); - QString previewCommand()const { return m_PreviewCommand; } + void setPreviewCommand(const TQString &command); + TQString previewCommand()const { return m_PreviewCommand; } void setRefresh(int refresh); int refresh()const { return m_Refresh; } - void setExecutable(const QString &executable); - QString executable()const { return m_Executable; } + void setExecutable(const TQString &executable); + TQString executable()const { return m_Executable; } void readSettings(); void writeSettings(); @@ -125,18 +125,18 @@ public: bool isGlobal()const { return m_bReadOnly; } bool remove(); - static QStringList list(); + static TQStringList list(); private: void init(bool force_rw=false); - QString fingerprint(); + TQString fingerprint(); bool dirty, hashdirty; bool m_bReadOnly; int m_Refresh, m_Hash, m_LastChange; - QString m_Name, m_Command; - QString m_PreviewCommand, m_Comment; - QString m_Executable, m_File; + TQString m_Name, m_Command; + TQString m_PreviewCommand, m_Comment; + TQString m_Executable, m_File; KStandardDirs *m_pDirs; KSimpleConfig *m_pConfig; }; @@ -169,13 +169,13 @@ public: // void load(int desk, int screen, bool drawBackgroundPerScreen, bool reparseConfig=true); void load(int desk, int screen, bool drawBackgroundPerScreen, bool reparseConfig); - void setColorA(const QColor &color); - QColor colorA() const { return m_ColorA; } - void setColorB(const QColor &color); - QColor colorB() const { return m_ColorB; } + void setColorA(const TQColor &color); + TQColor colorA() const { return m_ColorA; } + void setColorB(const TQColor &color); + TQColor colorB() const { return m_ColorB; } - void setProgram(QString program); - void setPatternName(QString pattern); + void setProgram(TQString program); + void setPatternName(TQString pattern); enum BackgroundMode { Flat, Pattern, Program, @@ -201,8 +201,8 @@ public: void setBlendBalance(int value); int blendBalance() const { return m_BlendBalance; } - void setWallpaper(QString name); - QString wallpaper() const { return m_Wallpaper; } + void setWallpaper(TQString name); + TQString wallpaper() const { return m_Wallpaper; } enum WallpaperMode { NoWallpaper, Centred, Tiled, CenterTiled, CentredMaxpect, TiledMaxpect, @@ -211,9 +211,9 @@ public: void setWallpaperMode(int mode); int wallpaperMode() const { return m_WallpaperMode; } - void setWallpaperList(QStringList); - QStringList wallpaperList() const; - QStringList wallpaperFiles() const; + void setWallpaperList(TQStringList); + TQStringList wallpaperList() const; + TQStringList wallpaperFiles() const; void setWallpaperChangeInterval(int); int wallpaperChangeInterval() const { return m_Interval; } @@ -238,7 +238,7 @@ public: void updateWallpaperFiles(); void randomizeWallpaperFiles(); - QString currentWallpaper() const; + TQString currentWallpaper() const; /** * @return true if the currentWallpaper has changed */ @@ -248,10 +248,10 @@ public: void readSettings(bool reparse=false); void writeSettings(); - QString configGroupName() const; + TQString configGroupName() const; int hash(); - QString fingerprint(); + TQString fingerprint(); void setEnabled( const bool enable ); bool enabled() const { return m_bEnabled; } @@ -263,10 +263,10 @@ private: bool hashdirty; int m_Screen, m_Desk, m_Hash; - QColor m_ColorA, defColorA; - QColor m_ColorB, defColorB; - QString m_Wallpaper; - QStringList m_WallpaperList, m_WallpaperFiles; + TQColor m_ColorA, defColorA; + TQColor m_ColorB, defColorB; + TQString m_Wallpaper; + TQStringList m_WallpaperList, m_WallpaperFiles; int m_BackgroundMode, defBackgroundMode; int m_WallpaperMode, defWallpaperMode; @@ -280,7 +280,7 @@ private: int m_MultiMode, defMultiMode; int m_Interval, m_LastChange; int m_CurrentWallpaper; - QString m_CurrentWallpaperName; + TQString m_CurrentWallpaperName; KConfig *m_pConfig; KStandardDirs *m_pDirs; @@ -288,10 +288,10 @@ private: bool m_bEnabled; public: - QMap m_BMMap; - QMap m_WMMap; - QMap m_MMMap; - QMap m_BlMMap; + TQMap m_BMMap; + TQMap m_WMMap; + TQMap m_MMMap; + TQMap m_BlMMap; char *m_BMRevMap[16]; char *m_WMRevMap[16]; char *m_MMRevMap[16]; @@ -307,8 +307,8 @@ class KGlobalBackgroundSettings public: KGlobalBackgroundSettings(KConfig *config); - QString deskName(int desk); - //void setDeskName(int desk, QString name); + TQString deskName(int desk); + //void setDeskName(int desk, TQString name); int cacheSize() { return m_CacheSize; } void setCacheSize(int size); @@ -331,11 +331,11 @@ public: bool exportBackground() {return m_bExport; } void setExportBackground(bool _export); - void setTextColor(QColor _color); - QColor textColor() const { return m_TextColor; } + void setTextColor(TQColor _color); + TQColor textColor() const { return m_TextColor; } - void setTextBackgroundColor(QColor _color); - QColor textBackgroundColor() const { return m_TextBackgroundColor; } + void setTextBackgroundColor(TQColor _color); + TQColor textBackgroundColor() const { return m_TextBackgroundColor; } void setShadowEnabled(bool enabled); bool shadowEnabled() const { return m_shadowEnabled; } @@ -356,16 +356,16 @@ private: bool m_bDock; bool m_bLimitCache, m_bExport; int m_CacheSize; - QStringList m_Names; + TQStringList m_Names; - QColor m_TextColor; - QColor m_TextBackgroundColor; + TQColor m_TextColor; + TQColor m_TextBackgroundColor; bool m_shadowEnabled; int m_textLines; int m_textWidth; KConfig *m_pConfig; bool m_bDeleteConfig; - QValueVector m_bDrawBackgroundPerScreen; // m_bDrawBackgroundPerScreen[desk] + TQValueVector m_bDrawBackgroundPerScreen; // m_bDrawBackgroundPerScreen[desk] }; diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp index 9786059eb..82bb1d8af 100644 --- a/kcontrol/background/bgwallpaper.cpp +++ b/kcontrol/background/bgwallpaper.cpp @@ -22,10 +22,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -39,23 +39,23 @@ /**** BGMultiWallpaperList ****/ -BGMultiWallpaperList::BGMultiWallpaperList(QWidget *parent, const char *name) - : QListBox(parent, name) +BGMultiWallpaperList::BGMultiWallpaperList(TQWidget *parent, const char *name) + : TQListBox(parent, name) { setAcceptDrops(true); - setSelectionMode(QListBox::Extended); + setSelectionMode(TQListBox::Extended); } -void BGMultiWallpaperList::dragEnterEvent(QDragEnterEvent *ev) +void BGMultiWallpaperList::dragEnterEvent(TQDragEnterEvent *ev) { ev->accept(KURLDrag::canDecode(ev)); } -void BGMultiWallpaperList::dropEvent(QDropEvent *ev) +void BGMultiWallpaperList::dropEvent(TQDropEvent *ev) { - QStringList files; + TQStringList files; KURL::List urls; KURLDrag::decode(ev, urls); for(KURL::List::ConstIterator it = urls.begin(); @@ -95,7 +95,7 @@ void BGMultiWallpaperList::ensureSelectionVisible() /**** BGMultiWallpaperDialog ****/ BGMultiWallpaperDialog::BGMultiWallpaperDialog(KBackgroundSettings *settings, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Setup Slide Show"), Ok | Cancel, Ok, true), m_pSettings(settings) { @@ -114,18 +114,18 @@ BGMultiWallpaperDialog::BGMultiWallpaperDialog(KBackgroundSettings *settings, if (m_pSettings->multiWallpaperMode() == KBackgroundSettings::Random) dlg->m_cbRandom->setChecked(true); - connect(dlg->m_buttonAdd, SIGNAL(clicked()), SLOT(slotAdd())); - connect(dlg->m_buttonRemove, SIGNAL(clicked()), SLOT(slotRemove())); - connect(dlg->m_buttonMoveUp, SIGNAL(clicked()), SLOT(slotMoveUp())); - connect(dlg->m_buttonMoveDown, SIGNAL(clicked()), SLOT(slotMoveDown())); - connect(dlg->m_listImages, SIGNAL(clicked ( QListBoxItem * )), SLOT(slotItemSelected( QListBoxItem *))); + connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); + connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); + connect(dlg->m_buttonMoveUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp())); + connect(dlg->m_buttonMoveDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown())); + connect(dlg->m_listImages, TQT_SIGNAL(clicked ( TQListBoxItem * )), TQT_SLOT(slotItemSelected( TQListBoxItem *))); dlg->m_buttonRemove->setEnabled( false ); dlg->m_buttonMoveUp->setEnabled( false ); dlg->m_buttonMoveDown->setEnabled( false ); } -void BGMultiWallpaperDialog::slotItemSelected( QListBoxItem * ) +void BGMultiWallpaperDialog::slotItemSelected( TQListBoxItem * ) { dlg->m_buttonRemove->setEnabled( dlg->m_listImages->hasSelection() ); setEnabledMoveButtons(); @@ -134,7 +134,7 @@ void BGMultiWallpaperDialog::slotItemSelected( QListBoxItem * ) void BGMultiWallpaperDialog::setEnabledMoveButtons() { bool hasSelection = dlg->m_listImages->hasSelection(); - QListBoxItem * item; + TQListBoxItem * item; item = dlg->m_listImages->firstItem(); dlg->m_buttonMoveUp->setEnabled( hasSelection && item && !item->isSelected() ); @@ -144,7 +144,7 @@ void BGMultiWallpaperDialog::setEnabledMoveButtons() void BGMultiWallpaperDialog::slotAdd() { - QStringList mimeTypes = KImageIO::mimeTypes( KImageIO::Reading ); + TQStringList mimeTypes = KImageIO::mimeTypes( KImageIO::Reading ); #ifdef HAVE_LIBART mimeTypes += "image/svg+xml"; #endif @@ -160,7 +160,7 @@ void BGMultiWallpaperDialog::slotAdd() KFile::LocalOnly); fileDialog.setMode(mode); fileDialog.exec(); - QStringList files = fileDialog.selectedFiles(); + TQStringList files = fileDialog.selectedFiles(); if (files.isEmpty()) return; @@ -172,7 +172,7 @@ void BGMultiWallpaperDialog::slotRemove() int current = -1; for ( unsigned i = 0; i < dlg->m_listImages->count();) { - QListBoxItem * item = dlg->m_listImages->item( i ); + TQListBoxItem * item = dlg->m_listImages->item( i ); if ( item && item->isSelected()) { dlg->m_listImages->removeItem(i); @@ -194,7 +194,7 @@ void BGMultiWallpaperDialog::slotMoveUp() { for ( unsigned i = 1; i < dlg->m_listImages->count(); i++) { - QListBoxItem * item = dlg->m_listImages->item( i ); + TQListBoxItem * item = dlg->m_listImages->item( i ); if ( item && item->isSelected() ) { dlg->m_listImages->takeItem( item ); @@ -209,7 +209,7 @@ void BGMultiWallpaperDialog::slotMoveDown() { for ( unsigned i = dlg->m_listImages->count() - 1; i > 0; i--) { - QListBoxItem * item = dlg->m_listImages->item( i - 1 ); + TQListBoxItem * item = dlg->m_listImages->item( i - 1 ); if ( item && item->isSelected()) { dlg->m_listImages->takeItem( item ); @@ -222,7 +222,7 @@ void BGMultiWallpaperDialog::slotMoveDown() void BGMultiWallpaperDialog::slotOk() { - QStringList lst; + TQStringList lst; for (unsigned i=0; i < dlg->m_listImages->count(); i++) lst.append(dlg->m_listImages->text(i)); m_pSettings->setWallpaperList(lst); diff --git a/kcontrol/background/bgwallpaper.h b/kcontrol/background/bgwallpaper.h index 0ecc1e6a4..d2771c884 100644 --- a/kcontrol/background/bgwallpaper.h +++ b/kcontrol/background/bgwallpaper.h @@ -23,8 +23,8 @@ #ifndef _BGWALLPAPER_H_ #define _BGWALLPAPER_H_ -#include -#include +#include +#include #include @@ -34,10 +34,10 @@ class KBackgroundSettings; class BGMultiWallpaperList : public QListBox { public: - BGMultiWallpaperList(QWidget *parent, const char *name); + BGMultiWallpaperList(TQWidget *parent, const char *name); - void dragEnterEvent(QDragEnterEvent *ev); - void dropEvent(QDropEvent *ev); + void dragEnterEvent(TQDragEnterEvent *ev); + void dropEvent(TQDropEvent *ev); bool hasSelection(); void ensureSelectionVisible(); }; @@ -46,7 +46,7 @@ class BGMultiWallpaperDialog : public KDialogBase { Q_OBJECT public: - BGMultiWallpaperDialog(KBackgroundSettings *settings, QWidget *parent, const char *name=0); + BGMultiWallpaperDialog(KBackgroundSettings *settings, TQWidget *parent, const char *name=0); public slots: void slotAdd(); @@ -54,7 +54,7 @@ public slots: void slotMoveUp(); void slotMoveDown(); void slotOk(); - void slotItemSelected( QListBoxItem * ); + void slotItemSelected( TQListBoxItem * ); private: void setEnabledMoveButtons(); diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp index 7bcd5649b..da77d7cda 100644 --- a/kcontrol/background/main.cpp +++ b/kcontrol/background/main.cpp @@ -15,7 +15,7 @@ * License. See the file "COPYING" for the exact licensing terms. */ -#include +#include #include #include #include @@ -32,7 +32,7 @@ #include /**** DLL Interface ****/ -typedef KGenericFactory KBackGndFactory; +typedef KGenericFactory KBackGndFactory; K_EXPORT_COMPONENT_FACTORY( kcm_background, KBackGndFactory("kcmbackground")) /**** KBackground ****/ @@ -41,20 +41,20 @@ KBackground::~KBackground( ) delete m_pConfig; } -KBackground::KBackground(QWidget *parent, const char *name, const QStringList &/* */) +KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList &/* */) : KCModule(KBackGndFactory::instance(), parent, name) { int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString configname; + TQCString configname; if (screen_number == 0) configname = "kdesktoprc"; else configname.sprintf("kdesktop-screen-%drc", screen_number); m_pConfig = new KConfig(configname, false, false); - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); m_base = new BGDialog(this, m_pConfig); setQuickHelp( m_base->quickHelp()); layout->add(m_base); @@ -65,7 +65,7 @@ KBackground::KBackground(QWidget *parent, const char *name, const QStringList &/ // reparenting that is done. setAcceptDrops(true); - connect(m_base, SIGNAL(changed(bool)), SIGNAL(changed(bool))); + connect(m_base, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); KAboutData *about = new KAboutData(I18N_NOOP("kcmbackground"), I18N_NOOP("KDE Background Control Module"), @@ -107,7 +107,7 @@ void KBackground::save() int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kdesktop"; else diff --git a/kcontrol/background/main.h b/kcontrol/background/main.h index a220b57b6..100d9c2b9 100644 --- a/kcontrol/background/main.h +++ b/kcontrol/background/main.h @@ -23,7 +23,7 @@ class KBackground: public KCModule Q_OBJECT public: - KBackground(QWidget *parent, const char *name, const QStringList &); + KBackground(TQWidget *parent, const char *name, const TQStringList &); ~KBackground(); virtual void load(); diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp index 707e6c151..10d774da7 100644 --- a/kcontrol/bell/bell.cpp +++ b/kcontrol/bell/bell.cpp @@ -19,11 +19,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -40,7 +40,7 @@ extern "C" { - KDE_EXPORT KCModule *create_bell(QWidget *parent, const char *) + KDE_EXPORT KCModule *create_bell(TQWidget *parent, const char *) { return new KBellConfig(parent, "kcmbell"); } @@ -64,27 +64,27 @@ extern "C" } } -KBellConfig::KBellConfig(QWidget *parent, const char *name): +KBellConfig::KBellConfig(TQWidget *parent, const char *name): KCModule(parent, name) { - QBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); int row = 0; - QGroupBox *box = new QGroupBox( i18n("Bell Settings"), this ); + TQGroupBox *box = new TQGroupBox( i18n("Bell Settings"), this ); box->setColumnLayout( 0, Qt::Horizontal ); layout->addWidget(box); layout->addStretch(); - QGridLayout *grid = new QGridLayout(box->layout(), KDialog::spacingHint()); + TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint()); grid->setColStretch(0, 0); grid->setColStretch(1, 1); grid->addColSpacing(0, 30); - m_useBell = new QCheckBox( i18n("&Use system bell instead of system notification" ), box ); - QWhatsThis::add(m_useBell, i18n("You can use the standard system bell (PC speaker) or a " + m_useBell = new TQCheckBox( i18n("&Use system bell instead of system notification" ), box ); + TQWhatsThis::add(m_useBell, i18n("You can use the standard system bell (PC speaker) or a " "more sophisticated system notification, see the " "\"System Notifications\" control module for the " "\"Something Special Happened in the Program\" event.")); - connect(m_useBell, SIGNAL( toggled( bool )), SLOT( useBell( bool ))); + connect(m_useBell, TQT_SIGNAL( toggled( bool )), TQT_SLOT( useBell( bool ))); row++; grid->addMultiCellWidget(m_useBell, row, row, 0, 1); @@ -99,7 +99,7 @@ KBellConfig::KBellConfig(QWidget *parent, const char *name): m_volume->setSuffix("%"); m_volume->setSteps(5,25); grid->addWidget(m_volume, ++row, 1); - QWhatsThis::add( m_volume, i18n("Here you can customize the volume of the system bell. For further" + TQWhatsThis::add( m_volume, i18n("Here you can customize the volume of the system bell. For further" " customization of the bell, see the \"Accessibility\" control module.") ); m_pitch = new KIntNumInput(m_volume, 800, box); @@ -108,7 +108,7 @@ KBellConfig::KBellConfig(QWidget *parent, const char *name): m_pitch->setSuffix(i18n(" Hz")); m_pitch->setSteps(40,200); grid->addWidget(m_pitch, ++row, 1); - QWhatsThis::add( m_pitch, i18n("Here you can customize the pitch of the system bell. For further" + TQWhatsThis::add( m_pitch, i18n("Here you can customize the pitch of the system bell. For further" " customization of the bell, see the \"Accessibility\" control module.") ); m_duration = new KIntNumInput(m_pitch, 100, box); @@ -117,20 +117,20 @@ KBellConfig::KBellConfig(QWidget *parent, const char *name): m_duration->setSuffix(i18n(" msec")); m_duration->setSteps(20,100); grid->addWidget(m_duration, ++row, 1); - QWhatsThis::add( m_duration, i18n("Here you can customize the duration of the system bell. For further" + TQWhatsThis::add( m_duration, i18n("Here you can customize the duration of the system bell. For further" " customization of the bell, see the \"Accessibility\" control module.") ); - QBoxLayout *boxLayout = new QHBoxLayout(); - m_testButton = new QPushButton(i18n("&Test"), box, "test"); + TQBoxLayout *boxLayout = new TQHBoxLayout(); + m_testButton = new TQPushButton(i18n("&Test"), box, "test"); boxLayout->addWidget(m_testButton, 0, AlignRight); grid->addLayout( boxLayout, ++row, 1 ); - connect( m_testButton, SIGNAL(clicked()), SLOT(ringBell())); - QWhatsThis::add( m_testButton, i18n("Click \"Test\" to hear how the system bell will sound using your changed settings.") ); + connect( m_testButton, TQT_SIGNAL(clicked()), TQT_SLOT(ringBell())); + TQWhatsThis::add( m_testButton, i18n("Click \"Test\" to hear how the system bell will sound using your changed settings.") ); // watch for changes - connect(m_volume, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(m_pitch, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(m_duration, SIGNAL(valueChanged(int)), SLOT(changed())); + connect(m_volume, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(m_pitch, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(m_duration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); KAboutData *about = new KAboutData(I18N_NOOP("kcmbell"), I18N_NOOP("KDE Bell Control Module"), diff --git a/kcontrol/bell/bell.h b/kcontrol/bell/bell.h index ceaf875df..dc17def93 100644 --- a/kcontrol/bell/bell.h +++ b/kcontrol/bell/bell.h @@ -32,7 +32,7 @@ class KBellConfig : public KCModule Q_OBJECT public: - KBellConfig(QWidget *parent, const char *name); + KBellConfig(TQWidget *parent, const char *name); void load(); void load( bool useDefaults ); @@ -44,11 +44,11 @@ class KBellConfig : public KCModule void useBell( bool ); private: - QPushButton *m_testButton; + TQPushButton *m_testButton; KIntNumInput *m_volume; KIntNumInput *m_pitch; KIntNumInput *m_duration; - QCheckBox *m_useBell; + TQCheckBox *m_useBell; }; #endif diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index ba8330c7a..109e436c4 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -22,15 +22,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -42,22 +42,22 @@ #include "dtime.h" #include "dtime.moc" -HMSTimeWidget::HMSTimeWidget(QWidget *parent, const char *name) : +HMSTimeWidget::HMSTimeWidget(TQWidget *parent, const char *name) : KIntSpinBox(parent, name) { } -QString HMSTimeWidget::mapValueToText(int value) +TQString HMSTimeWidget::mapValueToText(int value) { - QString s = QString::number(value); + TQString s = TQString::number(value); if( value < 10 ) { s = "0" + s; } return s; } -Dtime::Dtime(QWidget * parent, const char *name) - : QWidget(parent, name) +Dtime::Dtime(TQWidget * parent, const char *name) + : TQWidget(parent, name) { // ************************************************************* // Start Dialog @@ -65,51 +65,51 @@ Dtime::Dtime(QWidget * parent, const char *name) // Time Server - privateLayoutWidget = new QWidget( this, "layout1" ); - QHBoxLayout *layout1 = new QHBoxLayout( privateLayoutWidget, 0, 0, "ntplayout"); + privateLayoutWidget = new TQWidget( this, "layout1" ); + TQHBoxLayout *layout1 = new TQHBoxLayout( privateLayoutWidget, 0, 0, "ntplayout"); - setDateTimeAuto = new QCheckBox( privateLayoutWidget, "setDateTimeAuto" ); + setDateTimeAuto = new TQCheckBox( privateLayoutWidget, "setDateTimeAuto" ); setDateTimeAuto->setText(i18n("Set date and time &automatically:")); - connect(setDateTimeAuto, SIGNAL(toggled(bool)), this, SLOT(serverTimeCheck())); - connect(setDateTimeAuto, SIGNAL(toggled(bool)), SLOT(configChanged())); + connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(serverTimeCheck())); + connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged())); layout1->addWidget( setDateTimeAuto ); - timeServerList = new QComboBox( false, privateLayoutWidget, "timeServerList" ); - connect(timeServerList, SIGNAL(activated(int)), SLOT(configChanged())); - connect(timeServerList, SIGNAL(textChanged(const QString &)), SLOT(configChanged())); - connect(setDateTimeAuto, SIGNAL(toggled(bool)), timeServerList, SLOT(setEnabled(bool))); + timeServerList = new TQComboBox( false, privateLayoutWidget, "timeServerList" ); + connect(timeServerList, TQT_SIGNAL(activated(int)), TQT_SLOT(configChanged())); + connect(timeServerList, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(configChanged())); + connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), timeServerList, TQT_SLOT(setEnabled(bool))); timeServerList->setEnabled(false); timeServerList->setEditable(true); layout1->addWidget( timeServerList ); findNTPutility(); // Date box - QGroupBox* dateBox = new QGroupBox( this, "dateBox" ); + TQGroupBox* dateBox = new TQGroupBox( this, "dateBox" ); - QVBoxLayout *l1 = new QVBoxLayout( dateBox, KDialog::spacingHint() ); + TQVBoxLayout *l1 = new TQVBoxLayout( dateBox, KDialog::spacingHint() ); cal = new KDatePicker( dateBox ); cal->setMinimumSize(cal->sizeHint()); l1->addWidget( cal ); - QWhatsThis::add( cal, i18n("Here you can change the system date's day of the month, month and year.") ); + TQWhatsThis::add( cal, i18n("Here you can change the system date's day of the month, month and year.") ); // Time frame - QGroupBox* timeBox = new QGroupBox( this, "timeBox" ); + TQGroupBox* timeBox = new TQGroupBox( this, "timeBox" ); - QVBoxLayout *v2 = new QVBoxLayout( timeBox, KDialog::spacingHint() ); + TQVBoxLayout *v2 = new TQVBoxLayout( timeBox, KDialog::spacingHint() ); kclock = new Kclock( timeBox, "kclock" ); kclock->setMinimumSize(150,150); v2->addWidget( kclock ); - QGridLayout *v3 = new QGridLayout( v2, 2, 9 ); + TQGridLayout *v3 = new TQGridLayout( v2, 2, 9 ); // Even if the module's widgets are reversed (usually when using RTL // languages), the placing of the time fields must always be H:M:S, from // left to right. - bool isRTL = QApplication::reverseLayout(); + bool isRTL = TQApplication::reverseLayout(); - QSpacerItem *spacer1 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem *spacer1 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); v3->addMultiCell(spacer1, 0, 1, 1, 1); hour = new HMSTimeWidget( timeBox ); @@ -118,9 +118,9 @@ Dtime::Dtime(QWidget * parent, const char *name) hour->setValidator(new KStrictIntValidator(0, 23, hour)); v3->addMultiCellWidget(hour, 0, 1, isRTL ? 6 : 2, isRTL ? 6 : 2 ); - QLabel *dots1 = new QLabel(":", timeBox); + TQLabel *dots1 = new TQLabel(":", timeBox); dots1->setMinimumWidth( 7 ); - dots1->setAlignment( QLabel::AlignCenter ); + dots1->setAlignment( TQLabel::AlignCenter ); v3->addMultiCellWidget(dots1, 0, 1, 3, 3 ); minute = new HMSTimeWidget( timeBox ); @@ -130,9 +130,9 @@ Dtime::Dtime(QWidget * parent, const char *name) minute->setValidator(new KStrictIntValidator(0, 59, minute)); v3->addMultiCellWidget(minute, 0, 1, 4, 4 ); - QLabel *dots2 = new QLabel(":", timeBox); + TQLabel *dots2 = new TQLabel(":", timeBox); dots2->setMinimumWidth( 7 ); - dots2->setAlignment( QLabel::AlignCenter ); + dots2->setAlignment( TQLabel::AlignCenter ); v3->addMultiCellWidget(dots2, 0, 1, 5, 5 ); second = new HMSTimeWidget( timeBox ); @@ -144,17 +144,17 @@ Dtime::Dtime(QWidget * parent, const char *name) v3->addColSpacing(7, 7); - QString wtstr = i18n("Here you can change the system time. Click into the" + TQString wtstr = i18n("Here you can change the system time. Click into the" " hours, minutes or seconds field to change the relevant value, either" " using the up and down buttons to the right or by entering a new value."); - QWhatsThis::add( hour, wtstr ); - QWhatsThis::add( minute, wtstr ); - QWhatsThis::add( second, wtstr ); + TQWhatsThis::add( hour, wtstr ); + TQWhatsThis::add( minute, wtstr ); + TQWhatsThis::add( second, wtstr ); - QSpacerItem *spacer3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem *spacer3 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); v3->addMultiCell(spacer3, 0, 1, 9, 9); - QGridLayout *top = new QGridLayout( this, 2,2, KDialog::spacingHint() ); + TQGridLayout *top = new TQGridLayout( this, 2,2, KDialog::spacingHint() ); top->addWidget(dateBox, 1,0); top->addWidget(timeBox, 1,1); @@ -164,12 +164,12 @@ Dtime::Dtime(QWidget * parent, const char *name) // End Dialog // ************************************************************* - connect( hour, SIGNAL(valueChanged(int)), SLOT(set_time()) ); - connect( minute, SIGNAL(valueChanged(int)), SLOT(set_time()) ); - connect( second, SIGNAL(valueChanged(int)), SLOT(set_time()) ); - connect( cal, SIGNAL(dateChanged(QDate)), SLOT(changeDate(QDate))); + connect( hour, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) ); + connect( minute, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) ); + connect( second, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) ); + connect( cal, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(changeDate(TQDate))); - connect( &internalTimer, SIGNAL(timeout()), SLOT(timeout()) ); + connect( &internalTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) ); load(); @@ -228,7 +228,7 @@ void Dtime::set_time() emit timeChanged( TRUE ); } -void Dtime::changeDate(QDate d) +void Dtime::changeDate(TQDate d) { date = d; emit timeChanged( TRUE ); @@ -242,7 +242,7 @@ void Dtime::load() { KConfig config("kcmclockrc", true, false); config.setGroup("NTP"); - timeServerList->insertStringList(QStringList::split(',', config.readEntry("servers", + timeServerList->insertStringList(TQStringList::split(',', config.readEntry("servers", i18n("Public Time Server (pool.ntp.org),\ asia.pool.ntp.org,\ europe.pool.ntp.org,\ @@ -251,8 +251,8 @@ oceania.pool.ntp.org")))); setDateTimeAuto->setChecked(config.readBoolEntry("enabled", false)); // Reset to the current date and time - time = QTime::currentTime(); - date = QDate::currentDate(); + time = TQTime::currentTime(); + date = TQDate::currentDate(); cal->setDate(date); // start internal timer @@ -267,11 +267,11 @@ void Dtime::save() config.setGroup("NTP"); // Save the order, but don't duplicate! - QStringList list; + TQStringList list; if( timeServerList->count() != 0) list.append(timeServerList->currentText()); for ( int i=0; icount();i++ ) { - QString text = timeServerList->text(i); + TQString text = timeServerList->text(i); if( list.find(text) == list.end()) list.append(text); // Limit so errors can go away and not stored forever @@ -283,17 +283,17 @@ void Dtime::save() if(setDateTimeAuto->isChecked() && !ntpUtility.isEmpty()){ // NTP Time setting - QString timeServer = timeServerList->currentText(); - if( timeServer.find( QRegExp(".*\\(.*\\)$") ) != -1 ) { - timeServer.replace( QRegExp(".*\\("), "" ); - timeServer.replace( QRegExp("\\).*"), "" ); + TQString timeServer = timeServerList->currentText(); + if( timeServer.find( TQRegExp(".*\\(.*\\)$") ) != -1 ) { + timeServer.replace( TQRegExp(".*\\("), "" ); + timeServer.replace( TQRegExp("\\).*"), "" ); // Would this be better?: s/^.*\(([^)]*)\).*$/\1/ } KProcess proc; proc << ntpUtility << timeServer; proc.start( KProcess::Block ); if( proc.exitStatus() != 0 ){ - KMessageBox::error( this, i18n(QString("Unable to contact time server: %1.").arg(timeServer).latin1())); + KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").arg(timeServer).latin1())); setDateTimeAuto->setChecked( false ); } else { @@ -345,7 +345,7 @@ void Dtime::save() void Dtime::timeout() { // get current time - time = QTime::currentTime(); + time = TQTime::currentTime(); ontimeout = TRUE; second->setValue(time.second()); @@ -356,7 +356,7 @@ void Dtime::timeout() kclock->setTime( time ); } -QString Dtime::quickHelp() const +TQString Dtime::quickHelp() const { return i18n("

    Date & Time

    This control module can be used to set the system date and" " time. As these settings do not only affect you as a user, but rather the whole system, you" @@ -365,32 +365,32 @@ QString Dtime::quickHelp() const " administrator."); } -void Kclock::setTime(const QTime &time) +void Kclock::setTime(const TQTime &time) { this->time = time; repaint(); } -void Kclock::paintEvent( QPaintEvent * ) +void Kclock::paintEvent( TQPaintEvent * ) { if ( !isVisible() ) return; - QPainter paint; + TQPainter paint; paint.begin( this ); - QPointArray pts; - QPoint cp = rect().center(); + TQPointArray pts; + TQPoint cp = rect().center(); int d = QMIN(width(),height()); - QColor hands = colorGroup().dark(); - QColor shadow = colorGroup().text(); + TQColor hands = colorGroup().dark(); + TQColor shadow = colorGroup().text(); paint.setPen( shadow ); paint.setBrush( shadow ); paint.setViewport(4,4,width(),height()); for ( int c=0 ; c < 2 ; c++ ) { - QWMatrix matrix; + TQWMatrix matrix; matrix.translate( cp.x(), cp.y() ); matrix.scale( d/1000.0F, d/1000.0F ); @@ -435,12 +435,12 @@ void Kclock::paintEvent( QPaintEvent * ) paint.end(); } -QValidator::State KStrictIntValidator::validate( QString & input, int & d ) const +TQValidator::State KStrictIntValidator::validate( TQString & input, int & d ) const { if( input.isEmpty() ) return Valid; - State st = QIntValidator::validate( input, d ); + State st = TQIntValidator::validate( input, d ); if( st == Intermediate ) return Invalid; diff --git a/kcontrol/clock/dtime.h b/kcontrol/clock/dtime.h index 5fcbb62df..cf6cccc63 100644 --- a/kcontrol/clock/dtime.h +++ b/kcontrol/clock/dtime.h @@ -22,14 +22,14 @@ #ifndef dtime_included #define dtime_included -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -40,21 +40,21 @@ class HMSTimeWidget : public KIntSpinBox { Q_OBJECT public: - HMSTimeWidget(QWidget *parent=0, const char *name=0); + HMSTimeWidget(TQWidget *parent=0, const char *name=0); protected: - QString mapValueToText(int); + TQString mapValueToText(int); }; class Dtime : public QWidget { Q_OBJECT public: - Dtime( QWidget *parent=0, const char* name=0 ); + Dtime( TQWidget *parent=0, const char* name=0 ); void save(); void load(); - QString quickHelp() const; + TQString quickHelp() const; signals: void timeChanged(bool); @@ -64,13 +64,13 @@ signals: void serverTimeCheck(); void timeout(); void set_time(); - void changeDate(QDate); + void changeDate(TQDate); private: void findNTPutility(); QString ntpUtility; - QWidget* privateLayoutWidget; + TQWidget* privateLayoutWidget; QCheckBox *setDateTimeAuto; QComboBox *timeServerList; @@ -99,27 +99,27 @@ class Kclock : public QWidget Q_OBJECT public: - Kclock( QWidget *parent=0, const char *name=0 ) - : QWidget(parent, name) {}; + Kclock( TQWidget *parent=0, const char *name=0 ) + : TQWidget(parent, name) {}; - void setTime(const QTime&); + void setTime(const TQTime&); protected: - virtual void paintEvent( QPaintEvent *event ); + virtual void paintEvent( TQPaintEvent *event ); private: QTime time; }; -class KStrictIntValidator : public QIntValidator +class KStrictIntValidator : public TQIntValidator { public: - KStrictIntValidator(int bottom, int top, QWidget * parent, + KStrictIntValidator(int bottom, int top, TQWidget * parent, const char * name = 0 ) - : QIntValidator(bottom, top, parent, name) {}; + : TQIntValidator(bottom, top, parent, name) {}; - QValidator::State validate( QString & input, int & d ) const; + TQValidator::State validate( TQString & input, int & d ) const; }; #endif // dtime_included diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp index 8522973a1..86e47e7ad 100644 --- a/kcontrol/clock/main.cpp +++ b/kcontrol/clock/main.cpp @@ -20,8 +20,8 @@ */ #include -#include -#include +#include +#include #include @@ -36,10 +36,10 @@ #include "tzone.h" #include "dtime.h" -typedef KGenericFactory KlockModuleFactory; +typedef KGenericFactory KlockModuleFactory; K_EXPORT_COMPONENT_FACTORY( kcm_clock, KlockModuleFactory("kcmkclock")) -KclockModule::KclockModule(QWidget *parent, const char *name, const QStringList &) +KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringList &) : KCModule(KlockModuleFactory::instance(), parent, name) { KAboutData *about = @@ -59,15 +59,15 @@ KclockModule::KclockModule(QWidget *parent, const char *name, const QStringList KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations - QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); dtime = new Dtime(this); layout->addWidget(dtime); - connect(dtime, SIGNAL(timeChanged(bool)), this, SIGNAL(changed(bool))); + connect(dtime, TQT_SIGNAL(timeChanged(bool)), this, TQT_SIGNAL(changed(bool))); tzone = new Tzone(this); layout->addWidget(tzone); - connect(tzone, SIGNAL(zoneChanged(bool)), this, SIGNAL(changed(bool))); + connect(tzone, TQT_SIGNAL(zoneChanged(bool)), this, TQT_SIGNAL(changed(bool))); layout->addStretch(); @@ -84,7 +84,7 @@ void KclockModule::save() tzone->save(); // Tell the clock applet about the change so that it can update its timezone - kapp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", QByteArray() ); + kapp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", TQByteArray() ); } void KclockModule::load() diff --git a/kcontrol/clock/main.h b/kcontrol/clock/main.h index 3c57469f0..53a060674 100644 --- a/kcontrol/clock/main.h +++ b/kcontrol/clock/main.h @@ -33,13 +33,13 @@ class KclockModule : public KCModule Q_OBJECT public: - KclockModule(QWidget *parent, const char *name, const QStringList &); + KclockModule(TQWidget *parent, const char *name, const TQStringList &); void save(); void load(); private: - QTabWidget *tab; + TQTabWidget *tab; Tzone *tzone; Dtime *dtime; }; diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp index fad22152a..506bde5b6 100644 --- a/kcontrol/clock/tzone.cpp +++ b/kcontrol/clock/tzone.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -46,15 +46,15 @@ #include #endif -Tzone::Tzone(QWidget * parent, const char *name) - : QVGroupBox(parent, name) +Tzone::Tzone(TQWidget * parent, const char *name) + : TQVGroupBox(parent, name) { setTitle(i18n("To change the timezone, select your area from the list below")); tzonelist = new KTimezoneWidget(this, "ComboBox_1", &m_zoneDb); - connect( tzonelist, SIGNAL(selectionChanged()), SLOT(handleZoneChange()) ); + connect( tzonelist, TQT_SIGNAL(selectionChanged()), TQT_SLOT(handleZoneChange()) ); - m_local = new QLabel(this); + m_local = new TQLabel(this); load(); @@ -71,8 +71,8 @@ void Tzone::load() void Tzone::currentZone() { - QString localZone(i18n("Current local timezone: %1 (%2)")); - QCString result(100); + TQString localZone(i18n("Current local timezone: %1 (%2)")); + TQCString result(100); time_t now = time(0); tzset(); @@ -84,33 +84,33 @@ void Tzone::currentZone() // on non-Solaris systems which do not use /etc/timezone? void Tzone::save() { - QStringList selectedZones(tzonelist->selection()); + TQStringList selectedZones(tzonelist->selection()); if (selectedZones.count() > 0) { // Find untranslated selected zone - QString selectedzone(selectedZones[0]); + TQString selectedzone(selectedZones[0]); #if defined(USE_SOLARIS) // MARCO KTempFile tf( locateLocal( "tmp", "kde-tzone" ) ); tf.setAutoDelete( true ); - QTextStream *ts = tf.textStream(); + TQTextStream *ts = tf.textStream(); # ifndef INITFILE # define INITFILE "/etc/default/init" # endif - QFile fTimezoneFile(INITFILE); + TQFile fTimezoneFile(INITFILE); bool updatedFile = false; if (tf.status() == 0 && fTimezoneFile.open(IO_ReadOnly)) { bool found = false; - QTextStream is(&fTimezoneFile); + TQTextStream is(&fTimezoneFile); - for (QString line = is.readLine(); !line.isNull(); + for (TQString line = is.readLine(); !line.isNull(); line = is.readLine()) { if (line.find("TZ=") == 0) @@ -140,9 +140,9 @@ void Tzone::save() if (fTimezoneFile.open(IO_WriteOnly | IO_Truncate)) { - QTextStream os(&fTimezoneFile); + TQTextStream os(&fTimezoneFile); - for (QString line = ts->readLine(); !line.isNull(); + for (TQString line = ts->readLine(); !line.isNull(); line = ts->readLine()) { os << line << endl; @@ -156,22 +156,22 @@ void Tzone::save() } - QString val = selectedzone; + TQString val = selectedzone; #else - QFile fTimezoneFile("/etc/timezone"); + TQFile fTimezoneFile("/etc/timezone"); if (fTimezoneFile.open(IO_WriteOnly | IO_Truncate) ) { - QTextStream t(&fTimezoneFile); + TQTextStream t(&fTimezoneFile); t << selectedzone; fTimezoneFile.close(); } - QString tz = "/usr/share/zoneinfo/" + selectedzone; + TQString tz = "/usr/share/zoneinfo/" + selectedzone; kdDebug() << "Set time zone " << tz << endl; - if (!QFile::remove("/etc/localtime")) + if (!TQFile::remove("/etc/localtime")) { //After the KDE 3.2 release, need to add an error message } @@ -180,7 +180,7 @@ void Tzone::save() KMessageBox::error( 0, i18n("Error setting new timezone."), i18n("Timezone Error")); - QString val = ":" + tz; + TQString val = ":" + tz; #endif // !USE_SOLARIS setenv("TZ", val.ascii(), 1); diff --git a/kcontrol/clock/tzone.h b/kcontrol/clock/tzone.h index 618cb10c6..fe9119773 100644 --- a/kcontrol/clock/tzone.h +++ b/kcontrol/clock/tzone.h @@ -24,7 +24,7 @@ #include #include -#include +#include class QComboBox; class QLabel; @@ -34,7 +34,7 @@ class Tzone : public QVGroupBox Q_OBJECT public: - Tzone( QWidget *parent=0, const char* name=0 ); + Tzone( TQWidget *parent=0, const char* name=0 ); void save(); void load(); @@ -48,7 +48,7 @@ protected slots: private: void currentZone(); KTimezones m_zoneDb; - QLabel *m_local; + TQLabel *m_local; KTimezoneWidget *tzonelist; }; diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 39e5574c2..d735d1248 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -12,15 +12,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -46,25 +46,25 @@ /**** DLL Interface ****/ -typedef KGenericFactory KolorFactory; +typedef KGenericFactory KolorFactory; K_EXPORT_COMPONENT_FACTORY( kcm_colors, KolorFactory("kcmcolors") ) class KColorSchemeEntry { public: - KColorSchemeEntry(const QString &_path, const QString &_name, bool _local) + KColorSchemeEntry(const TQString &_path, const TQString &_name, bool _local) : path(_path), name(_name), local(_local) { } - QString path; - QString name; + TQString path; + TQString name; bool local; }; -class KColorSchemeList : public QPtrList { +class KColorSchemeList : public TQPtrList { public: KColorSchemeList() { setAutoDelete(true); } - int compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2) + int compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2) { KColorSchemeEntry *i1 = (KColorSchemeEntry*)item1; KColorSchemeEntry *i2 = (KColorSchemeEntry*)item2; @@ -77,22 +77,22 @@ public: #define SIZE 8 // make a 24 * 8 pixmap with the main colors in a scheme -QPixmap mkColorPreview(const WidgetCanvas *cs) +TQPixmap mkColorPreview(const WidgetCanvas *cs) { - QPixmap group(SIZE*3,SIZE); - QPixmap block(SIZE,SIZE); - group.fill(QColor(0,0,0)); + TQPixmap group(SIZE*3,SIZE); + TQPixmap block(SIZE,SIZE); + group.fill(TQColor(0,0,0)); block.fill(cs->back); bitBlt(&group,0*SIZE,0,&block,0,0,SIZE,SIZE); block.fill(cs->window); bitBlt(&group,1*SIZE,0,&block,0,0,SIZE,SIZE); block.fill(cs->aTitle); bitBlt(&group,2*SIZE,0,&block,0,0,SIZE,SIZE); - QPainter p(&group); + TQPainter p(&group); p.drawRect(0,0,3*SIZE,SIZE); return group; } /**** KColorScheme ****/ -KColorScheme::KColorScheme(QWidget *parent, const char *name, const QStringList &) +KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringList &) : KCModule(KolorFactory::instance(), parent, name) { nSysSchemes = 2; @@ -120,7 +120,7 @@ KColorScheme::KColorScheme(QWidget *parent, const char *name, const QStringList // LAYOUT - QGridLayout *topLayout = new QGridLayout( this, 3, 2, 0, + TQGridLayout *topLayout = new TQGridLayout( this, 3, 2, 0, KDialog::spacingHint() ); topLayout->setRowStretch(0,0); topLayout->setRowStretch(1,0); @@ -130,28 +130,28 @@ KColorScheme::KColorScheme(QWidget *parent, const char *name, const QStringList cs->setFixedHeight(160); cs->setMinimumWidth(440); - QWhatsThis::add( cs, i18n("This is a preview of the color settings which" + TQWhatsThis::add( cs, i18n("This is a preview of the color settings which" " will be applied if you click \"Apply\" or \"OK\". You can click on" " different parts of this preview image. The widget name in the" " \"Widget color\" box will change to reflect the part of the preview" " image you clicked.") ); - connect( cs, SIGNAL( widgetSelected( int ) ), - SLOT( slotWidgetColor( int ) ) ); - connect( cs, SIGNAL( colorDropped( int, const QColor&)), - SLOT( slotColorForWidget( int, const QColor&))); + connect( cs, TQT_SIGNAL( widgetSelected( int ) ), + TQT_SLOT( slotWidgetColor( int ) ) ); + connect( cs, TQT_SIGNAL( colorDropped( int, const TQColor&)), + TQT_SLOT( slotColorForWidget( int, const TQColor&))); topLayout->addMultiCellWidget( cs, 0, 0, 0, 1 ); - QGroupBox *group = new QVGroupBox( i18n("Color Scheme"), this ); + TQGroupBox *group = new TQVGroupBox( i18n("Color Scheme"), this ); topLayout->addWidget( group, 1, 0 ); sList = new KListBox( group ); mSchemeList = new KColorSchemeList(); readSchemeNames(); sList->setCurrentItem( 0 ); - connect(sList, SIGNAL(highlighted(int)), SLOT(slotPreviewScheme(int))); + connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int))); - QWhatsThis::add( sList, i18n("This is a list of predefined color schemes," + TQWhatsThis::add( sList, i18n("This is a list of predefined color schemes," " including any that you may have created. You can preview an existing" " color scheme by selecting it from the list. The current scheme will" " be replaced by the selected color scheme.

    " @@ -159,41 +159,41 @@ KColorScheme::KColorScheme(QWidget *parent, const char *name, const QStringList " to the current scheme, those changes will be lost if you select" " another color scheme.") ); - addBt = new QPushButton(i18n("&Save Scheme..."), group); - connect(addBt, SIGNAL(clicked()), SLOT(slotAdd())); + addBt = new TQPushButton(i18n("&Save Scheme..."), group); + connect(addBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); - QWhatsThis::add( addBt, i18n("Press this button if you want to save" + TQWhatsThis::add( addBt, i18n("Press this button if you want to save" " the current color settings as a color scheme. You will be" " prompted for a name.") ); - removeBt = new QPushButton(i18n("R&emove Scheme"), group); + removeBt = new TQPushButton(i18n("R&emove Scheme"), group); removeBt->setEnabled(FALSE); - connect(removeBt, SIGNAL(clicked()), SLOT(slotRemove())); + connect(removeBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); - QWhatsThis::add( removeBt, i18n("Press this button to remove the selected" + TQWhatsThis::add( removeBt, i18n("Press this button to remove the selected" " color scheme. Note that this button is disabled if you do not have" " permission to delete the color scheme.") ); - importBt = new QPushButton(i18n("I&mport Scheme..."), group); - connect(importBt, SIGNAL(clicked()),SLOT(slotImport())); + importBt = new TQPushButton(i18n("I&mport Scheme..."), group); + connect(importBt, TQT_SIGNAL(clicked()),TQT_SLOT(slotImport())); - QWhatsThis::add( importBt, i18n("Press this button to import a new color" + TQWhatsThis::add( importBt, i18n("Press this button to import a new color" " scheme. Note that the color scheme will only be available for the" " current user." )); - QBoxLayout *stackLayout = new QVBoxLayout; + TQBoxLayout *stackLayout = new QVBoxLayout; topLayout->addLayout(stackLayout, 1, 1); - group = new QGroupBox(i18n("&Widget Color"), this); + group = new TQGroupBox(i18n("&Widget Color"), this); stackLayout->addWidget(group); - QBoxLayout *groupLayout = new QVBoxLayout(group, 10); + TQBoxLayout *groupLayout = new TQVBoxLayout(group, 10); groupLayout->addSpacing(10); - wcCombo = new QComboBox(false, group); + wcCombo = new TQComboBox(false, group); for(int i=0; i < CSM_LAST;i++) { - wcCombo->insertItem(QString::null); + wcCombo->insertItem(TQString::null); } setColorName(i18n("Inactive Title Bar") , CSM_Inactive_title_bar); @@ -221,60 +221,60 @@ KColorScheme::KColorScheme(QWidget *parent, const char *name, const QStringList setColorName(i18n("Alternate Background in Lists"), CSM_Alternate_background); wcCombo->adjustSize(); - connect(wcCombo, SIGNAL(activated(int)), SLOT(slotWidgetColor(int))); + connect(wcCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWidgetColor(int))); groupLayout->addWidget(wcCombo); - QWhatsThis::add( wcCombo, i18n("Click here to select an element of" + TQWhatsThis::add( wcCombo, i18n("Click here to select an element of" " the KDE desktop whose color you want to change. You may either" " choose the \"widget\" here, or click on the corresponding part" " of the preview image above.") ); colorButton = new KColorButton( group ); - connect( colorButton, SIGNAL( changed(const QColor &)), - SLOT(slotSelectColor(const QColor &))); + connect( colorButton, TQT_SIGNAL( changed(const TQColor &)), + TQT_SLOT(slotSelectColor(const TQColor &))); groupLayout->addWidget( colorButton ); - QWhatsThis::add( colorButton, i18n("Click here to bring up a dialog" + TQWhatsThis::add( colorButton, i18n("Click here to bring up a dialog" " box where you can choose a color for the \"widget\" selected" " in the above list.") ); - cbShadeList = new QCheckBox(i18n("Shade sorted column in lists"), this); + cbShadeList = new TQCheckBox(i18n("Shade sorted column in lists"), this); stackLayout->addWidget(cbShadeList); - connect(cbShadeList, SIGNAL(toggled(bool)), this, SLOT(slotShadeSortColumnChanged(bool))); + connect(cbShadeList, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotShadeSortColumnChanged(bool))); - QWhatsThis::add(cbShadeList, + TQWhatsThis::add(cbShadeList, i18n("Check this box to show the sorted column in a list with a shaded background")); - group = new QGroupBox( i18n("Con&trast"), this ); + group = new TQGroupBox( i18n("Con&trast"), this ); stackLayout->addWidget(group); - QVBoxLayout *groupLayout2 = new QVBoxLayout(group, 10); + TQVBoxLayout *groupLayout2 = new TQVBoxLayout(group, 10); groupLayout2->addSpacing(10); groupLayout = new QHBoxLayout; groupLayout2->addLayout(groupLayout); - sb = new QSlider( QSlider::Horizontal,group,"Slider" ); + sb = new TQSlider( TQSlider::Horizontal,group,"Slider" ); sb->setRange( 0, 10 ); - sb->setFocusPolicy( QWidget::StrongFocus ); - connect(sb, SIGNAL(valueChanged(int)), SLOT(sliderValueChanged(int))); + sb->setFocusPolicy( TQWidget::StrongFocus ); + connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int))); - QWhatsThis::add(sb, i18n("Use this slider to change the contrast level" + TQWhatsThis::add(sb, i18n("Use this slider to change the contrast level" " of the current color scheme. Contrast does not affect all of the" " colors, only the edges of 3D objects.")); - QLabel *label = new QLabel(sb, i18n("Low Contrast", "Low"), group); + TQLabel *label = new TQLabel(sb, i18n("Low Contrast", "Low"), group); groupLayout->addWidget(label); groupLayout->addWidget(sb, 10); - label = new QLabel(group); + label = new TQLabel(group); label->setText(i18n("High Contrast", "High")); groupLayout->addWidget( label ); - cbExportColors = new QCheckBox(i18n("Apply colors to &non-KDE applications"), this); + cbExportColors = new TQCheckBox(i18n("Apply colors to &non-KDE applications"), this); topLayout->addMultiCellWidget( cbExportColors, 2, 2, 0, 1 ); - connect(cbExportColors, SIGNAL(toggled(bool)), this, SLOT(changed())); + connect(cbExportColors, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed())); - QWhatsThis::add(cbExportColors, i18n("Check this box to apply the" + TQWhatsThis::add(cbExportColors, i18n("Check this box to apply the" " current color scheme to non-KDE applications.")); load(); @@ -296,7 +296,7 @@ KColorScheme::~KColorScheme() delete mSchemeList; } -void KColorScheme::setColorName( const QString &name, int id ) +void KColorScheme::setColorName( const TQString &name, int id ) { wcCombo->changeItem(name, id); cs->addToolTip( id, name ); @@ -372,7 +372,7 @@ void KColorScheme::save() // KDE-1.x support KSimpleConfig *config = - new KSimpleConfig( QDir::homeDirPath() + "/.kderc" ); + new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); config->setGroup( "General" ); config->writeEntry("background", cs->back ); config->writeEntry("selectBackground", cs->select ); @@ -388,7 +388,7 @@ void KColorScheme::save() bool exportColors = cbExportColors->isChecked(); cfg2.writeEntry("exportKDEColors", exportColors); cfg2.sync(); - QApplication::syncX(); + TQApplication::syncX(); // Notify all qt-only apps of the KDE palette changes uint flags = KRdbExportQtColors; @@ -411,7 +411,7 @@ void KColorScheme::save() int current = findSchemeByName(sCurrentScheme); sList->setCurrentItem(0); readScheme(0); - QPixmap preview = mkColorPreview(cs); + TQPixmap preview = mkColorPreview(cs); sList->changeItem(preview, sList->text(0), 0); sList->setCurrentItem(current); readScheme(current); @@ -432,7 +432,7 @@ void KColorScheme::sliderValueChanged( int val ) cs->contrast = val; cs->drawSampleWidgets(); - sCurrentScheme = QString::null; + sCurrentScheme = TQString::null; emit changed(true); } @@ -485,7 +485,7 @@ void KColorScheme::slotRemove() KColorSchemeEntry *entry = mSchemeList->at(ind-nSysSchemes); if (!entry) return; - if (unlink(QFile::encodeName(entry->path).data())) { + if (unlink(TQFile::encodeName(entry->path).data())) { KMessageBox::error( 0, i18n("This color scheme could not be removed.\n" "Perhaps you do not have permission to alter the file" @@ -508,11 +508,11 @@ void KColorScheme::slotRemove() */ void KColorScheme::slotAdd() { - QString sName; + TQString sName; if (sList->currentItem() >= nSysSchemes) sName = sList->currentText(); - QString sFile; + TQString sFile; bool valid = false; bool ok; @@ -550,8 +550,8 @@ void KColorScheme::slotAdd() valid = true; } - disconnect(sList, SIGNAL(highlighted(int)), this, - SLOT(slotPreviewScheme(int))); + disconnect(sList, TQT_SIGNAL(highlighted(int)), this, + TQT_SLOT(slotPreviewScheme(int))); if (exists != -1) { @@ -571,18 +571,18 @@ void KColorScheme::slotAdd() } slotSave(); - QPixmap preview = mkColorPreview(cs); + TQPixmap preview = mkColorPreview(cs); int current = sList->currentItem(); sList->changeItem(preview, sList->text(current), current); - connect(sList, SIGNAL(highlighted(int)), SLOT(slotPreviewScheme(int))); + connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int))); slotPreviewScheme(current); } void KColorScheme::slotImport() { - QString location = locateLocal( "data", "kdisplay/color-schemes/" ); + TQString location = locateLocal( "data", "kdisplay/color-schemes/" ); - KURL file ( KFileDialog::getOpenFileName(QString::null, "*.kcsrc", this) ); + KURL file ( KFileDialog::getOpenFileName(TQString::null, "*.kcsrc", this) ); if ( file.isEmpty() ) return; @@ -594,23 +594,23 @@ void KColorScheme::slotImport() } else { - QString sFile = location + file.fileName( false ); + TQString sFile = location + file.fileName( false ); KSimpleConfig *config = new KSimpleConfig(sFile); config->setGroup( "Color Scheme"); - QString sName = config->readEntry("Name", i18n("Untitled Theme")); + TQString sName = config->readEntry("Name", i18n("Untitled Theme")); delete config; insertEntry(sFile, sName); - QPixmap preview = mkColorPreview(cs); + TQPixmap preview = mkColorPreview(cs); int current = sList->currentItem(); sList->changeItem(preview, sList->text(current), current); - connect(sList, SIGNAL(highlighted(int)), SLOT(slotPreviewScheme(int))); + connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int))); slotPreviewScheme(current); } } -QColor &KColorScheme::color(int index) +TQColor &KColorScheme::color(int index) { switch(index) { case CSM_Inactive_title_bar: @@ -666,7 +666,7 @@ QColor &KColorScheme::color(int index) } -void KColorScheme::slotSelectColor(const QColor &col) +void KColorScheme::slotSelectColor(const TQColor &col) { int selection; selection = wcCombo->currentItem(); @@ -687,7 +687,7 @@ void KColorScheme::slotSelectColor(const QColor &col) cs->drawSampleWidgets(); - sCurrentScheme = QString::null; + sCurrentScheme = TQString::null; emit changed(true); } @@ -703,7 +703,7 @@ void KColorScheme::slotWidgetColor(int indx) // Do not emit KCModule::changed() colorButton->blockSignals( true ); - QColor col = color(indx); + TQColor col = color(indx); colorButton->setColor( col ); colorPushColor = col; @@ -711,7 +711,7 @@ void KColorScheme::slotWidgetColor(int indx) } -void KColorScheme::slotColorForWidget(int indx, const QColor& col) +void KColorScheme::slotColorForWidget(int indx, const TQColor& col) { if (wcCombo->currentItem() != indx) wcCombo->setCurrentItem( indx ); @@ -722,7 +722,7 @@ void KColorScheme::slotColorForWidget(int indx, const QColor& col) void KColorScheme::slotShadeSortColumnChanged(bool b) { cs->shadeSortColumn = b; - sCurrentScheme = QString::null; + sCurrentScheme = TQString::null; emit changed(true); } @@ -736,25 +736,25 @@ void KColorScheme::readScheme( int index ) { KConfigBase* config; - QColor widget(239, 239, 239); - QColor kde34Blue(103,141,178); - QColor inactiveBackground(157,170,186); - QColor activeBackground(65,142,220); - QColor inactiveForeground(221,221,221); - QColor activeBlend(107,145,184); - QColor inactiveBlend(157,170,186); - QColor activeTitleBtnBg(220,220,220); - QColor inactiveTitleBtnBg(220,220,220); - QColor alternateBackground(237,244,249); - - QColor button; - if (QPixmap::defaultDepth() > 8) + TQColor widget(239, 239, 239); + TQColor kde34Blue(103,141,178); + TQColor inactiveBackground(157,170,186); + TQColor activeBackground(65,142,220); + TQColor inactiveForeground(221,221,221); + TQColor activeBlend(107,145,184); + TQColor inactiveBlend(157,170,186); + TQColor activeTitleBtnBg(220,220,220); + TQColor inactiveTitleBtnBg(220,220,220); + TQColor alternateBackground(237,244,249); + + TQColor button; + if (TQPixmap::defaultDepth() > 8) button.setRgb(221, 223, 228 ); else button.setRgb(220, 220, 220); - QColor link(0, 0, 238); - QColor visitedLink(82, 24,139); + TQColor link(0, 0, 238); + TQColor visitedLink(82, 24,139); // note: keep default color scheme in sync with default Current Scheme if (index == 1) { @@ -818,7 +818,7 @@ void KColorScheme::readScheme( int index ) cs->buttonTxt = config->readColorEntry( "buttonForeground", &black ); cs->link = config->readColorEntry( "linkColor", &link ); cs->visitedLink = config->readColorEntry( "visitedLinkColor", &visitedLink ); - QColor alternate = KGlobalSettings::calculateAlternateBackgroundColor(cs->window); + TQColor alternate = KGlobalSettings::calculateAlternateBackgroundColor(cs->window); cs->alternateBackground = config->readColorEntry( "alternateBackground", &alternate ); if (index == 0) @@ -860,14 +860,14 @@ void KColorScheme::readSchemeNames() nSysSchemes = 2; // Global + local schemes - QStringList list = KGlobal::dirs()->findAllResources("data", + TQStringList list = KGlobal::dirs()->findAllResources("data", "kdisplay/color-schemes/*.kcsrc", false, true); // And add them - for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { + for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { KSimpleConfig *config = new KSimpleConfig(*it); config->setGroup("Color Scheme"); - QString str = config->readEntry("Name"); + TQString str = config->readEntry("Name"); if (str.isEmpty()) { str = config->readEntry("name"); if (str.isEmpty()) @@ -888,7 +888,7 @@ void KColorScheme::readSchemeNames() { sList->setCurrentItem(i); readScheme(i); - QPixmap preview = mkColorPreview(cs); + TQPixmap preview = mkColorPreview(cs); sList->changeItem(preview, sList->text(i), i); } @@ -897,14 +897,14 @@ void KColorScheme::readSchemeNames() /* * Find scheme based on filename */ -int KColorScheme::findSchemeByName(const QString &scheme) +int KColorScheme::findSchemeByName(const TQString &scheme) { if (scheme.isEmpty()) return 0; if (scheme == "") return 1; - QString search = scheme; + TQString search = scheme; int i = search.findRev('/'); if (i >= 0) search = search.mid(i+1); @@ -952,23 +952,23 @@ void KColorScheme::slotPreviewScheme(int indx) /* this function should dissappear: colorscm should work directly on a Qt palette, since this will give us much more cusomization with qt-2.0. */ -QPalette KColorScheme::createPalette() +TQPalette KColorScheme::createPalette() { - QColorGroup disabledgrp(cs->windowTxt, cs->back, cs->back.light(150), + TQColorGroup disabledgrp(cs->windowTxt, cs->back, cs->back.light(150), cs->back.dark(), cs->back.dark(120), cs->back.dark(120), cs->window); - QColorGroup colgrp(cs->windowTxt, cs->back, cs->back.light(150), + TQColorGroup colgrp(cs->windowTxt, cs->back, cs->back.light(150), cs->back.dark(), cs->back.dark(120), cs->txt, cs->window); - colgrp.setColor(QColorGroup::Highlight, cs->select); - colgrp.setColor(QColorGroup::HighlightedText, cs->selectTxt); - colgrp.setColor(QColorGroup::Button, cs->button); - colgrp.setColor(QColorGroup::ButtonText, cs->buttonTxt); - return QPalette( colgrp, disabledgrp, colgrp); + colgrp.setColor(TQColorGroup::Highlight, cs->select); + colgrp.setColor(TQColorGroup::HighlightedText, cs->selectTxt); + colgrp.setColor(TQColorGroup::Button, cs->button); + colgrp.setColor(TQColorGroup::ButtonText, cs->buttonTxt); + return TQPalette( colgrp, disabledgrp, colgrp); } -void KColorScheme::insertEntry(const QString &sFile, const QString &sName) +void KColorScheme::insertEntry(const TQString &sFile, const TQString &sName) { KColorSchemeEntry *newEntry = new KColorSchemeEntry(sFile, sName, true); mSchemeList->inSort(newEntry); diff --git a/kcontrol/colors/colorscm.h b/kcontrol/colors/colorscm.h index 23b47c6a0..1494b072d 100644 --- a/kcontrol/colors/colorscm.h +++ b/kcontrol/colors/colorscm.h @@ -8,10 +8,10 @@ #ifndef __COLORSCM_H__ #define __COLORSCM_H__ -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -39,7 +39,7 @@ class KColorScheme: public KCModule Q_OBJECT public: - KColorScheme(QWidget *parent, const char *name, const QStringList &); + KColorScheme(TQWidget *parent, const char *name, const TQStringList &); ~KColorScheme(); virtual void load(); @@ -53,38 +53,38 @@ private slots: void slotAdd(); void slotRemove(); void slotImport(); - void slotSelectColor(const QColor &col); + void slotSelectColor(const TQColor &col); void slotWidgetColor(int); - void slotColorForWidget(int, const QColor &); + void slotColorForWidget(int, const TQColor &); void slotPreviewScheme(int); void slotShadeSortColumnChanged(bool); private: - void setColorName( const QString &name, int id ); + void setColorName( const TQString &name, int id ); void readScheme(int index=0); void readSchemeNames(); - void insertEntry(const QString &sFile, const QString &sName); - int findSchemeByName(const QString &scheme); - QPalette createPalette(); + void insertEntry(const TQString &sFile, const TQString &sName); + int findSchemeByName(const TQString &scheme); + TQPalette createPalette(); - QColor &color(int index); + TQColor &color(int index); int nSysSchemes; bool useRM; - QColor colorPushColor; - QSlider *sb; - QComboBox *wcCombo; - QPushButton *addBt, *removeBt, *importBt; + TQColor colorPushColor; + TQSlider *sb; + TQComboBox *wcCombo; + TQPushButton *addBt, *removeBt, *importBt; KListBox *sList; KColorSchemeList *mSchemeList; - QString sCurrentScheme; + TQString sCurrentScheme; KColorButton *colorButton; WidgetCanvas *cs; - QCheckBox *cbExportColors; - QCheckBox *cbShadeList; + TQCheckBox *cbExportColors; + TQCheckBox *cbShadeList; }; #endif diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index 42adcc3bb..67e68b3a3 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -5,13 +5,13 @@ // Copyright (c) Mark Donohoe 1998 // -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -24,25 +24,25 @@ #include "widgetcanvas.moc" #include "stdclient_bitmaps.h" -static QPixmap* close_pix = 0; -static QPixmap* maximize_pix = 0; -static QPixmap* minimize_pix = 0; -static QPixmap* normalize_pix = 0; -static QPixmap* pinup_pix = 0; -static QPixmap* pindown_pix = 0; -static QPixmap* menu_pix = 0; - -static QPixmap* dis_close_pix = 0; -static QPixmap* dis_maximize_pix = 0; -static QPixmap* dis_minimize_pix = 0; -static QPixmap* dis_normalize_pix = 0; -static QPixmap* dis_pinup_pix = 0; -static QPixmap* dis_pindown_pix = 0; -static QPixmap* dis_menu_pix = 0; - - -WidgetCanvas::WidgetCanvas( QWidget *parent, const char *name ) - : QWidget( parent, name ), shadeSortColumn( true ) +static TQPixmap* close_pix = 0; +static TQPixmap* maximize_pix = 0; +static TQPixmap* minimize_pix = 0; +static TQPixmap* normalize_pix = 0; +static TQPixmap* pinup_pix = 0; +static TQPixmap* pindown_pix = 0; +static TQPixmap* menu_pix = 0; + +static TQPixmap* dis_close_pix = 0; +static TQPixmap* dis_maximize_pix = 0; +static TQPixmap* dis_minimize_pix = 0; +static TQPixmap* dis_normalize_pix = 0; +static TQPixmap* dis_pinup_pix = 0; +static TQPixmap* dis_pindown_pix = 0; +static TQPixmap* dis_menu_pix = 0; + + +WidgetCanvas::WidgetCanvas( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), shadeSortColumn( true ) { setMouseTracking( true ); setBackgroundMode( NoBackground ); @@ -51,17 +51,17 @@ WidgetCanvas::WidgetCanvas( QWidget *parent, const char *name ) currentHotspot = -1; } -void WidgetCanvas::addToolTip( int area, const QString &tip ) +void WidgetCanvas::addToolTip( int area, const TQString &tip ) { tips.insert(area, tip); } -void WidgetCanvas::paintEvent(QPaintEvent *) +void WidgetCanvas::paintEvent(TQPaintEvent *) { bitBlt( this, 0, 0, &smplw ); } -void WidgetCanvas::mousePressEvent( QMouseEvent *me ) +void WidgetCanvas::mousePressEvent( TQMouseEvent *me ) { for ( int i = 0; i < MAX_HOTSPOTS; i++ ) if ( hotspots[i].rect.contains( me->pos() ) ) { @@ -70,25 +70,25 @@ void WidgetCanvas::mousePressEvent( QMouseEvent *me ) } } -void WidgetCanvas::mouseMoveEvent( QMouseEvent *me ) +void WidgetCanvas::mouseMoveEvent( TQMouseEvent *me ) { for ( int i = 0; i < MAX_HOTSPOTS; i++ ) if ( hotspots[i].rect.contains( me->pos() ) ) { if ( i != currentHotspot ) { - QString tip = tips[hotspots[i].number]; - QToolTip::remove( this ); - QToolTip::add( this, tip ); + TQString tip = tips[hotspots[i].number]; + TQToolTip::remove( this ); + TQToolTip::add( this, tip ); currentHotspot = i; } return; } - QToolTip::remove( this ); + TQToolTip::remove( this ); } -void WidgetCanvas::dropEvent( QDropEvent *e) +void WidgetCanvas::dropEvent( TQDropEvent *e) { - QColor c; + TQColor c; if (KColorDrag::decode( e, c)) { for ( int i = 0; i < MAX_HOTSPOTS; i++ ) if ( hotspots[i].rect.contains( e->pos() ) ) { @@ -99,17 +99,17 @@ void WidgetCanvas::dropEvent( QDropEvent *e) } -void WidgetCanvas::dragEnterEvent( QDragEnterEvent *e) +void WidgetCanvas::dragEnterEvent( TQDragEnterEvent *e) { e->accept( KColorDrag::canDecode( e)); } -void WidgetCanvas::paletteChange(const QPalette &) +void WidgetCanvas::paletteChange(const TQPalette &) { drawSampleWidgets(); } -void WidgetCanvas::resizeEvent(QResizeEvent *) +void WidgetCanvas::resizeEvent(TQResizeEvent *) { drawSampleWidgets(); } @@ -118,13 +118,13 @@ void WidgetCanvas::resizeEvent(QResizeEvent *) * This is necessary because otherwise the scrollbar in drawSampleWidgets() * doesn't show the first time. */ -void WidgetCanvas::showEvent(QShowEvent *) +void WidgetCanvas::showEvent(TQShowEvent *) { drawSampleWidgets(); } -void WidgetCanvas::resetTitlebarPixmaps(const QColor &actMed, - const QColor &disMed) +void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed, + const TQColor &disMed) { if(close_pix) delete close_pix; if(maximize_pix) delete maximize_pix; @@ -142,133 +142,133 @@ void WidgetCanvas::resetTitlebarPixmaps(const QColor &actMed, if(dis_pindown_pix) delete dis_pindown_pix; if(dis_menu_pix) delete dis_menu_pix; - QPainter pact, pdis; - QBitmap bitmap; - QColor actHigh = actMed.light(150); - QColor actLow = actMed.dark(120); - QColor disHigh = disMed.light(150); - QColor disLow = disMed.dark(120); + TQPainter pact, pdis; + TQBitmap bitmap; + TQColor actHigh = actMed.light(150); + TQColor actLow = actMed.dark(120); + TQColor disHigh = disMed.light(150); + TQColor disLow = disMed.dark(120); - close_pix = new QPixmap(16, 16); - dis_close_pix = new QPixmap(16, 16); + close_pix = new TQPixmap(16, 16); + dis_close_pix = new TQPixmap(16, 16); pact.begin(close_pix); pdis.begin(dis_close_pix); - bitmap = QBitmap(16, 16, close_white_bits, true); + bitmap = TQBitmap(16, 16, close_white_bits, true); bitmap.setMask(bitmap); pact.setPen(actHigh); pdis.setPen(disHigh); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, close_dgray_bits, true); + bitmap = TQBitmap(16, 16, close_dgray_bits, true); pact.setPen(actLow); pdis.setPen(disLow); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = QBitmap(16, 16, close_mask_bits, true); + bitmap = TQBitmap(16, 16, close_mask_bits, true); close_pix->setMask(bitmap); dis_close_pix->setMask(bitmap); - minimize_pix = new QPixmap(16, 16); - dis_minimize_pix = new QPixmap(16, 16); + minimize_pix = new TQPixmap(16, 16); + dis_minimize_pix = new TQPixmap(16, 16); pact.begin(minimize_pix); pdis.begin(dis_minimize_pix); - bitmap = QBitmap(16, 16, iconify_white_bits, true); + bitmap = TQBitmap(16, 16, iconify_white_bits, true); bitmap.setMask(bitmap); pact.setPen(actHigh); pdis.setPen(disHigh); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, iconify_dgray_bits, true); + bitmap = TQBitmap(16, 16, iconify_dgray_bits, true); pact.setPen(actLow); pdis.setPen(disLow); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = QBitmap(16, 16, iconify_mask_bits, true); + bitmap = TQBitmap(16, 16, iconify_mask_bits, true); minimize_pix->setMask(bitmap); dis_minimize_pix->setMask(bitmap); - maximize_pix = new QPixmap(16, 16); - dis_maximize_pix = new QPixmap(16, 16); + maximize_pix = new TQPixmap(16, 16); + dis_maximize_pix = new TQPixmap(16, 16); pact.begin(maximize_pix); pdis.begin(dis_maximize_pix); - bitmap = QBitmap(16, 16, maximize_white_bits, true); + bitmap = TQBitmap(16, 16, maximize_white_bits, true); bitmap.setMask(bitmap); pact.setPen(actHigh); pdis.setPen(disHigh); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, maximize_dgray_bits, true); + bitmap = TQBitmap(16, 16, maximize_dgray_bits, true); pact.setPen(actLow); pdis.setPen(disLow); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = QBitmap(16, 16, maximize_mask_bits, true); + bitmap = TQBitmap(16, 16, maximize_mask_bits, true); maximize_pix->setMask(bitmap); dis_maximize_pix->setMask(bitmap); - normalize_pix = new QPixmap(16, 16); - dis_normalize_pix = new QPixmap(16, 16); + normalize_pix = new TQPixmap(16, 16); + dis_normalize_pix = new TQPixmap(16, 16); pact.begin(normalize_pix); pdis.begin(dis_normalize_pix); - bitmap = QBitmap(16, 16, maximizedown_white_bits, true); + bitmap = TQBitmap(16, 16, maximizedown_white_bits, true); bitmap.setMask(bitmap); pact.setPen(actHigh); pdis.setPen(disHigh); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, maximizedown_dgray_bits, true); + bitmap = TQBitmap(16, 16, maximizedown_dgray_bits, true); pact.setPen(actLow); pdis.setPen(disLow); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = QBitmap(16, 16, maximizedown_mask_bits, true); + bitmap = TQBitmap(16, 16, maximizedown_mask_bits, true); normalize_pix->setMask(bitmap); dis_normalize_pix->setMask(bitmap); - menu_pix = new QPixmap(16, 16); - dis_menu_pix = new QPixmap(16, 16); + menu_pix = new TQPixmap(16, 16); + dis_menu_pix = new TQPixmap(16, 16); pact.begin(menu_pix); pdis.begin(dis_menu_pix); - bitmap = QBitmap(16, 16, menu_white_bits, true); + bitmap = TQBitmap(16, 16, menu_white_bits, true); bitmap.setMask(bitmap); pact.setPen(actHigh); pdis.setPen(disHigh); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, menu_dgray_bits, true); + bitmap = TQBitmap(16, 16, menu_dgray_bits, true); pact.setPen(actLow); pdis.setPen(disLow); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = QBitmap(16, 16, menu_mask_bits, true); + bitmap = TQBitmap(16, 16, menu_mask_bits, true); menu_pix->setMask(bitmap); dis_menu_pix->setMask(bitmap); - pinup_pix = new QPixmap(16, 16); - dis_pinup_pix = new QPixmap(16, 16); + pinup_pix = new TQPixmap(16, 16); + dis_pinup_pix = new TQPixmap(16, 16); pact.begin(pinup_pix); pdis.begin(dis_pinup_pix); - bitmap = QBitmap(16, 16, pinup_white_bits, true); + bitmap = TQBitmap(16, 16, pinup_white_bits, true); bitmap.setMask(bitmap); pact.setPen(actHigh); pdis.setPen(disHigh); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, pinup_gray_bits, true); + bitmap = TQBitmap(16, 16, pinup_gray_bits, true); pact.setPen(actMed); pdis.setPen(disMed); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, pinup_dgray_bits, true); + bitmap = TQBitmap(16, 16, pinup_dgray_bits, true); bitmap.setMask(bitmap); pact.setPen(actLow); pdis.setPen(disLow); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = QBitmap(16, 16, pinup_mask_bits, true); + bitmap = TQBitmap(16, 16, pinup_mask_bits, true); pinup_pix->setMask(bitmap); dis_pinup_pix->setMask(bitmap); - pindown_pix = new QPixmap(16, 16); - dis_pindown_pix = new QPixmap(16, 16); + pindown_pix = new TQPixmap(16, 16); + dis_pindown_pix = new TQPixmap(16, 16); pact.begin(pindown_pix); pdis.begin(dis_pindown_pix); - bitmap = QBitmap(16, 16, pindown_white_bits, true); + bitmap = TQBitmap(16, 16, pindown_white_bits, true); bitmap.setMask(bitmap); pact.setPen(actHigh); pdis.setPen(disHigh); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, pindown_gray_bits, true); + bitmap = TQBitmap(16, 16, pindown_gray_bits, true); pact.setPen(actMed); pdis.setPen(disMed); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, pindown_dgray_bits, true); + bitmap = TQBitmap(16, 16, pindown_dgray_bits, true); bitmap.setMask(bitmap); pact.setPen(actLow); pdis.setPen(disLow); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = QBitmap(16, 16, pindown_mask_bits, true); + bitmap = TQBitmap(16, 16, pindown_mask_bits, true); pindown_pix->setMask(bitmap); dis_pindown_pix->setMask(bitmap); } @@ -282,15 +282,15 @@ void WidgetCanvas::drawSampleWidgets() // Keep in sync with kglobalsettings. - QFont windowFontGuess(KGlobalSettings::generalFont().family(), 12, QFont::SansSerif, true); + TQFont windowFontGuess(KGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true); windowFontGuess.setPixelSize(12); c->setGroup("WM"); - QFont windowFont = c->readFontEntry("activeFont", &windowFontGuess); + TQFont windowFont = c->readFontEntry("activeFont", &windowFontGuess); c->setGroup("General"); - QFont defaultMenuFont = KGlobalSettings::menuFont(); - QFont menuFont = c->readFontEntry("menuFont", &defaultMenuFont); + TQFont defaultMenuFont = KGlobalSettings::menuFont(); + TQFont menuFont = c->readFontEntry("menuFont", &defaultMenuFont); delete c; c = 0; @@ -301,7 +301,7 @@ void WidgetCanvas::drawSampleWidgets() highlightVal=100+(2*contrast+4)*16/10; lowlightVal=100+(2*contrast+4)*10; - QColorGroup cg( txt, back, + TQColorGroup cg( txt, back, back.light(highlightVal), back.dark(lowlightVal), back.dark(120), @@ -309,26 +309,26 @@ void WidgetCanvas::drawSampleWidgets() // We will need this brush. - QBrush brush(SolidPattern); + TQBrush brush(SolidPattern); brush.setColor( back ); // Create a scrollbar and redirect drawing into a temp. pixmap to save a // lot of fiddly drawing later. - QScrollBar *vertScrollBar = new QScrollBar( QScrollBar::Vertical, this ); - // TODO: vertScrollBar->setStyle( new QMotifStyle() ); + TQScrollBar *vertScrollBar = new TQScrollBar( TQScrollBar::Vertical, this ); + // TODO: vertScrollBar->setStyle( new TQMotifStyle() ); vertScrollBar->setGeometry( 400, 400, SCROLLBAR_SIZE, height()); vertScrollBar->setRange( 0, 0 ); - vertScrollBar->setPalette( QPalette(cg,cg,cg)); + vertScrollBar->setPalette( TQPalette(cg,cg,cg)); vertScrollBar->show(); - QPixmap pm( vertScrollBar->width(), vertScrollBar->height() ); + TQPixmap pm( vertScrollBar->width(), vertScrollBar->height() ); pm.fill( back ); #ifndef __osf__ - QPainter::redirect( vertScrollBar, &pm ); + TQPainter::redirect( vertScrollBar, &pm ); #endif vertScrollBar->repaint(); - QPainter::redirect( vertScrollBar, 0 ); + TQPainter::redirect( vertScrollBar, 0 ); vertScrollBar->hide(); // Reset the titlebar pixmaps @@ -342,7 +342,7 @@ void WidgetCanvas::drawSampleWidgets() // Actually start painting in - QPainter paint( &smplw ); + TQPainter paint( &smplw ); // Inactive window @@ -377,19 +377,19 @@ void WidgetCanvas::drawSampleWidgets() int spot = 0; hotspots[ spot++ ] = - HotSpot( QRect( 65, 25-14, textLen, 14 ), CSM_Inactive_title_text ); + HotSpot( TQRect( 65, 25-14, textLen, 14 ), CSM_Inactive_title_text ); hotspots[ spot++ ] = - HotSpot( QRect( 60, 10, (width()-160)/2, 20 ), CSM_Inactive_title_bar ); + HotSpot( TQRect( 60, 10, (width()-160)/2, 20 ), CSM_Inactive_title_bar ); hotspots[ spot++ ] = - HotSpot( QRect( 60+(width()-160)/2, 10, + HotSpot( TQRect( 60+(width()-160)/2, 10, (width()-160)/2, 20 ), CSM_Inactive_title_blend ); hotspots[spot++] = - HotSpot(QRect(20, 12, 40, 20), CSM_Inactive_title_button); + HotSpot(TQRect(20, 12, 40, 20), CSM_Inactive_title_button); hotspots[spot++] = - HotSpot(QRect(tmp, 12, 60, 20), CSM_Inactive_title_button); + HotSpot(TQRect(tmp, 12, 60, 20), CSM_Inactive_title_button); // Active window @@ -420,44 +420,44 @@ void WidgetCanvas::drawSampleWidgets() paint.drawPixmap(tmp+42, 35, *close_pix); hotspots[ spot++ ] = - HotSpot( QRect( 75, 50-14, textLen, 14 ), CSM_Active_title_text); + HotSpot( TQRect( 75, 50-14, textLen, 14 ), CSM_Active_title_text); hotspots[ spot ++] = - HotSpot( QRect( 65, 35, (width()-152)/2, 20 ), CSM_Active_title_bar ); + HotSpot( TQRect( 65, 35, (width()-152)/2, 20 ), CSM_Active_title_bar ); hotspots[ spot ++] = - HotSpot( QRect( 65+(width()-152)/2, 35, + HotSpot( TQRect( 65+(width()-152)/2, 35, (width()-152)/2, 20 ), CSM_Active_title_blend ); hotspots[spot++] = - HotSpot(QRect(25, 35, 40, 20), CSM_Active_title_button); + HotSpot(TQRect(25, 35, 40, 20), CSM_Active_title_button); hotspots[spot++] = - HotSpot(QRect(tmp, 35, 60, 20), CSM_Active_title_button); + HotSpot(TQRect(tmp, 35, 60, 20), CSM_Active_title_button); // Menu bar //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush); - kapp->style().drawPrimitive(QStyle::PE_PanelMenuBar, &paint, - QRect(QPoint(25, 55), QSize(width()-52, 28)), cg); + kapp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint, + TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg); paint.setFont( menuFont ); paint.setPen(txt ); - QString file = i18n("File"); + TQString file = i18n("File"); textLen = paint.fontMetrics().width( file ); //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush); - kapp->style().drawPrimitive(QStyle::PE_Panel, &paint, - QRect(30, 59, textLen + 10, 21), cg); + kapp->style().drawPrimitive(TQStyle::PE_Panel, &paint, + TQRect(30, 59, textLen + 10, 21), cg); paint.drawText( 35, 74, file ); hotspots[ spot++ ] = - HotSpot( QRect( 35, 62, textLen, 14 ), CSM_Text ); + HotSpot( TQRect( 35, 62, textLen, 14 ), CSM_Text ); hotspots[ spot++ ] = - HotSpot( QRect( 27, 57, 33, 21 ), CSM_Background ); + HotSpot( TQRect( 27, 57, 33, 21 ), CSM_Background ); paint.setFont( menuFont ); paint.setPen( txt ); paint.drawText( 35 + textLen + 20, 74, i18n("Edit") ); textLen = paint.fontMetrics().width( i18n("Edit") ); - hotspots[ spot++ ] = HotSpot( QRect( 35 + textLen + 20, 62, textLen, 14 ), CSM_Text ); + hotspots[ spot++ ] = HotSpot( TQRect( 35 + textLen + 20, 62, textLen, 14 ), CSM_Text ); // Button Rects need to go before window @@ -468,7 +468,7 @@ void WidgetCanvas::drawSampleWidgets() height(), cg, TRUE, 2, &brush); // Standard text - QFont fnt = KGlobalSettings::generalFont(); + TQFont fnt = KGlobalSettings::generalFont(); paint.setFont( fnt ); paint.setPen( windowTxt ); paint.drawText( 140, 127-20, i18n( "Standard text") ); @@ -476,7 +476,7 @@ void WidgetCanvas::drawSampleWidgets() int column2 = 120 + textLen + 40 + 16; hotspots[ spot++ ] = - HotSpot( QRect( 140, 113-20, textLen, 14 ), CSM_Standard_text ); + HotSpot( TQRect( 140, 113-20, textLen, 14 ), CSM_Standard_text ); // Selected text textLen = paint.fontMetrics().width( i18n("Selected text") ); @@ -491,9 +491,9 @@ void WidgetCanvas::drawSampleWidgets() paint.drawText( 140, 135, i18n( "Selected text") ); hotspots[ spot++ ] = - HotSpot( QRect( 140, 121, textLen, 14 ), CSM_Select_text ); + HotSpot( TQRect( 140, 121, textLen, 14 ), CSM_Select_text ); hotspots[ spot++ ] = - HotSpot( QRect( 120, 115, textLen+40, 32), CSM_Select_background ); // select bg + HotSpot( TQRect( 120, 115, textLen+40, 32), CSM_Select_background ); // select bg // Link paint.setPen( link ); @@ -502,7 +502,7 @@ void WidgetCanvas::drawSampleWidgets() paint.drawLine( column2+18, 109, column2+18+textLen, 109); hotspots[ spot++ ] = - HotSpot( QRect( column2+18, 113-20, textLen, 17 ), CSM_Link ); + HotSpot( TQRect( column2+18, 113-20, textLen, 17 ), CSM_Link ); int column3 = column2 + 25 + textLen; // Followed Link @@ -512,24 +512,24 @@ void WidgetCanvas::drawSampleWidgets() paint.drawLine( column3, 109, column3+textLen, 109); hotspots[ spot++ ] = - HotSpot( QRect( column3, 113-20, textLen, 17 ), CSM_Followed_Link ); + HotSpot( TQRect( column3, 113-20, textLen, 17 ), CSM_Followed_Link ); // Button int xpos = column2; int ypos = 115 + 2; textLen = paint.fontMetrics().width(i18n("Push Button")); hotspots[ spot++ ] = - HotSpot( QRect(xpos+16, ypos+((28-paint.fontMetrics().height())/2), + HotSpot( TQRect(xpos+16, ypos+((28-paint.fontMetrics().height())/2), textLen, paint.fontMetrics().height()), CSM_Button_text ); hotspots[ spot++ ] = - HotSpot( QRect(xpos, ypos, textLen+32, 28), CSM_Button_background ); + HotSpot( TQRect(xpos, ypos, textLen+32, 28), CSM_Button_background ); //brush.setColor( button ); - QColorGroup cg2(cg); - cg2.setColor(QColorGroup::Button, button); - cg2.setColor(QColorGroup::Background, window); + TQColorGroup cg2(cg); + cg2.setColor(TQColorGroup::Button, button); + cg2.setColor(TQColorGroup::Background, window); //qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush); - kapp->style().drawPrimitive(QStyle::PE_ButtonCommand, &paint, - QRect(xpos, ypos, textLen+32, 28), cg2, QStyle::Style_Enabled | QStyle::Style_Raised); + kapp->style().drawPrimitive(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, i18n("Push Button")); @@ -547,20 +547,20 @@ void WidgetCanvas::drawSampleWidgets() textLenNew = paint.fontMetrics().width( i18n("New") ); hotspots[ spot++ ] = - HotSpot( QRect( 56, 83, textLenNew, 14 ), CSM_Text ); + HotSpot( TQRect( 56, 83, textLenNew, 14 ), CSM_Text ); paint.setFont( menuFont ); textLenOpen = paint.fontMetrics().width( i18n("Menu item", "Open") ); hotspots[ spot++ ] = - HotSpot( QRect( 56, 105, textLenOpen, 14 ), CSM_Text ); + HotSpot( TQRect( 56, 105, textLenOpen, 14 ), CSM_Text ); paint.setFont( menuFont ); textLenSave = paint.fontMetrics().width( i18n("Menu item", "Save") ); - QPopupMenu *popup = new QPopupMenu( this ); + TQPopupMenu *popup = new TQPopupMenu( this ); popup->setFont( menuFont ); - popup->setPalette( QPalette(cg,cg,cg)); + popup->setPalette( TQPalette(cg,cg,cg)); popup->insertItem(i18n("New")); popup->insertItem(i18n("Menu item", "Open")); int id = popup->insertItem(i18n("Menu item", "Save")); @@ -571,15 +571,15 @@ void WidgetCanvas::drawSampleWidgets() //popup->sizeHint(); // Breaks with Qt 3.3 popup->resize(popup->sizeHint()); - pm = QPixmap::grabWidget( popup ); + pm = TQPixmap::grabWidget( popup ); delete popup; bitBlt(&smplw, 30, 80, &pm, 0, 0, pm.width(), pm.height()); hotspots[ spot++ ] = - HotSpot( QRect( 28, 78, 88, 77 ), CSM_Background ); + HotSpot( TQRect( 28, 78, 88, 77 ), CSM_Background ); hotspots[ spot++ ] = - HotSpot( QRect(25, 80+5-4, width()-7-45-2-16, height()), CSM_Standard_background ); + HotSpot( TQRect(25, 80+5-4, width()-7-45-2-16, height()), CSM_Standard_background ); // Valance @@ -590,7 +590,7 @@ void WidgetCanvas::drawSampleWidgets() // Stop the painting hotspots[ spot++ ] = - HotSpot( QRect( 0, 0, width(), height() ), CSM_Background ); // ? + HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ? repaint( FALSE ); } diff --git a/kcontrol/colors/widgetcanvas.h b/kcontrol/colors/widgetcanvas.h index e2f9bd057..4e78d599e 100644 --- a/kcontrol/colors/widgetcanvas.h +++ b/kcontrol/colors/widgetcanvas.h @@ -8,7 +8,7 @@ #ifndef __WIDGETCANVAS_H__ #define __WIDGETCANVAS_H__ -#include +#include #include #define MAX_HOTSPOTS 28 @@ -51,10 +51,10 @@ class HotSpot { public: HotSpot() {} - HotSpot( const QRect &r, int num ) + HotSpot( const TQRect &r, int num ) : rect(r), number(num) {} - QRect rect; + TQRect rect; int number; }; @@ -63,57 +63,57 @@ class WidgetCanvas : public QWidget Q_OBJECT public: - WidgetCanvas( QWidget *parent=0, const char *name=0 ); + WidgetCanvas( TQWidget *parent=0, const char *name=0 ); void drawSampleWidgets(); - void resetTitlebarPixmaps(const QColor &active, - const QColor &inactive); - void addToolTip( int area, const QString & ); - QPixmap smplw; + void resetTitlebarPixmaps(const TQColor &active, + const TQColor &inactive); + void addToolTip( int area, const TQString & ); + TQPixmap smplw; - QColor iaTitle; - QColor iaTxt; - QColor iaBlend; - QColor iaFrame; - QColor iaHandle; - QColor aTitle; - QColor aTxt; - QColor aBlend; - QColor aFrame; - QColor aHandle; - QColor back; - QColor txt; - QColor select; - QColor selectTxt; - QColor window; - QColor windowTxt; - QColor button; - QColor buttonTxt; - QColor aTitleBtn; - QColor iTitleBtn; - QColor link; - QColor visitedLink; - QColor alternateBackground; + TQColor iaTitle; + TQColor iaTxt; + TQColor iaBlend; + TQColor iaFrame; + TQColor iaHandle; + TQColor aTitle; + TQColor aTxt; + TQColor aBlend; + TQColor aFrame; + TQColor aHandle; + TQColor back; + TQColor txt; + TQColor select; + TQColor selectTxt; + TQColor window; + TQColor windowTxt; + TQColor button; + TQColor buttonTxt; + TQColor aTitleBtn; + TQColor iTitleBtn; + TQColor link; + TQColor visitedLink; + TQColor alternateBackground; int contrast; bool shadeSortColumn; signals: void widgetSelected( int ); - void colorDropped( int, const QColor&); + void colorDropped( int, const TQColor&); protected: - void redrawPopup(const QColorGroup &cg); + void redrawPopup(const TQColorGroup &cg); - virtual void paintEvent( QPaintEvent * ); - virtual void mousePressEvent( QMouseEvent * ); - virtual void mouseMoveEvent( QMouseEvent * ); - virtual void resizeEvent( QResizeEvent * ); - virtual void showEvent( QShowEvent * ); - virtual void dropEvent( QDropEvent *); - virtual void dragEnterEvent( QDragEnterEvent *); - void paletteChange( const QPalette & ); + virtual void paintEvent( TQPaintEvent * ); + virtual void mousePressEvent( TQMouseEvent * ); + virtual void mouseMoveEvent( TQMouseEvent * ); + virtual void resizeEvent( TQResizeEvent * ); + virtual void showEvent( TQShowEvent * ); + virtual void dropEvent( TQDropEvent *); + virtual void dragEnterEvent( TQDragEnterEvent *); + void paletteChange( const TQPalette & ); - QMap tips; + TQMap tips; HotSpot hotspots[MAX_HOTSPOTS]; int currentHotspot; }; diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index 792b250a0..88fdeb165 100644 --- a/kcontrol/componentchooser/componentchooser.cpp +++ b/kcontrol/componentchooser/componentchooser.cpp @@ -19,11 +19,11 @@ #include "componentchooser.h" #include "componentchooser.moc" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -41,23 +41,23 @@ class MyListBoxItem: public QListBoxText { public: - MyListBoxItem(const QString& text, const QString &file):QListBoxText(text),File(file){} + MyListBoxItem(const TQString& text, const TQString &file):TQListBoxText(text),File(file){} virtual ~MyListBoxItem(){;} - QString File; + TQString File; }; //BEGIN General kpart based Component selection -CfgComponent::CfgComponent(QWidget *parent):ComponentConfig_UI(parent),CfgPlugin(){ +CfgComponent::CfgComponent(TQWidget *parent):ComponentConfig_UI(parent),CfgPlugin(){ m_lookupDict.setAutoDelete(true); m_revLookupDict.setAutoDelete(true); - connect(ComponentSelector,SIGNAL(activated(const QString&)),this,SLOT(slotComponentChanged(const QString&))); + connect(ComponentSelector,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(slotComponentChanged(const TQString&))); } CfgComponent::~CfgComponent(){} -void CfgComponent::slotComponentChanged(const QString&) { +void CfgComponent::slotComponentChanged(const TQString&) { emit changed(true); } @@ -66,7 +66,7 @@ void CfgComponent::save(KConfig *cfg) { if (!m_lookupDict[ComponentSelector->currentText()]) return; - QString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure"); + TQString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure"); KConfig *store = new KConfig(cfg->readPathEntry("storeInFile","null")); store->setGroup(cfg->readEntry("valueSection")); store->writePathEntry(cfg->readEntry("valueName","kcm_componenchooser_null"),*m_lookupDict[ComponentSelector->currentText()]); @@ -81,24 +81,24 @@ void CfgComponent::load(KConfig *cfg) { m_lookupDict.clear(); m_revLookupDict.clear(); - QString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure"); + TQString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure"); - QString MimeTypeOfInterest=cfg->readEntry("MimeTypeOfInterest"); + TQString MimeTypeOfInterest=cfg->readEntry("MimeTypeOfInterest"); KTrader::OfferList offers = KTrader::self()->query(MimeTypeOfInterest, "'"+ServiceTypeToConfigure+"' in ServiceTypes"); for (KTrader::OfferList::Iterator tit = offers.begin(); tit != offers.end(); ++tit) { ComponentSelector->insertItem((*tit)->name()); - m_lookupDict.insert((*tit)->name(),new QString((*tit)->desktopEntryName())); - m_revLookupDict.insert((*tit)->desktopEntryName(),new QString((*tit)->name())); + m_lookupDict.insert((*tit)->name(),new TQString((*tit)->desktopEntryName())); + m_revLookupDict.insert((*tit)->desktopEntryName(),new TQString((*tit)->name())); } KConfig *store = new KConfig(cfg->readPathEntry("storeInFile","null")); store->setGroup(cfg->readEntry("valueSection")); - QString setting=store->readEntry(cfg->readEntry("valueName","kcm_componenchooser_null")); + TQString setting=store->readEntry(cfg->readEntry("valueName","kcm_componenchooser_null")); delete store; if (setting.isEmpty()) setting=cfg->readEntry("defaultImplementation"); - QString *tmp=m_revLookupDict[setting]; + TQString *tmp=m_revLookupDict[setting]; if (tmp) for (int i=0;icount();i++) if ((*tmp)==ComponentSelector->text(i)) @@ -122,12 +122,12 @@ void CfgComponent::defaults() //BEGIN Email client config -CfgEmailClient::CfgEmailClient(QWidget *parent):EmailClientConfig_UI(parent),CfgPlugin(){ +CfgEmailClient::CfgEmailClient(TQWidget *parent):EmailClientConfig_UI(parent),CfgPlugin(){ pSettings = new KEMailSettings(); - connect(kmailCB, SIGNAL(toggled(bool)), SLOT(configChanged()) ); - connect(txtEMailClient, SIGNAL(textChanged(const QString&)), SLOT(configChanged()) ); - connect(chkRunTerminal, SIGNAL(clicked()), SLOT(configChanged()) ); + connect(kmailCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()) ); + connect(txtEMailClient, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged()) ); + connect(chkRunTerminal, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) ); } CfgEmailClient::~CfgEmailClient() { @@ -141,7 +141,7 @@ void CfgEmailClient::defaults() void CfgEmailClient::load(KConfig *) { - QString emailClient = pSettings->getSetting(KEMailSettings::ClientProgram); + TQString emailClient = pSettings->getSetting(KEMailSettings::ClientProgram); bool useKMail = (emailClient.isEmpty()); kmailCB->setChecked(useKMail); @@ -162,16 +162,16 @@ void CfgEmailClient::configChanged() void CfgEmailClient::selectEmailClient() { KURL::List urlList; - KOpenWithDlg dlg(urlList, i18n("Select preferred email client:"), QString::null, this); + KOpenWithDlg dlg(urlList, i18n("Select preferred email client:"), TQString::null, this); // hide "Do not &close when command exits" here, we don't need it for a mail client dlg.hideNoCloseOnExit(); - if (dlg.exec() != QDialog::Accepted) return; - QString client = dlg.text(); + if (dlg.exec() != TQDialog::Accepted) return; + TQString client = dlg.text(); // get the preferred Terminal Application - KConfigGroup confGroup( KGlobal::config(), QString::fromLatin1("General") ); - QString preferredTerminal = confGroup.readPathEntry("TerminalApplication", QString::fromLatin1("konsole")); - preferredTerminal += QString::fromLatin1(" -e "); + KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); + preferredTerminal += TQString::fromLatin1(" -e "); int len = preferredTerminal.length(); bool b = client.left(len) == preferredTerminal; @@ -188,7 +188,7 @@ void CfgEmailClient::save(KConfig *) { if (kmailCB->isChecked()) { - pSettings->setSetting(KEMailSettings::ClientProgram, QString::null); + pSettings->setSetting(KEMailSettings::ClientProgram, TQString::null); pSettings->setSetting(KEMailSettings::ClientTerminal, "false"); } else @@ -198,11 +198,11 @@ void CfgEmailClient::save(KConfig *) } // insure proper permissions -- contains sensitive data - QString cfgName(KGlobal::dirs()->findResource("config", "emails")); + TQString cfgName(KGlobal::dirs()->findResource("config", "emails")); if (!cfgName.isEmpty()) - ::chmod(QFile::encodeName(cfgName), 0600); + ::chmod(TQFile::encodeName(cfgName), 0600); - kapp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", QByteArray()); + kapp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", TQByteArray()); emit changed(false); } @@ -214,10 +214,10 @@ void CfgEmailClient::save(KConfig *) //BEGIN Terminal Emulator Configuration -CfgTerminalEmulator::CfgTerminalEmulator(QWidget *parent):TerminalEmulatorConfig_UI(parent),CfgPlugin(){ - connect(terminalLE,SIGNAL(textChanged(const QString &)), this, SLOT(configChanged())); - connect(terminalCB,SIGNAL(toggled(bool)),this,SLOT(configChanged())); - connect(otherCB,SIGNAL(toggled(bool)),this,SLOT(configChanged())); +CfgTerminalEmulator::CfgTerminalEmulator(TQWidget *parent):TerminalEmulatorConfig_UI(parent),CfgPlugin(){ + connect(terminalLE,TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(configChanged())); + connect(terminalCB,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); + connect(otherCB,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); } CfgTerminalEmulator::~CfgTerminalEmulator() { @@ -237,7 +237,7 @@ void CfgTerminalEmulator::defaults() void CfgTerminalEmulator::load(KConfig *) { KConfig *config = new KConfig("kdeglobals", true); config->setGroup("General"); - QString terminal = config->readPathEntry("TerminalApplication","konsole"); + TQString terminal = config->readPathEntry("TerminalApplication","konsole"); if (terminal == "konsole") { terminalLE->setText("xterm"); @@ -262,7 +262,7 @@ void CfgTerminalEmulator::save(KConfig *) { delete config; KIPC::sendMessageAll(KIPC::SettingsChanged); - kapp->dcopClient()->send("klauncher", "klauncher","reparseConfiguration()", QString::null); + kapp->dcopClient()->send("klauncher", "klauncher","reparseConfiguration()", TQString::null); emit changed(false); } @@ -270,11 +270,11 @@ void CfgTerminalEmulator::save(KConfig *) { void CfgTerminalEmulator::selectTerminalApp() { KURL::List urlList; - KOpenWithDlg dlg(urlList, i18n("Select preferred terminal application:"), QString::null, this); + KOpenWithDlg dlg(urlList, i18n("Select preferred terminal application:"), TQString::null, this); // hide "Run in &terminal" here, we don't need it for a Terminal Application dlg.hideRunInTerminal(); - if (dlg.exec() != QDialog::Accepted) return; - QString client = dlg.text(); + if (dlg.exec() != TQDialog::Accepted) return; + TQString client = dlg.text(); if (!client.isEmpty()) { @@ -286,10 +286,10 @@ void CfgTerminalEmulator::selectTerminalApp() //BEGIN Browser Configuration -CfgBrowser::CfgBrowser(QWidget *parent) : BrowserConfig_UI(parent),CfgPlugin(){ - connect(lineExec,SIGNAL(textChanged(const QString &)),this,SLOT(configChanged())); - connect(radioKIO,SIGNAL(toggled(bool)),this,SLOT(configChanged())); - connect(radioExec,SIGNAL(toggled(bool)),this,SLOT(configChanged())); +CfgBrowser::CfgBrowser(TQWidget *parent) : BrowserConfig_UI(parent),CfgPlugin(){ + connect(lineExec,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(configChanged())); + connect(radioKIO,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); + connect(radioExec,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); } CfgBrowser::~CfgBrowser() { @@ -309,7 +309,7 @@ void CfgBrowser::defaults() void CfgBrowser::load(KConfig *) { KConfig *config = new KConfig("kdeglobals", true); config->setGroup("General"); - QString exec = config->readEntry("BrowserApplication"); + TQString exec = config->readEntry("BrowserApplication"); if (exec.isEmpty()) { radioKIO->setChecked(true); @@ -330,7 +330,7 @@ void CfgBrowser::load(KConfig *) { if (m_browserService) m_browserExec = m_browserService->desktopEntryName(); else - m_browserExec = QString::null; + m_browserExec = TQString::null; } } @@ -344,7 +344,7 @@ void CfgBrowser::save(KConfig *) { KConfig *config = new KConfig("kdeglobals"); config->setGroup("General"); - QString exec; + TQString exec; if (radioExec->isChecked()) { exec = lineExec->text(); @@ -365,8 +365,8 @@ void CfgBrowser::save(KConfig *) { void CfgBrowser::selectBrowser() { KURL::List urlList; - KOpenWithDlg dlg(urlList, i18n("Select preferred Web browser application:"), QString::null, this); - if (dlg.exec() != QDialog::Accepted) return; + KOpenWithDlg dlg(urlList, i18n("Select preferred Web browser application:"), TQString::null, this); + if (dlg.exec() != TQDialog::Accepted) return; m_browserService = dlg.service(); if (m_browserService) m_browserExec = m_browserService->desktopEntryName(); @@ -378,16 +378,16 @@ void CfgBrowser::selectBrowser() //END Terminal Emulator Configuration -ComponentChooser::ComponentChooser(QWidget *parent, const char *name): +ComponentChooser::ComponentChooser(TQWidget *parent, const char *name): ComponentChooser_UI(parent,name), configWidget(0) { ComponentChooser_UILayout->setRowStretch(1, 1); somethingChanged=false; latestEditedService=""; - QStringList dummy; - QStringList services=KGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy); - for (QStringList::Iterator it=services.begin();it!=services.end();++it) + TQStringList dummy; + TQStringList services=KGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy); + for (TQStringList::Iterator it=services.begin();it!=services.end();++it) { KSimpleConfig cfg(*it); ServiceChooser->insertItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it))); @@ -395,17 +395,17 @@ ComponentChooser::ComponentChooser(QWidget *parent, const char *name): } ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width()); ServiceChooser->sort(); - connect(ServiceChooser,SIGNAL(highlighted(QListBoxItem*)),this,SLOT(slotServiceSelected(QListBoxItem*))); + connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*))); ServiceChooser->setSelected(0,true); slotServiceSelected(ServiceChooser->item(0)); } -void ComponentChooser::slotServiceSelected(QListBoxItem* it) { +void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { if (!it) return; if (somethingChanged) { - if (KMessageBox::questionYesNo(this,i18n("You changed the default component of your choice. Do you want to save that change now?"),QString::null,KStdGuiItem::save(),KStdGuiItem::discard())==KMessageBox::Yes) save(); + if (KMessageBox::questionYesNo(this,i18n("You changed the default component of your choice. Do you want to save that change now?"),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard())==KMessageBox::Yes) save(); } KSimpleConfig cfg(static_cast(it)->File); @@ -413,8 +413,8 @@ void ComponentChooser::slotServiceSelected(QListBoxItem* it) { ComponentDescription->setMinimumSize(ComponentDescription->sizeHint()); - QString cfgType=cfg.readEntry("configurationType"); - QWidget *newConfigWidget = 0; + TQString cfgType=cfg.readEntry("configurationType"); + TQWidget *newConfigWidget = 0; if (cfgType.isEmpty() || (cfgType=="component")) { if (!(configWidget && configWidget->qt_cast("CfgComponent"))) @@ -460,7 +460,7 @@ void ComponentChooser::slotServiceSelected(QListBoxItem* it) { configContainer->removeWidget(configWidget); delete configWidget; configWidget=newConfigWidget; - connect(configWidget,SIGNAL(changed(bool)),this,SLOT(emitChanged(bool))); + connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool))); configContainer->setMinimumSize(configWidget->sizeHint()); } diff --git a/kcontrol/componentchooser/componentchooser.h b/kcontrol/componentchooser/componentchooser.h index fdb863344..1ac405489 100644 --- a/kcontrol/componentchooser/componentchooser.h +++ b/kcontrol/componentchooser/componentchooser.h @@ -21,8 +21,8 @@ #include "emailclientconfig_ui.h" #include "terminalemulatorconfig_ui.h" #include "browserconfig_ui.h" -#include -#include +#include +#include #include @@ -48,17 +48,17 @@ class CfgComponent: public ComponentConfig_UI,public CfgPlugin { Q_OBJECT public: - CfgComponent(QWidget *parent); + CfgComponent(TQWidget *parent); virtual ~CfgComponent(); virtual void load(KConfig *cfg); virtual void save(KConfig *cfg); virtual void defaults(); protected: - QDict m_lookupDict,m_revLookupDict; + TQDict m_lookupDict,m_revLookupDict; protected slots: - void slotComponentChanged(const QString&); + void slotComponentChanged(const TQString&); signals: void changed(bool); }; @@ -68,7 +68,7 @@ class CfgEmailClient: public EmailClientConfig_UI,public CfgPlugin { Q_OBJECT public: - CfgEmailClient(QWidget *parent); + CfgEmailClient(TQWidget *parent); virtual ~CfgEmailClient(); virtual void load(KConfig *cfg); virtual void save(KConfig *cfg); @@ -88,7 +88,7 @@ class CfgTerminalEmulator: public TerminalEmulatorConfig_UI,public CfgPlugin { Q_OBJECT public: - CfgTerminalEmulator(QWidget *parent); + CfgTerminalEmulator(TQWidget *parent); virtual ~CfgTerminalEmulator(); virtual void load(KConfig *cfg); virtual void save(KConfig *cfg); @@ -106,7 +106,7 @@ class CfgBrowser: public BrowserConfig_UI,public CfgPlugin { Q_OBJECT public: - CfgBrowser(QWidget *parent); + CfgBrowser(TQWidget *parent); virtual ~CfgBrowser(); virtual void load(KConfig *cfg); virtual void save(KConfig *cfg); @@ -119,7 +119,7 @@ protected slots: signals: void changed(bool); private: - QString m_browserExec; + TQString m_browserExec; KService::Ptr m_browserService; }; @@ -130,20 +130,20 @@ class ComponentChooser : public ComponentChooser_UI Q_OBJECT public: - ComponentChooser(QWidget *parent=0, const char *name=0); + ComponentChooser(TQWidget *parent=0, const char *name=0); virtual ~ComponentChooser(); void load(); void save(); void restoreDefault(); private: - QString latestEditedService; + TQString latestEditedService; bool somethingChanged; - QWidget *configWidget; - QVBoxLayout *myLayout; + TQWidget *configWidget; + TQVBoxLayout *myLayout; protected slots: void emitChanged(bool); - void slotServiceSelected(QListBoxItem *); + void slotServiceSelected(TQListBoxItem *); signals: void changed(bool); diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp index 8e6ae7ba7..8bf1a026f 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.cpp +++ b/kcontrol/componentchooser/kcm_componentchooser.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include +#include #include #include @@ -22,12 +22,12 @@ #include "kcm_componentchooser.moc" -KCMComponentChooser::KCMComponentChooser( QWidget *parent, const char *name ): +KCMComponentChooser::KCMComponentChooser( TQWidget *parent, const char *name ): KCModule(parent,name) { - (new QVBoxLayout(this))->setAutoAdd(true); + (new TQVBoxLayout(this))->setAutoAdd(true); m_chooser=new ComponentChooser(this,"ComponentChooser"); - connect(m_chooser,SIGNAL(changed(bool)),this,SIGNAL(changed(bool))); + connect(m_chooser,TQT_SIGNAL(changed(bool)),this,TQT_SIGNAL(changed(bool))); setButtons( Help | Apply ); KAboutData *about = @@ -55,7 +55,7 @@ void KCMComponentChooser::defaults(){ extern "C" { - KDE_EXPORT KCModule *create_componentchooser( QWidget *parent, const char * ) + KDE_EXPORT KCModule *create_componentchooser( TQWidget *parent, const char * ) { KGlobal::locale()->insertCatalogue("kcmcomponentchooser"); return new KCMComponentChooser( parent, "kcmcomponentchooser" ); diff --git a/kcontrol/componentchooser/kcm_componentchooser.h b/kcontrol/componentchooser/kcm_componentchooser.h index eac9ad055..72dab21ba 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.h +++ b/kcontrol/componentchooser/kcm_componentchooser.h @@ -26,7 +26,7 @@ class KCMComponentChooser : public KCModule { Q_OBJECT public: - KCMComponentChooser( QWidget *parent = 0, const char *name = 0 ); + KCMComponentChooser( TQWidget *parent = 0, const char *name = 0 ); void load(); void save(); diff --git a/kcontrol/crypto/certexport.cpp b/kcontrol/crypto/certexport.cpp index 7c31bb84b..9c60d4f00 100644 --- a/kcontrol/crypto/certexport.cpp +++ b/kcontrol/crypto/certexport.cpp @@ -24,52 +24,52 @@ #endif #include "certexport.h" -#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include -KCertExport::KCertExport(QWidget *parent, const char *name) +KCertExport::KCertExport(TQWidget *parent, const char *name) : KDialog(parent, name, true) { -QGridLayout *grid = new QGridLayout(this, 9, 6, marginHint(), spacingHint()); +TQGridLayout *grid = new TQGridLayout(this, 9, 6, marginHint(), spacingHint()); setCaption(i18n("X509 Certificate Export")); - QVButtonGroup *bg = new QVButtonGroup(i18n("Format"), this); - _pem = new QRadioButton(i18n("&PEM"), bg); - _netscape = new QRadioButton(i18n("&Netscape"), bg); - _der = new QRadioButton(i18n("&DER/ASN1"), bg); - _text = new QRadioButton(i18n("&Text"), bg); + TQVButtonGroup *bg = new TQVButtonGroup(i18n("Format"), this); + _pem = new TQRadioButton(i18n("&PEM"), bg); + _netscape = new TQRadioButton(i18n("&Netscape"), bg); + _der = new TQRadioButton(i18n("&DER/ASN1"), bg); + _text = new TQRadioButton(i18n("&Text"), bg); grid->addMultiCellWidget(bg, 0, 4, 0, 3); _pem->setChecked(true); - grid->addMultiCellWidget(new QLabel(i18n("Filename:"), this), 5, 5, 0, 3); + grid->addMultiCellWidget(new TQLabel(i18n("Filename:"), this), 5, 5, 0, 3); _filename = new KLineEdit(this); grid->addMultiCellWidget(_filename, 6, 6, 0, 4); - connect(_filename, SIGNAL(textChanged(const QString &)), this, SLOT(slotTextChanged(const QString &))); - connect(_filename, SIGNAL(returnPressed()), this, SLOT(slotExport())); + connect(_filename, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotTextChanged(const TQString &))); + connect(_filename, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotExport())); - _choose = new QPushButton("...", this); + _choose = new TQPushButton("...", this); grid->addWidget(_choose, 6, 5); - connect(_choose, SIGNAL(clicked()), this, SLOT(slotChoose())); + connect(_choose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChoose())); - _export = new QPushButton(i18n("&Export"), this); + _export = new TQPushButton(i18n("&Export"), this); grid->addWidget(_export, 8, 4); - connect(_export, SIGNAL(clicked()), this, SLOT(slotExport())); + connect(_export, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExport())); _export->setEnabled(false); - _cancel = new QPushButton(i18n("&Cancel"), this); + _cancel = new TQPushButton(i18n("&Cancel"), this); grid->addWidget(_cancel, 8, 5); - connect(_cancel, SIGNAL(clicked()), this, SLOT(reject())); + connect(_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); } @@ -84,8 +84,8 @@ void KCertExport::setCertificate(KSSLCertificate *c) { void KCertExport::slotExport() { -QByteArray cert; -QString certt; +TQByteArray cert; +TQString certt; if (_filename->text().isEmpty()) return; @@ -110,7 +110,7 @@ QString certt; return; } - QFile outFile(_filename->text()); + TQFile outFile(_filename->text()); if (!outFile.open(IO_WriteOnly)) { KMessageBox::error(this, i18n("Error opening file for output."), i18n("SSL")); @@ -129,8 +129,8 @@ accept(); void KCertExport::slotChoose() { - //QString newFile = KFileDialog::getSaveFileName("::x509save", i18n("*.pem|Privacy Enhanced Mail Format\n*.der|DER/ASN1 Format")); - QString newFile = KFileDialog::getSaveFileName(QString::null, "application/x-x509-ca-cert"); + //TQString newFile = KFileDialog::getSaveFileName("::x509save", i18n("*.pem|Privacy Enhanced Mail Format\n*.der|DER/ASN1 Format")); + TQString newFile = KFileDialog::getSaveFileName(TQString::null, "application/x-x509-ca-cert"); // Dunno about this one yet // \n*.ncert|Netscape certificate files"); @@ -139,7 +139,7 @@ void KCertExport::slotChoose() { } -void KCertExport::slotTextChanged(const QString& x) { +void KCertExport::slotTextChanged(const TQString& x) { _export->setEnabled(!x.isEmpty()); } diff --git a/kcontrol/crypto/certexport.h b/kcontrol/crypto/certexport.h index 983cf0804..00721d109 100644 --- a/kcontrol/crypto/certexport.h +++ b/kcontrol/crypto/certexport.h @@ -33,7 +33,7 @@ class KCertExport : public KDialog { Q_OBJECT public: - KCertExport(QWidget *parent = 0L, const char *name = 0L); + KCertExport(TQWidget *parent = 0L, const char *name = 0L); virtual ~KCertExport(); void setCertificate(KSSLCertificate *c); @@ -41,11 +41,11 @@ public: protected slots: void slotExport(); void slotChoose(); - void slotTextChanged(const QString &); + void slotTextChanged(const TQString &); private: - QPushButton *_export, *_cancel, *_choose; - QRadioButton *_pem, *_netscape, *_der, *_text; + TQPushButton *_export, *_cancel, *_choose; + TQRadioButton *_pem, *_netscape, *_der, *_text; KLineEdit *_filename; KSSLCertificate *_c; diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index f5c4b0099..3f021285b 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/kcontrol/crypto/crypto.cpp @@ -31,22 +31,22 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -93,18 +93,18 @@ using namespace KNetwork; -typedef KGenericFactory KryptoFactory; +typedef KGenericFactory KryptoFactory; K_EXPORT_COMPONENT_FACTORY( kcm_crypto, KryptoFactory("kcmcrypto") ) -CipherItem::CipherItem( QListView *view, const QString& cipher, int bits, +CipherItem::CipherItem( TQListView *view, const TQString& cipher, int bits, int maxBits, KCryptoConfig *module ) - : QCheckListItem( view, QString::null, CheckBox ) + : TQCheckListItem( view, TQString::null, CheckBox ) { m_cipher = cipher; m_bits = bits; m_module = module; - QString tmp( i18n("%1 (%2 of %3 bits)") ); + TQString tmp( i18n("%1 (%2 of %3 bits)") ); setText( 0, tmp.arg( cipher ).arg( bits ).arg( maxBits )); } @@ -113,16 +113,16 @@ void CipherItem::stateChange( bool ) m_module->configChanged(); } -QString CipherItem::configName() const +TQString CipherItem::configName() const { - QString cipherName("cipher_%1"); + TQString cipherName("cipher_%1"); return cipherName.arg( m_cipher ); } -OtherCertItem::OtherCertItem( QListView *view, const QString& sub, const QString& md5, bool perm, int policy, QDateTime exp, KCryptoConfig *module ) - : QListViewItem( view, QString::null ), _sub(sub), _md5(md5), _exp(exp), _perm(perm), _policy(policy) +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) { m_module = module; @@ -131,7 +131,7 @@ KSSLX509Map cert(sub); setText(1, cert.getValue("CN").replace("\n", ", ")); if (_exp.date().year() > 3000 || _exp.date().year() < 1900) - _exp.setDate(QDate(3000,1,1)); + _exp.setDate(TQDate(3000,1,1)); } void OtherCertItem::stateChange( bool ) @@ -139,19 +139,19 @@ void OtherCertItem::stateChange( bool ) m_module->configChanged(); } -QString OtherCertItem::configName() const +TQString OtherCertItem::configName() const { return _sub; } -YourCertItem::YourCertItem( QListView *view, QString pkcs, QString pass, QString name, KCryptoConfig *module ) - : QListViewItem( view, QString::null ) +YourCertItem::YourCertItem( TQListView *view, TQString pkcs, TQString pass, TQString name, KCryptoConfig *module ) + : TQListViewItem( view, TQString::null ) { m_module = module; KSSLX509Map cert(name); - QString tmp = cert.getValue("CN").replace("\n", ", "); + TQString tmp = cert.getValue("CN").replace("\n", ", "); setText(0, tmp); setText(1, cert.getValue("Email")); _pkcs = pkcs; @@ -164,20 +164,20 @@ void YourCertItem::stateChange( bool ) m_module->configChanged(); } -QString YourCertItem::configName() const +TQString YourCertItem::configName() const { return _name; } -CAItem::CAItem( QListView *view, QString name, QString cert, bool site, bool email, bool code, KCryptoConfig *module ) - : QListViewItem( view, QString::null ) +CAItem::CAItem( TQListView *view, TQString name, TQString cert, bool site, bool email, bool code, KCryptoConfig *module ) + : TQListViewItem( view, TQString::null ) { m_module = module; KSSLX509Map mcert(name); -QString tmp; +TQString tmp; setText(0, mcert.getValue("O")); tmp = mcert.getValue("OU"); tmp.replace("\n", ", "); @@ -199,7 +199,7 @@ void CAItem::stateChange( bool ) m_module->configChanged(); } -QString CAItem::configName() const +TQString CAItem::configName() const { return _name; } @@ -216,12 +216,12 @@ QString CAItem::configName() const -KCryptoConfig::KCryptoConfig(QWidget *parent, const char *name, const QStringList &) +KCryptoConfig::KCryptoConfig(TQWidget *parent, const char *name, const TQStringList &) : KCModule(KryptoFactory::instance(), parent, name) { -QGridLayout *grid; -QBoxLayout *top = new QVBoxLayout(this); -QString whatstr; +TQGridLayout *grid; +TQBoxLayout *top = new TQVBoxLayout(this); +TQString whatstr; setQuickHelp( i18n("

    Crypto

    This module allows you to configure SSL for" " use with most KDE applications, as well as manage your personal" @@ -255,51 +255,51 @@ QString whatstr; // The eighth is peer [email] certificate related (unimplemented) /////////////////////////////////////////////////////////////////////////// - tabs = new QTabWidget(this); + tabs = new TQTabWidget(this); top->addWidget(tabs); /////////////////////////////////////////////////////////////////////////// // FIRST TAB /////////////////////////////////////////////////////////////////////////// - tabSSL = new QFrame(this); - grid = new QGridLayout(tabSSL, 7, 2, KDialog::marginHint(), + tabSSL = new TQFrame(this); + grid = new TQGridLayout(tabSSL, 7, 2, KDialog::marginHint(), KDialog::spacingHint() ); - mUseTLS = new QCheckBox(i18n("Enable &TLS support if supported by the server"), tabSSL); - connect(mUseTLS, SIGNAL(clicked()), SLOT(configChanged())); + mUseTLS = new TQCheckBox(i18n("Enable &TLS support if supported by the server"), tabSSL); + connect(mUseTLS, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); grid->addWidget(mUseTLS, 0, 0); whatstr = i18n("TLS is the newest revision of the SSL protocol." " It integrates better with other protocols and has" " replaced SSL in protocols such as POP3 and SMTP."); - QWhatsThis::add(mUseTLS, whatstr); + TQWhatsThis::add(mUseTLS, whatstr); - mUseSSLv2 = new QCheckBox(i18n("Enable SSLv&2"), tabSSL); - connect(mUseSSLv2, SIGNAL(clicked()), SLOT(configChanged())); + mUseSSLv2 = new TQCheckBox(i18n("Enable SSLv&2"), tabSSL); + connect(mUseSSLv2, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); grid->addWidget(mUseSSLv2, 1, 0); whatstr = i18n("SSL v2 is the second revision of the SSL protocol." " It is most common to enable v2 and v3."); - QWhatsThis::add(mUseSSLv2, whatstr); + TQWhatsThis::add(mUseSSLv2, whatstr); - mUseSSLv3 = new QCheckBox(i18n("Enable SSLv&3"), tabSSL); - connect(mUseSSLv3, SIGNAL(clicked()), SLOT(configChanged())); + mUseSSLv3 = new TQCheckBox(i18n("Enable SSLv&3"), tabSSL); + connect(mUseSSLv3, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); grid->addWidget(mUseSSLv3, 1, 1); whatstr = i18n("SSL v3 is the third revision of the SSL protocol." " It is most common to enable v2 and v3."); - QWhatsThis::add(mUseSSLv3, whatstr); + TQWhatsThis::add(mUseSSLv3, whatstr); #ifdef HAVE_SSL - SSLv2Box = new QListView(tabSSL, "v2ciphers"); + SSLv2Box = new TQListView(tabSSL, "v2ciphers"); (void) SSLv2Box->addColumn(i18n("SSLv2 Ciphers to Use")); whatstr = i18n("Select the ciphers you wish to enable when using the" " SSL v2 protocol. The actual protocol used will be" " negotiated with the server at connection time."); - QWhatsThis::add(SSLv2Box, whatstr); - SSLv2Box->setSelectionMode(QListView::NoSelection); + TQWhatsThis::add(SSLv2Box, whatstr); + SSLv2Box->setSelectionMode(TQListView::NoSelection); grid->addWidget( SSLv2Box, 2, 0 ); - connect( mUseSSLv2, SIGNAL( toggled( bool ) ), - SSLv2Box, SLOT( setEnabled( bool ))); + connect( mUseSSLv2, TQT_SIGNAL( toggled( bool ) ), + SSLv2Box, TQT_SLOT( setEnabled( bool ))); #else - QLabel *nossllabel = new QLabel(i18n("SSL ciphers cannot be configured" + TQLabel *nossllabel = new TQLabel(i18n("SSL ciphers cannot be configured" " because this module was not linked" " with OpenSSL."), tabSSL); grid->addMultiCellWidget(nossllabel, 2, 2, 0, 1); @@ -313,28 +313,28 @@ QString whatstr; authcfg = new KSimpleConfig("ksslauthmap", false); #ifdef HAVE_SSL - SSLv3Box = new QListView(tabSSL, "v3ciphers"); + SSLv3Box = new TQListView(tabSSL, "v3ciphers"); (void) SSLv3Box->addColumn(i18n("SSLv3 Ciphers to Use")); whatstr = i18n("Select the ciphers you wish to enable when using the" " SSL v3 protocol. The actual protocol used will be" " negotiated with the server at connection time."); - QWhatsThis::add(SSLv3Box, whatstr); - SSLv3Box->setSelectionMode(QListView::NoSelection); + TQWhatsThis::add(SSLv3Box, whatstr); + SSLv3Box->setSelectionMode(TQListView::NoSelection); grid->addWidget(SSLv3Box, 2, 1); - connect( mUseSSLv3, SIGNAL( toggled( bool ) ), - SSLv3Box, SLOT( setEnabled( bool ))); + connect( mUseSSLv3, TQT_SIGNAL( toggled( bool ) ), + SSLv3Box, TQT_SLOT( setEnabled( bool ))); loadCiphers(); // // CipherWizards // - QHGroupBox *cwbg = new QHGroupBox(i18n("Cipher Wizard"), tabSSL); - QComboBox *cwcb = new QComboBox(cwbg); + TQHGroupBox *cwbg = new TQHGroupBox(i18n("Cipher Wizard"), tabSSL); + TQComboBox *cwcb = new TQComboBox(cwbg); grid->addMultiCellWidget(cwbg, 3, 3, 0, 1); - QString whatStr = i18n("Use these preconfigurations to more easily configure the SSL encryption settings. You can choose among the following modes: